aboutsummaryrefslogtreecommitdiffhomepage
path: root/include/gpu
diff options
context:
space:
mode:
authorGravatar bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-05-21 21:18:13 +0000
committerGravatar bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-05-21 21:18:13 +0000
commit16fd21ba2238f30eda25d8928307fc68c26eb98d (patch)
treef9107a7a27973f66e731d3461bcbec244280a19a /include/gpu
parent289efe014ad7628de7cf2c5177a42cacd1e335ad (diff)
Rename GrProgramStageFactory::stageKey to GrProgramStageFactory::glStageKey since it is GL-specific
Review URL: http://codereview.appspot.com/6218060/ git-svn-id: http://skia.googlecode.com/svn/trunk@4020 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include/gpu')
-rw-r--r--include/gpu/GrProgramStageFactory.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/gpu/GrProgramStageFactory.h b/include/gpu/GrProgramStageFactory.h
index 1ce0393bb9..2795deb85e 100644
--- 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