Index: src/gpu/glsl/GrGLSLFragmentProcessor.cpp |
diff --git a/src/gpu/glsl/GrGLSLFragmentProcessor.cpp b/src/gpu/glsl/GrGLSLFragmentProcessor.cpp |
index 9533d5a8cb2136e17bd48d2103f89141aa23c2e7..42538eaf0f94efefdf932b046806e1de94ee1a06 100644 |
--- a/src/gpu/glsl/GrGLSLFragmentProcessor.cpp |
+++ b/src/gpu/glsl/GrGLSLFragmentProcessor.cpp |
@@ -83,16 +83,17 @@ |
firstBufferAt += args.fFp.childProcessor(i).numBuffers(); |
} |
GrGLSLTransformedCoordsArray childCoords; |
- const SamplerHandle* childTexSamplers = nullptr; |
- const SamplerHandle* childBufferSamplers = nullptr; |
+ SamplerArray childTexSamplers; |
+ SamplerArray childBufferSamplers; |
if (childProc.numTransforms() > 0) { |
childCoords.push_back_n(childProc.numTransforms(), &args.fCoords[firstCoordAt]); |
} |
if (childProc.numTextures() > 0) { |
- childTexSamplers = &args.fTexSamplers[firstTextureAt]; |
+ childTexSamplers.push_back_n(childProc.numTextures(), &args.fTexSamplers[firstTextureAt]); |
} |
if (childProc.numBuffers() > 0) { |
- childBufferSamplers = &args.fBufferSamplers[firstBufferAt]; |
+ childBufferSamplers.push_back_n(childProc.numBuffers(), |
+ &args.fBufferSamplers[firstBufferAt]); |
} |
// emit the code for the child in its own scope |