diff options
| author |  bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-07-11 15:03:31 +0000 |
|---|---|---|
| committer | bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-07-11 15:03:31 +0000 |
| commit | eb715c8d5caa2191d611c4f9cfb22b4afc6c8d02 (patch) | |
| tree | fef8a29dadf8c8c76ccf166ea045bd047abc811a /src/gpu/effects/GrConvolutionEffect.cpp | |
| parent | f3ccda7d4f54a149487dfe96e2cc7c2d7f28502b (diff) | |
VariableVisibility -> ShaderType
Review URL: http://codereview.appspot.com/6344103/
git-svn-id: http://skia.googlecode.com/svn/trunk@4534 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/gpu/effects/GrConvolutionEffect.cpp')
| -rw-r--r-- | src/gpu/effects/GrConvolutionEffect.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/gpu/effects/GrConvolutionEffect.cpp b/src/gpu/effects/GrConvolutionEffect.cpp index 349c8672b3..42dc2b49f1 100644 --- a/src/gpu/effects/GrConvolutionEffect.cpp +++ b/src/gpu/effects/GrConvolutionEffect.cpp @@ -60,12 +60,11 @@ GrGLConvolutionEffect::GrGLConvolutionEffect(const GrProgramStageFactory& factor void GrGLConvolutionEffect::setupVariables(GrGLShaderBuilder* state, int stage) { - fImageIncrementVar = &state->addUniform( - GrGLShaderBuilder::kBoth_VariableLifetime, - kVec2f_GrSLType, "uImageIncrement", stage); - fKernelVar = &state->addUniform( - GrGLShaderBuilder::kFragment_VariableLifetime, - kFloat_GrSLType, "uKernel", stage, this->width()); + fImageIncrementVar = &state->addUniform(GrGLShaderBuilder::kFragment_ShaderType | + GrGLShaderBuilder::kVertex_ShaderType, + kVec2f_GrSLType, "uImageIncrement", stage); + fKernelVar = &state->addUniform(GrGLShaderBuilder::kFragment_ShaderType, + kFloat_GrSLType, "uKernel", stage, this->width()); fImageIncrementLocation = kUseUniform; fKernelLocation = kUseUniform; |