diff options
| author |  bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-10-26 13:01:20 +0000 |
|---|---|---|
| committer | bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-10-26 13:01:20 +0000 |
| commit | 08283afc265f1153834256fc1012519813ba6b73 (patch) | |
| tree | 553cfc58076746c1326f88b23dc814f42457be87 /src/gpu/gl/GrGLShaderBuilder.h | |
| parent | 27b40e9f36f567a57ae92860052b36cedacdd4fd (diff) | |
Rename GrSamplerState to GrEffectStage.
R=robertphillips@google.com
Review URL: https://codereview.appspot.com/6777053
git-svn-id: http://skia.googlecode.com/svn/trunk@6135 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/gpu/gl/GrGLShaderBuilder.h')
| -rw-r--r-- | src/gpu/gl/GrGLShaderBuilder.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gpu/gl/GrGLShaderBuilder.h b/src/gpu/gl/GrGLShaderBuilder.h index fa68268576..b67f2f00b2 100644 --- a/src/gpu/gl/GrGLShaderBuilder.h +++ b/src/gpu/gl/GrGLShaderBuilder.h @@ -181,8 +181,8 @@ public: * Sets the current stage (used to make variable names unique). * TODO: Hide from the GrEffects */ - void setCurrentStage(int stage) { fCurrentStage = stage; } - void setNonStage() { fCurrentStage = kNonStageIdx; } + void setCurrentStage(int stageIdx) { fCurrentStageIdx = stageIdx; } + void setNonStage() { fCurrentStageIdx = kNonStageIdx; } GrGLUniformManager::UniformHandle getRTHeightUniform() const { return fRTHeightUniform; } @@ -219,7 +219,7 @@ private: const GrGLContextInfo& fContext; GrGLUniformManager& fUniformManager; - int fCurrentStage; + int fCurrentStageIdx; SkString fFSFunctions; SkString fFSHeader; |