diff options
author | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-03-12 16:36:08 +0000 |
---|---|---|
committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-03-12 16:36:08 +0000 |
commit | 84cd099704b3896ca66081a96508572a924f850c (patch) | |
tree | 7c00d3c0ac4d679425f8480d49d7ad92096ea251 /src/effects | |
parent | 758bc7aa483da5bf0bdb5e3dbc208902a8506a93 (diff) |
Clean up SkImageFilter.
Rename more occurences of 'target' to 'kernelOffset'.
This is a follow-up patch to
https://codereview.chromium.org/182983003/
BUG=skia:2187
R=senorblanco@chromium.org
Author: dominikg@chromium.org
Review URL: https://codereview.chromium.org/197013003
git-svn-id: http://skia.googlecode.com/svn/trunk@13768 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/effects')
-rw-r--r-- | src/effects/SkMatrixConvolutionImageFilter.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/effects/SkMatrixConvolutionImageFilter.cpp b/src/effects/SkMatrixConvolutionImageFilter.cpp index 9e4ad63e08..679764a812 100644 --- a/src/effects/SkMatrixConvolutionImageFilter.cpp +++ b/src/effects/SkMatrixConvolutionImageFilter.cpp @@ -412,7 +412,7 @@ private: UniformHandle fBoundsUni; UniformHandle fKernelUni; UniformHandle fImageIncrementUni; - UniformHandle fTargetUni; + UniformHandle fKernelOffsetUni; UniformHandle fGainUni; UniformHandle fBiasUni; @@ -467,15 +467,15 @@ void GrGLMatrixConvolutionEffect::emitCode(GrGLShaderBuilder* builder, kFloat_GrSLType, "Kernel", fKernelSize.width() * fKernelSize.height()); - fTargetUni = builder->addUniform(GrGLShaderBuilder::kFragment_Visibility, - kVec2f_GrSLType, "Target"); + fKernelOffsetUni = builder->addUniform(GrGLShaderBuilder::kFragment_Visibility, + kVec2f_GrSLType, "KernelOffset"); fGainUni = builder->addUniform(GrGLShaderBuilder::kFragment_Visibility, kFloat_GrSLType, "Gain"); fBiasUni = builder->addUniform(GrGLShaderBuilder::kFragment_Visibility, kFloat_GrSLType, "Bias"); const char* bounds = builder->getUniformCStr(fBoundsUni); - const char* kernelOffset = builder->getUniformCStr(fTargetUni); + const char* kernelOffset = builder->getUniformCStr(fKernelOffsetUni); const char* imgInc = builder->getUniformCStr(fImageIncrementUni); const char* kernel = builder->getUniformCStr(fKernelUni); const char* gain = builder->getUniformCStr(fGainUni); @@ -545,7 +545,7 @@ void GrGLMatrixConvolutionEffect::setData(const GrGLUniformManager& uman, imageIncrement[0] = 1.0f / texture.width(); imageIncrement[1] = ySign / texture.height(); uman.set2fv(fImageIncrementUni, 1, imageIncrement); - uman.set2fv(fTargetUni, 1, conv.kernelOffset()); + uman.set2fv(fKernelOffsetUni, 1, conv.kernelOffset()); uman.set1fv(fKernelUni, fKernelSize.width() * fKernelSize.height(), conv.kernel()); uman.set1f(fGainUni, conv.gain()); uman.set1f(fBiasUni, conv.bias()); |