| Index: src/gpu/gl/GrGLProgram.cpp
|
| diff --git a/src/gpu/gl/GrGLProgram.cpp b/src/gpu/gl/GrGLProgram.cpp
|
| index 1d85b0a3278514422bd11d815c31f6d730990942..d4448b4b0b97aaaf77b4f6ee7f597420096a4409 100644
|
| --- a/src/gpu/gl/GrGLProgram.cpp
|
| +++ b/src/gpu/gl/GrGLProgram.cpp
|
| @@ -48,8 +48,8 @@ GrGLProgram::GrGLProgram(GrGpuGL* gpu,
|
| , fGpu(gpu)
|
| , fUniformManager(SkRef(uman))
|
| , fUniformHandles(builderOutput.fUniformHandles)
|
| - , fHasVertexShader(builderOutput.fHasVS)
|
| - , fNumTexCoordSets(builderOutput.fNumTexCoordSets) {
|
| + , fHasVertexShader(builderOutput.fHasVertexShader)
|
| + , fTexCoordSetCnt(builderOutput.fTexCoordSetCnt) {
|
| this->initSamplerUniforms();
|
| }
|
|
|
| @@ -151,7 +151,7 @@ void GrGLProgram::setData(GrDrawState::BlendOptFlags blendOpts,
|
| // custom shaders, it's ignored, so we don't need to change the texgen
|
| // settings in that case.
|
| if (!fHasVertexShader) {
|
| - fGpu->flushPathTexGenSettings(fNumTexCoordSets);
|
| + fGpu->flushPathTexGenSettings(fTexCoordSetCnt);
|
| }
|
| }
|
|
|
|
|