commit 032b221dadb6eb8283ac2d1bc8913ee7bb5cfe7a
author bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Jul 16 13:36:18 2012 +0000
committer bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Jul 16 13:36:18 2012 +0000
tree 7b97452a7937949417cc40a4817cf4c4ede8e4ab
parent 96cbd2c4d2ea7e138b65923a46fb77bc096a6782

Remove uniform var pointers from custom effects

Review URL: http://codereview.appspot.com/6374067/



git-svn-id: http://skia.googlecode.com/svn/trunk@4616 2bbb7eff-a529-9590-31e7-b0007b416f81

src/gpu/gl/GrGLProgram.cpp

diff --git a/src/gpu/gl/GrGLProgram.cpp b/src/gpu/gl/GrGLProgram.cpp
index 1ad9817..d13620c 100644
--- a/src/gpu/gl/GrGLProgram.cpp
+++ b/src/gpu/gl/GrGLProgram.cpp
@@ -932,7 +932,7 @@
         return false;
     }
 
-    this->getUniformLocationsAndInitCache(gl, programData);
+    this->getUniformLocationsAndInitCache(builder, gl, programData);
 
     return true;
 }
@@ -1003,7 +1003,8 @@
     return true;
 }
 
-void GrGLProgram::getUniformLocationsAndInitCache(const GrGLContextInfo& gl,
+void GrGLProgram::getUniformLocationsAndInitCache(const GrGLShaderBuilder& builder,
+                                                  const GrGLContextInfo& gl,
                                                   CachedData* programData) const {
     const GrGLint& progID = programData->fProgramID;
 
@@ -1066,8 +1067,7 @@
             }
 
             if (NULL != programData->fCustomStage[s]) {
-                programData->fCustomStage[s]->
-                    initUniforms(gl.interface(), progID);
+                programData->fCustomStage[s]->initUniforms(&builder, gl.interface(), progID);
             }
         }
     }
@@ -1118,10 +1118,12 @@
     } else {
         SkString texMatName;
         tex_matrix_name(stageNum, &texMatName);
-        const GrGLShaderVar* mat = &segments->addUniform(GrGLShaderBuilder::kVertex_ShaderType,
-                                                         kMat33f_GrSLType, texMatName.c_str());
+        GrGLShaderBuilder::UniformHandle m =
+            segments->addUniform(GrGLShaderBuilder::kVertex_ShaderType,
+                                 kMat33f_GrSLType, texMatName.c_str());
+        const GrGLShaderVar& mat = segments->getUniformVariable(m);
         // Can't use texMatName.c_str() because it's on the stack!
-        matName = mat->getName().c_str();
+        matName = mat.getName().c_str();
         locations->fTextureMatrixUni = kUseUniform;
 
         if (desc.fOptFlags & StageDesc::kNoPerspective_OptFlagBit) {