diff options
| author |  bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-07-25 20:58:20 +0000 |
|---|---|---|
| committer | bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-07-25 20:58:20 +0000 |
| commit | 777c3aab0a902b0917871080d99b0a249ec06298 (patch) | |
| tree | b5c7c24e3c6f30ab13fbb604d13c7199a04f638d /src/gpu/effects/GrConvolutionEffect.cpp | |
| parent | 09640d6bac2fc42e012b3ed6cdce5962f4e186fe (diff) | |
Remove uniform names from top of GrGLProgram.cpp, builder responsible for "u" and stage num tags.
Also add LF eol-style property to some files in src/gpu/effects.
Review URL: http://codereview.appspot.com/6448049/
git-svn-id: http://skia.googlecode.com/svn/trunk@4770 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/gpu/effects/GrConvolutionEffect.cpp')
| -rw-r--r-- | src/gpu/effects/GrConvolutionEffect.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/gpu/effects/GrConvolutionEffect.cpp b/src/gpu/effects/GrConvolutionEffect.cpp index f01caa3901..6af891b098 100644 --- a/src/gpu/effects/GrConvolutionEffect.cpp +++ b/src/gpu/effects/GrConvolutionEffect.cpp @@ -20,8 +20,7 @@ public: GrGLConvolutionEffect(const GrProgramStageFactory& factory, const GrCustomStage& stage); - virtual void setupVariables(GrGLShaderBuilder* builder, - int stage) SK_OVERRIDE; + virtual void setupVariables(GrGLShaderBuilder* builder) SK_OVERRIDE; virtual void emitVS(GrGLShaderBuilder* builder, const char* vertexCoords) SK_OVERRIDE; virtual void emitFS(GrGLShaderBuilder* builder, @@ -56,13 +55,12 @@ GrGLConvolutionEffect::GrGLConvolutionEffect(const GrProgramStageFactory& factor fRadius = c.radius(); } -void GrGLConvolutionEffect::setupVariables(GrGLShaderBuilder* builder, - int stage) { +void GrGLConvolutionEffect::setupVariables(GrGLShaderBuilder* builder) { fImageIncrementUni = builder->addUniform(GrGLShaderBuilder::kFragment_ShaderType | GrGLShaderBuilder::kVertex_ShaderType, - kVec2f_GrSLType, "uImageIncrement", stage); - fKernelUni = builder->addUniform(GrGLShaderBuilder::kFragment_ShaderType, - kFloat_GrSLType, "uKernel", stage, this->width()); + kVec2f_GrSLType, "ImageIncrement"); + fKernelUni = builder->addUniformArray(GrGLShaderBuilder::kFragment_ShaderType, + kFloat_GrSLType, "Kernel", this->width()); } void GrGLConvolutionEffect::emitVS(GrGLShaderBuilder* builder, |