AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rename GrProgramStageFactory::stageKey to GrProgramStageFactory::glStageKey since it is GL-specific

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



git-svn-id: http://skia.googlecode.com/svn/trunk@4020 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
bsalomon@google.com 2012-05-21 21:18:13 +00:00
parent 289efe014a
commit 16fd21ba22
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/gpu/GrProgramStageFactory.h
View File

@ -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

4
src/gpu/gl/GrGpuGLShaders.cpp
View File

@ -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;