Index: src/gpu/gl/GrGpuGL_program.cpp |
diff --git a/src/gpu/gl/GrGpuGL_program.cpp b/src/gpu/gl/GrGpuGL_program.cpp |
index beef93e96b7b25b09cc4d6587dac701194ac0d97..a3c98086be8be1538256c6bdd3e5e70a775dd0b6 100644 |
--- a/src/gpu/gl/GrGpuGL_program.cpp |
+++ b/src/gpu/gl/GrGpuGL_program.cpp |
@@ -90,6 +90,7 @@ int GrGpuGL::ProgramCache::search(const GrGLProgramDesc& desc) const { |
} |
GrGLProgram* GrGpuGL::ProgramCache::getProgram(const GrGLProgramDesc& desc, |
+ const GrEffectStage* geometryProcessor, |
const GrEffectStage* colorStages[], |
const GrEffectStage* coverageStages[]) { |
#ifdef PROGRAM_CACHE_STATS |
@@ -126,7 +127,7 @@ GrGLProgram* GrGpuGL::ProgramCache::getProgram(const GrGLProgramDesc& desc, |
#ifdef PROGRAM_CACHE_STATS |
++fCacheMisses; |
#endif |
- GrGLProgram* program = GrGLProgram::Create(fGpu, desc, colorStages, coverageStages); |
+ GrGLProgram* program = GrGLProgram::Create(fGpu, desc, geometryProcessor, colorStages, coverageStages); |
bsalomon
2014/08/29 15:07:25
wrap line?
joshua.litt
2014/09/02 16:06:21
Acknowledged.
|
if (NULL == program) { |
return NULL; |
} |
@@ -222,6 +223,7 @@ bool GrGpuGL::flushGraphicsState(DrawType type, const GrDeviceCoordTexture* dstC |
return false; |
} |
+ const GrEffectStage* geometryProcessor = NULL; |
SkSTArray<8, const GrEffectStage*, true> colorStages; |
SkSTArray<8, const GrEffectStage*, true> coverageStages; |
GrGLProgramDesc desc; |
@@ -232,6 +234,7 @@ bool GrGpuGL::flushGraphicsState(DrawType type, const GrDeviceCoordTexture* dstC |
dstCoeff, |
this, |
dstCopy, |
+ &geometryProcessor, |
&colorStages, |
&coverageStages, |
&desc)) { |
@@ -240,6 +243,7 @@ bool GrGpuGL::flushGraphicsState(DrawType type, const GrDeviceCoordTexture* dstC |
} |
fCurrentProgram.reset(fProgramCache->getProgram(desc, |
+ geometryProcessor, |
colorStages.begin(), |
coverageStages.begin())); |
if (NULL == fCurrentProgram.get()) { |
@@ -260,6 +264,7 @@ bool GrGpuGL::flushGraphicsState(DrawType type, const GrDeviceCoordTexture* dstC |
fCurrentProgram->setData(type, |
blendOpts, |
+ geometryProcessor, |
colorStages.begin(), |
coverageStages.begin(), |
dstCopy, |