diff options
Diffstat (limited to 'src/gpu/gl/builders/GrGLProgramBuilder.cpp')
| -rw-r--r-- | src/gpu/gl/builders/GrGLProgramBuilder.cpp | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/src/gpu/gl/builders/GrGLProgramBuilder.cpp b/src/gpu/gl/builders/GrGLProgramBuilder.cpp index f3548e6bae..c3e81fb358 100644 --- a/src/gpu/gl/builders/GrGLProgramBuilder.cpp +++ b/src/gpu/gl/builders/GrGLProgramBuilder.cpp @@ -30,7 +30,7 @@ GrGLProgram* GrGLProgramBuilder::CreateProgram(const GrPipeline& pipeline, const GrPrimitiveProcessor& primProc, - GrProgramDesc* desc, + const GrProgramDesc& desc, GrGLGpu* gpu) { GrAutoLocaleSetter als("C"); @@ -56,7 +56,7 @@ GrGLProgram* GrGLProgramBuilder::CreateProgram(const GrPipeline& pipeline, GrGLProgramBuilder::GrGLProgramBuilder(GrGLGpu* gpu, const GrPipeline& pipeline, const GrPrimitiveProcessor& primProc, - GrProgramDesc* desc) + const GrProgramDesc& desc) : INHERITED(pipeline, primProc, desc) , fGpu(gpu) , fVaryingHandler(this) @@ -89,13 +89,6 @@ bool GrGLProgramBuilder::compileAndAttachShaders(GrGLSLShaderBuilder& shader, } *shaderIds->append() = shaderId; - if (!outInputs->fFlipY) { - GrProgramDesc* d = this->desc(); - // the program doesn't care about the surface origin, set the key to zero to indicate that - // it doesn't matter - d->setSurfaceOriginKey(0); - d->finalize(); - } return true; } @@ -251,7 +244,7 @@ void GrGLProgramBuilder::cleanupShaders(const SkTDArray<GrGLuint>& shaderIDs) { GrGLProgram* GrGLProgramBuilder::createProgram(GrGLuint programID) { return new GrGLProgram(fGpu, - *this->desc(), + this->desc(), fUniformHandles, programID, fUniformHandler.fUniforms, |