diff options
| author |  joshualitt <joshualitt@chromium.org> | 2014-08-21 20:18:45 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-08-21 20:18:45 -0700 |
| commit | 30ba436f04e61d4505fb854d5fc56079636e0788 (patch) | |
| tree | 0a8756ce4f6df0364fb238ee0057b78863afa8a5 /src/gpu/gl/GrGLProgram.cpp | |
| parent | c8c4b957288fd3114d60e3faa9bc95c4c15ca1f2 (diff) | |
Initial refactor of shaderbuilder to prepare for geometry shaders
gitignore for eclipse
BUG=skia:
R=bsalomon@google.com, bsalomon@chromium.org
Author: joshualitt@chromium.org
Review URL: https://codereview.chromium.org/491673002
Diffstat (limited to 'src/gpu/gl/GrGLProgram.cpp')
| -rw-r--r-- | src/gpu/gl/GrGLProgram.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/gpu/gl/GrGLProgram.cpp b/src/gpu/gl/GrGLProgram.cpp index d8c751d71d..d49d000fe3 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) |