aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/gpu/gl/GrGLProgramDesc.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/gpu/gl/GrGLProgramDesc.cpp')
-rw-r--r--src/gpu/gl/GrGLProgramDesc.cpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/gpu/gl/GrGLProgramDesc.cpp b/src/gpu/gl/GrGLProgramDesc.cpp
index 19a26c9b08..ec09527182 100644
--- a/src/gpu/gl/GrGLProgramDesc.cpp
+++ b/src/gpu/gl/GrGLProgramDesc.cpp
@@ -5,7 +5,7 @@
* found in the LICENSE file.
*/
-#include "gl/builders/GrGLProgramBuilder.h"
+#include "gl/builders/GrGLFragmentShaderBuilder.h"
#include "GrGLProgramDesc.h"
#include "GrBackendProcessorFactory.h"
#include "GrProcessor.h"
@@ -178,7 +178,7 @@ bool GrGLProgramDesc::GetGeometryProcessorKey(const GrGeometryStage& stage,
if (NULL == key) {
return false;
}
- uint32_t attribKey = gen_attrib_key(stage.getGeometryProcessor());
+ uint32_t attribKey = gen_attrib_key(stage.getProcessor());
// Currently we allow 16 bits for each of the above portions of the meta-key. Fail if they
// don't fit.
@@ -348,15 +348,16 @@ bool GrGLProgramDesc::Build(const GrOptDrawState& optState,
dstCopyTexture = dstCopy->texture();
}
header->fDstReadKey = GrGLFragmentShaderBuilder::KeyForDstRead(dstCopyTexture,
- gpu->glCaps());
+ gpu->glCaps());
SkASSERT(0 != header->fDstReadKey);
} else {
header->fDstReadKey = 0;
}
if (optState.readsFragPosition()) {
- header->fFragPosKey = GrGLFragmentShaderBuilder::KeyForFragmentPosition(
- optState.getRenderTarget(), gpu->glCaps());
+ header->fFragPosKey =
+ GrGLFragmentShaderBuilder::KeyForFragmentPosition(optState.getRenderTarget(),
+ gpu->glCaps());
} else {
header->fFragPosKey = 0;
}