diff options
| author |  bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-05-18 19:54:48 +0000 |
|---|---|---|
| committer | bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-05-18 19:54:48 +0000 |
| commit | ae4f96a9e06df44f70c3d5f7324f5a7fabcd1026 (patch) | |
| tree | 41ef511ed566df9ec627233706afa7749d35e970 /src/gpu/gl/GrGLProgramStage.h | |
| parent | e9678a21ed3afe26f05d04f9979ca1c915f3f90b (diff) | |
Some refactoring of GrCustomStage and friends
Review URL: http://codereview.appspot.com/6209071/
git-svn-id: http://skia.googlecode.com/svn/trunk@4003 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/gpu/gl/GrGLProgramStage.h')
| -rw-r--r-- | src/gpu/gl/GrGLProgramStage.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/gpu/gl/GrGLProgramStage.h b/src/gpu/gl/GrGLProgramStage.h index 61e62e5073..21416407aa 100644 --- a/src/gpu/gl/GrGLProgramStage.h +++ b/src/gpu/gl/GrGLProgramStage.h @@ -9,12 +9,12 @@ #define GrGLCustomStage_DEFINED #include "GrAllocator.h" +#include "GrCustomStage.h" #include "GrGLShaderBuilder.h" #include "GrGLShaderVar.h" #include "GrGLSL.h" #include "GrStringBuilder.h" -class GrCustomStage; struct GrGLInterface; class GrGLTexture; @@ -31,6 +31,7 @@ class GrGLTexture; class GrGLProgramStage { public: + typedef GrCustomStage::StageKey StageKey ; // TODO: redundant with GrGLProgram.cpp enum { kUnusedUniform = -1, @@ -90,7 +91,7 @@ public: are to be read. TODO: since we don't have a factory, we can't assert to enforce this. Shouldn't we? */ - virtual void setData(const GrGLInterface*, GrCustomStage*, + virtual void setData(const GrGLInterface*, const GrCustomStage*, const GrGLTexture*); // TODO: needs a better name |