Index: src/gpu/gl/builders/GrGLFragmentShaderBuilder.cpp |
diff --git a/src/gpu/gl/builders/GrGLFragmentShaderBuilder.cpp b/src/gpu/gl/builders/GrGLFragmentShaderBuilder.cpp |
index ee137c483a9218e84d3012155440f223e574b0b0..044752f7a538b2fc68f5b53430f31a197e81afb9 100644 |
--- a/src/gpu/gl/builders/GrGLFragmentShaderBuilder.cpp |
+++ b/src/gpu/gl/builders/GrGLFragmentShaderBuilder.cpp |
@@ -12,7 +12,7 @@ |
#define GL_CALL(X) GR_GL_CALL(fProgramBuilder->gpu()->glInterface(), X) |
#define GL_CALL_RET(R, X) GR_GL_CALL_RET(fProgramBuilder->gpu()->glInterface(), R, X) |
-const char* GrGLFragmentShaderBuilder::kDstTextureColorName = "_dstColor"; |
+const char* GrGLFragmentShaderBuilder::kDstCopyColorName = "_dstColor"; |
static const char* declared_color_output_name() { return "fsColorOut"; } |
static const char* dual_source_output_name() { return "dualSourceOut"; } |
static void append_default_precision_qualifier(GrSLPrecision p, |
@@ -78,17 +78,17 @@ |
} |
GrGLFragmentShaderBuilder::DstReadKey |
-GrGLFragmentShaderBuilder::KeyForDstRead(const GrTexture* dstTexture, const GrGLCaps& caps) { |
+GrGLFragmentShaderBuilder::KeyForDstRead(const GrTexture* dstCopy, const GrGLCaps& caps) { |
uint32_t key = kYesDstRead_DstReadKeyBit; |
if (caps.glslCaps()->fbFetchSupport()) { |
return key; |
} |
- SkASSERT(dstTexture); |
- if (!caps.textureSwizzleSupport() && GrPixelConfigIsAlphaOnly(dstTexture->config())) { |
+ SkASSERT(dstCopy); |
+ if (!caps.textureSwizzleSupport() && GrPixelConfigIsAlphaOnly(dstCopy->config())) { |
// The fact that the config is alpha-only must be considered when generating code. |
key |= kUseAlphaConfig_DstReadKeyBit; |
} |
- if (kTopLeft_GrSurfaceOrigin == dstTexture->origin()) { |
+ if (kTopLeft_GrSurfaceOrigin == dstCopy->origin()) { |
key |= kTopLeftOrigin_DstReadKeyBit; |
} |
SkASSERT(static_cast<DstReadKey>(key) == key); |
@@ -220,7 +220,7 @@ |
} |
return fbFetchColorName; |
} else { |
- return kDstTextureColorName; |
+ return kDstCopyColorName; |
} |
} |