Index: src/gpu/gl/builders/GrGLShaderBuilder.cpp |
diff --git a/src/gpu/gl/builders/GrGLShaderBuilder.cpp b/src/gpu/gl/builders/GrGLShaderBuilder.cpp |
index 95607ecabe98a06489a3598d2a14b52ed578831d..03dc1667c76fe81e04d4814ac8e6832f46023461 100644 |
--- a/src/gpu/gl/builders/GrGLShaderBuilder.cpp |
+++ b/src/gpu/gl/builders/GrGLShaderBuilder.cpp |
@@ -178,10 +178,13 @@ void GrGLShaderBuilder::finalize(uint32_t visibility) { |
SkASSERT(!fFinalized); |
this->versionDecl() = fProgramBuilder->glslCaps()->versionDeclString(); |
this->compileAndAppendLayoutQualifiers(); |
+ SkASSERT(visibility); |
fProgramBuilder->appendUniformDecls((GrGLProgramBuilder::ShaderVisibility) visibility, |
&this->uniforms()); |
this->appendDecls(fInputs, &this->inputs()); |
- SkASSERT(k110_GrGLSLGeneration != fProgramBuilder->glslCaps()->generation() || |
+ // We should not have any outputs in the fragment shader when using version 1.10 |
+ SkASSERT(GrGLProgramBuilder::kFragment_Visibility != visibility || |
+ k110_GrGLSLGeneration != fProgramBuilder->glslCaps()->generation() || |
fOutputs.empty()); |
this->appendDecls(fOutputs, &this->outputs()); |
this->onFinalize(); |