diff options
Diffstat (limited to 'src/gpu/gl/GrGLProgram.h')
-rw-r--r-- | src/gpu/gl/GrGLProgram.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/gpu/gl/GrGLProgram.h b/src/gpu/gl/GrGLProgram.h index c70b1bd0e2..7487a1e900 100644 --- a/src/gpu/gl/GrGLProgram.h +++ b/src/gpu/gl/GrGLProgram.h @@ -106,11 +106,11 @@ protected: const BuiltinUniformHandles&, GrGLuint programID, const UniformInfoArray&, + const SkTArray<GrGLSampler>&, const VaryingInfoArray&, // used for NVPR only currently GrGLSLPrimitiveProcessor* geometryProcessor, GrGLSLXferProcessor* xferProcessor, - const GrGLSLFragProcs& fragmentProcessors, - SkTArray<UniformHandle>* passSamplerUniforms); + const GrGLSLFragProcs& fragmentProcessors); // A helper to loop over effects, set the transforms (via subclass) and bind textures void setFragmentData(const GrPrimitiveProcessor&, const GrPipeline&, int* nextSamplerIdx); @@ -135,7 +135,6 @@ protected: GrProgramDesc fDesc; GrGLGpu* fGpu; GrGLProgramDataManager fProgramDataManager; - SkTArray<UniformHandle> fSamplerUniforms; friend class GrGLProgramBuilder; |