Index: src/gpu/gl/GrGLProgram.h |
diff --git a/src/gpu/gl/GrGLProgram.h b/src/gpu/gl/GrGLProgram.h |
index a520bc20de6473d05df2b1c8773cdac0f6468fc6..92eaf2045ff1fdaca23086074fb843e2486d0b15 100644 |
--- a/src/gpu/gl/GrGLProgram.h |
+++ b/src/gpu/gl/GrGLProgram.h |
@@ -20,7 +20,7 @@ |
#include "SkString.h" |
#include "SkXfermode.h" |
-class GrGLEffect; |
+class GrGLProcessor; |
class GrGLProgramEffects; |
class GrGLProgramBuilder; |
@@ -41,9 +41,9 @@ public: |
static GrGLProgram* Create(GrGpuGL* gpu, |
const GrGLProgramDesc& desc, |
- const GrEffectStage* geometryProcessor, |
- const GrEffectStage* colorStages[], |
- const GrEffectStage* coverageStages[]); |
+ const GrGeometryStage* geometryProcessor, |
+ const GrFragmentStage* colorStages[], |
+ const GrFragmentStage* coverageStages[]); |
virtual ~GrGLProgram(); |
@@ -152,16 +152,16 @@ public: |
}; |
/** |
- * This function uploads uniforms and calls each GrGLEffect's setData. It is called before a |
+ * This function uploads uniforms and calls each GrGLProcessor's setData. It is called before a |
* draw occurs using the program after the program has already been bound. It also uses the |
- * GrGpuGL object to bind the textures required by the GrGLEffects. The color and coverage |
+ * GrGpuGL object to bind the textures required by the GrGLProcessors. The color and coverage |
* stages come from GrGLProgramDesc::Build(). |
*/ |
void setData(const GrOptDrawState&, |
GrGpu::DrawType, |
- const GrEffectStage* geometryProcessor, |
- const GrEffectStage* colorStages[], |
- const GrEffectStage* coverageStages[], |
+ const GrGeometryStage* geometryProcessor, |
+ const GrFragmentStage* colorStages[], |
+ const GrFragmentStage* coverageStages[], |
const GrDeviceCoordTexture* dstCopy, // can be NULL |
SharedGLState*); |