Index: src/gpu/gl/GrGLProgram.cpp |
diff --git a/src/gpu/gl/GrGLProgram.cpp b/src/gpu/gl/GrGLProgram.cpp |
index d8c751d71d839cfdb3b1d7be5d51265b5ea52e81..d49d000fe341916b9eb7d8ffaee28fcfffec180e 100644 |
--- a/src/gpu/gl/GrGLProgram.cpp |
+++ b/src/gpu/gl/GrGLProgram.cpp |
@@ -24,13 +24,12 @@ GrGLProgram* GrGLProgram::Create(GrGpuGL* gpu, |
const GrGLProgramDesc& desc, |
const GrEffectStage* colorStages[], |
const GrEffectStage* coverageStages[]) { |
- SkAutoTDelete<GrGLShaderBuilder> builder; |
+ SkAutoTDelete<GrGLProgramBuilder> builder; |
if (desc.getHeader().fHasVertexCode ||!gpu->shouldUseFixedFunctionTexturing()) { |
- builder.reset(SkNEW_ARGS(GrGLFullShaderBuilder, (gpu, desc))); |
+ builder.reset(SkNEW_ARGS(GrGLFullProgramBuilder, (gpu, desc))); |
} else { |
- builder.reset(SkNEW_ARGS(GrGLFragmentOnlyShaderBuilder, (gpu, desc))); |
+ builder.reset(SkNEW_ARGS(GrGLFragmentOnlyProgramBuilder, (gpu, desc))); |
} |
- |
if (builder->genProgram(colorStages, coverageStages)) { |
SkASSERT(0 != builder->getProgramID()); |
return SkNEW_ARGS(GrGLProgram, (gpu, desc, *builder)); |
@@ -40,7 +39,7 @@ GrGLProgram* GrGLProgram::Create(GrGpuGL* gpu, |
GrGLProgram::GrGLProgram(GrGpuGL* gpu, |
const GrGLProgramDesc& desc, |
- const GrGLShaderBuilder& builder) |
+ const GrGLProgramBuilder& builder) |
: fColor(GrColor_ILLEGAL) |
, fCoverage(GrColor_ILLEGAL) |
, fDstCopyTexUnit(-1) |