diff options
Diffstat (limited to 'src/gpu/glsl/GrGLSLFragmentProcessor.cpp')
-rw-r--r-- | src/gpu/glsl/GrGLSLFragmentProcessor.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gpu/glsl/GrGLSLFragmentProcessor.cpp b/src/gpu/glsl/GrGLSLFragmentProcessor.cpp index ac3d734c90..c3e57bc314 100644 --- a/src/gpu/glsl/GrGLSLFragmentProcessor.cpp +++ b/src/gpu/glsl/GrGLSLFragmentProcessor.cpp @@ -81,12 +81,12 @@ void GrGLSLFragmentProcessor::internalEmitChild(int childIndex, const char* inpu firstSamplerAt += args.fFp.childProcessor(i).numTextures(); } GrGLSLTransformedCoordsArray childCoords; - TextureSamplerArray childSamplers; + SamplerArray childTexSamplers; if (childProc.numTransforms() > 0) { childCoords.push_back_n(childProc.numTransforms(), &args.fCoords[firstCoordAt]); } if (childProc.numTextures() > 0) { - childSamplers.push_back_n(childProc.numTextures(), &args.fSamplers[firstSamplerAt]); + childTexSamplers.push_back_n(childProc.numTextures(), &args.fTexSamplers[firstSamplerAt]); } // emit the code for the child in its own scope @@ -100,7 +100,7 @@ void GrGLSLFragmentProcessor::internalEmitChild(int childIndex, const char* inpu outputColor, inputColor, childCoords, - childSamplers); + childTexSamplers); this->childProcessor(childIndex)->emitCode(childArgs); fragBuilder->codeAppend("}\n"); |