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/GrGLProgramDesc.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/GrGLProgramDesc.cpp')
-rw-r--r-- | src/gpu/gl/GrGLProgramDesc.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/gpu/gl/GrGLProgramDesc.cpp b/src/gpu/gl/GrGLProgramDesc.cpp index e1a319104d..7cdbcd0efc 100644 --- a/src/gpu/gl/GrGLProgramDesc.cpp +++ b/src/gpu/gl/GrGLProgramDesc.cpp @@ -5,11 +5,11 @@ * found in the LICENSE file. */ +#include "gl/builders/GrGLProgramBuilder.h" #include "GrGLProgramDesc.h" #include "GrBackendEffectFactory.h" #include "GrDrawEffect.h" #include "GrEffect.h" -#include "GrGLShaderBuilder.h" #include "GrGpuGL.h" #include "SkChecksum.h" @@ -212,15 +212,16 @@ bool GrGLProgramDesc::Build(const GrDrawState& drawState, if (NULL != dstCopy) { dstCopyTexture = dstCopy->texture(); } - header->fDstReadKey = GrGLShaderBuilder::KeyForDstRead(dstCopyTexture, gpu->glCaps()); + header->fDstReadKey = GrGLFragmentShaderBuilder::KeyForDstRead(dstCopyTexture, + gpu->glCaps()); SkASSERT(0 != header->fDstReadKey); } else { header->fDstReadKey = 0; } if (readFragPosition) { - header->fFragPosKey = GrGLShaderBuilder::KeyForFragmentPosition(drawState.getRenderTarget(), - gpu->glCaps()); + header->fFragPosKey = GrGLFragmentShaderBuilder::KeyForFragmentPosition( + drawState.getRenderTarget(), gpu->glCaps()); } else { header->fFragPosKey = 0; } |