diff options
| author |  tomhudson@google.com <tomhudson@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-05-24 17:44:30 +0000 |
|---|---|---|
| committer | tomhudson@google.com <tomhudson@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-05-24 17:44:30 +0000 |
| commit | 5259814305e3290dea3b197301f7824a14c5fa6f (patch) | |
| tree | 7f04020f99f01833c1d8e63b910c8490b0ae0e34 /src/gpu/effects | |
| parent | 3fd979874c5bd233a8f731fb68fca87f84712a52 (diff) | |
Move swizzle & modulation computation, non-virtual functions onto
GrGLShaderBuilder. This lets us access all the default computations
when there's no GrCustomStage specified, and means that GrGLProgramStage
is effectively an interface class, all of whose functions can/should
be overriden.
http://codereview.appspot.com/6242051/
git-svn-id: http://skia.googlecode.com/svn/trunk@4045 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/gpu/effects')
| -rw-r--r-- | src/gpu/effects/GrConvolutionEffect.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gpu/effects/GrConvolutionEffect.cpp b/src/gpu/effects/GrConvolutionEffect.cpp index 8ccf5859e4..15f2aebd5f 100644 --- a/src/gpu/effects/GrConvolutionEffect.cpp +++ b/src/gpu/effects/GrConvolutionEffect.cpp @@ -124,7 +124,7 @@ void GrGLConvolutionEffect::emitFS(GrGLShaderBuilder* state, fKernelWidth); code->appendf("\t\t\tsum += "); - this->emitTextureLookup(code, samplerName, "coord"); + state->emitTextureLookup(samplerName, "coord"); code->appendf(" * %s;\n", kernelIndex.c_str()); code->appendf("\t\t\tcoord += %s;\n", |