Index: src/gpu/gl/GrGLProgramDesc.cpp |
diff --git a/src/gpu/gl/GrGLProgramDesc.cpp b/src/gpu/gl/GrGLProgramDesc.cpp |
index a2dea8739206cbcab2e356ca4e4c4e49da865502..789eb6233605fa1de22e288f898e77703aa87858 100644 |
--- a/src/gpu/gl/GrGLProgramDesc.cpp |
+++ b/src/gpu/gl/GrGLProgramDesc.cpp |
@@ -120,6 +120,7 @@ bool GrGLProgramDescBuilder::Build(GrProgramDesc* desc, |
glDesc->key().reset(); |
return false; |
} |
+ GrProcessor::RequiredFeatures requiredFeatures = primProc.requiredFeatures(); |
for (int i = 0; i < pipeline.numFragmentProcessors(); ++i) { |
const GrFragmentProcessor& fp = pipeline.getFragmentProcessor(i); |
@@ -127,6 +128,7 @@ bool GrGLProgramDescBuilder::Build(GrProgramDesc* desc, |
glDesc->key().reset(); |
return false; |
} |
+ requiredFeatures |= fp.requiredFeatures(); |
} |
const GrXferProcessor& xp = pipeline.getXferProcessor(); |
@@ -135,6 +137,7 @@ bool GrGLProgramDescBuilder::Build(GrProgramDesc* desc, |
glDesc->key().reset(); |
return false; |
} |
+ requiredFeatures |= xp.requiredFeatures(); |
// --------DO NOT MOVE HEADER ABOVE THIS LINE-------------------------------------------------- |
// Because header is a pointer into the dynamic array, we can't push any new data into the key |
@@ -144,7 +147,7 @@ bool GrGLProgramDescBuilder::Build(GrProgramDesc* desc, |
// make sure any padding in the header is zeroed. |
memset(header, 0, kHeaderSize); |
- if (pipeline.readsFragPosition()) { |
+ if (requiredFeatures & GrProcessor::kFragmentPosition_RequiredFeature) { |
header->fFragPosKey = |
GrGLSLFragmentShaderBuilder::KeyForFragmentPosition(pipeline.getRenderTarget()); |
} else { |