Rename GrProgramStageFactory::stageKey to GrProgramStageFactory::glStageKey since...

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

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

diff --git a/include/gpu/GrProgramStageFactory.h b/include/gpu/GrProgramStageFactory.h
index 1ce0393bb955f53b1804a948a32035f5078b9777..2795deb85e5e748e6dcd8608c7de36dfc3988217 100644 (file)
--- a/include/gpu/GrProgramStageFactory.h
+++ b/include/gpu/GrProgramStageFactory.h
@@ -26,7 +26,7 @@ public:
         kProgramStageKeyBits = 10,
     };
 
-    virtual StageKey stageKey(const GrCustomStage* stage) const = 0;
+    virtual StageKey glStageKey(const GrCustomStage* stage) const = 0;
     virtual GrGLProgramStage* createGLInstance(
         const GrCustomStage* stage) const = 0;
 
@@ -74,12 +74,12 @@ public:
      */
     virtual const char* name() const SK_OVERRIDE { return StageClass::Name(); }
 
-    /** Returns an value that idenitifes the shader code generated by
+    /** Returns a value that idenitifes the GLSL shader code generated by
         a GrCustomStage. This enables caching of generated shaders. Part of the
         id identifies the GrCustomShader subclass. The remainder is based
         on the aspects of the GrCustomStage object's configuration that affect
-        code generation. */
-    virtual StageKey stageKey(const GrCustomStage* stage) const SK_OVERRIDE {
+        GLSL code generation. */
+    virtual StageKey glStageKey(const GrCustomStage* stage) const SK_OVERRIDE {
         GrAssert(kIllegalStageClassID != fStageClassID);
         StageKey stageID = GLProgramStage::GenKey(stage);
 #if GR_DEBUG

diff --git a/src/gpu/gl/GrGpuGLShaders.cpp b/src/gpu/gl/GrGpuGLShaders.cpp
index 08cfaf71d676b27d059d8b01a7372be7651f26c2..7687a14b8590c661ad4d470759a87028b15f59f3 100644 (file)
--- a/src/gpu/gl/GrGpuGLShaders.cpp
+++ b/src/gpu/gl/GrGpuGLShaders.cpp
@@ -302,7 +302,7 @@ bool GrGpuGLShaders::programUnitTest() {
                     (GrSamplerState::FilterDirection)direction,
                     stage.fKernelWidth, kernel);
                 stage.fCustomStageKey =
-                    customStages[s]->getFactory().stageKey(customStages[s]);
+                    customStages[s]->getFactory().glStageKey(customStages[s]);
             }
         }
         CachedData cachedData;
@@ -934,7 +934,7 @@ void setup_custom_stage(GrGLProgram::ProgramDesc::StageDesc* stage,
     GrCustomStage* customStage = sampler.getCustomStage();
     if (customStage) {
         const GrProgramStageFactory& factory = customStage->getFactory();
-        stage->fCustomStageKey = factory.stageKey(customStage);
+        stage->fCustomStageKey = factory.glStageKey(customStage);
         customStages[index] = customStage;
     } else {
         stage->fCustomStageKey = 0;