From d3de40dfdf2340578f06dd8bddcf523ffff88462 Mon Sep 17 00:00:00 2001 From: joshualitt Date: Fri, 24 Oct 2014 15:02:11 -0700 Subject: bug fix for k1 TBR= BUG=skia: Review URL: https://codereview.chromium.org/675213003 --- src/gpu/gl/builders/GrGLNvprProgramBuilder.cpp | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'src/gpu/gl/builders/GrGLNvprProgramBuilder.cpp') diff --git a/src/gpu/gl/builders/GrGLNvprProgramBuilder.cpp b/src/gpu/gl/builders/GrGLNvprProgramBuilder.cpp index 86b1d7f167..3d991a2e2c 100644 --- a/src/gpu/gl/builders/GrGLNvprProgramBuilder.cpp +++ b/src/gpu/gl/builders/GrGLNvprProgramBuilder.cpp @@ -39,22 +39,18 @@ void GrGLNvprProgramBuilder::emitTransforms(const GrFragmentStage& processorStag suffixedVaryingName.appendf("_%i", t); varyingName = suffixedVaryingName.c_str(); } - const char* vsVaryingName; - const char* fsVaryingName; - ifp->fTransforms[t].fHandle = this->addSeparableVarying(varyingType, varyingName, - &vsVaryingName, &fsVaryingName); + GrGLVertToFrag v(varyingType); + ifp->fTransforms[t].fHandle = this->addSeparableVarying(varyingName, &v); ifp->fTransforms[t].fType = varyingType; SkNEW_APPEND_TO_TARRAY(outCoords, GrGLProcessor::TransformedCoords, - (SkString(fsVaryingName), varyingType)); + (SkString(v.fsIn()), varyingType)); } } GrGLInstalledFragProc::ShaderVarHandle -GrGLNvprProgramBuilder::addSeparableVarying(GrSLType type, - const char* name, - const char** vsOutName, - const char** fsInName) { +GrGLNvprProgramBuilder::addSeparableVarying(const char* name, GrGLVarying* v) { + this->addVarying(name, v); SeparableVaryingInfo& varying = fSeparableVaryingInfos.push_back(); varying.fVariable = fFS.fInputs.back(); return GrGLInstalledFragProc::ShaderVarHandle(fSeparableVaryingInfos.count() - 1); -- cgit v1.2.3