commit 6b76df09a0f93dd474ae54a0bd8c15436fffe638
author Chris Dalton <csmartdalton@google.com> Mon Apr 08 11:01:34 2019 -0600
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Apr 08 20:06:29 2019 +0000
tree 8c56911d306d1c7884f85636b3aeb460764bb393
parent a5a010b8cd792f3e9f4161d23eb81004beacc04b

Disable output swizzling from GrDisableColorXP

This makes sure the final shader does not output a color.

Bug: skia:
Change-Id: I1e5299bb63391d6ff72598ed72fe4fb80b18fa07
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/206352
Commit-Queue: Chris Dalton <csmartdalton@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>

src/gpu/glsl/GrGLSLFragmentShaderBuilder.cpp

diff --git a/src/gpu/glsl/GrGLSLFragmentShaderBuilder.cpp b/src/gpu/glsl/GrGLSLFragmentShaderBuilder.cpp
index 5c4b1dc..5670f58 100644
--- a/src/gpu/glsl/GrGLSLFragmentShaderBuilder.cpp
+++ b/src/gpu/glsl/GrGLSLFragmentShaderBuilder.cpp
@@ -242,9 +242,12 @@
 }
 
 const char* GrGLSLFragmentShaderBuilder::getSecondaryColorOutputName() const {
-    const GrShaderCaps& caps = *fProgramBuilder->shaderCaps();
-    return caps.mustDeclareFragmentShaderOutput() ? DeclaredSecondaryColorOutputName()
-                                                  : "gl_SecondaryFragColorEXT";
+    if (this->hasSecondaryOutput()) {
+        return (fProgramBuilder->shaderCaps()->mustDeclareFragmentShaderOutput())
+                ? DeclaredSecondaryColorOutputName()
+                : "gl_SecondaryFragColorEXT";
+    }
+    return nullptr;
 }
 
 GrSurfaceOrigin GrGLSLFragmentShaderBuilder::getSurfaceOrigin() const {