diff options
| author |  bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-01-22 19:55:59 +0000 |
|---|---|---|
| committer | bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-01-22 19:55:59 +0000 |
| commit | 6340a41108633ac1ce5941e5cd30538630c4c55b (patch) | |
| tree | c6f791722f09f6cf31207aea8093b1b06be3ae92 /src/gpu/gl/GrGLShaderBuilder.cpp | |
| parent | ba3284e7bbb830749206414890f8152e421969f2 (diff) | |
Let them eat GrEffectRef.
Changes the remaining existing code that operates on naked GrEffects to GrEffectRef.
Review URL: https://codereview.appspot.com/7124058
git-svn-id: http://skia.googlecode.com/svn/trunk@7321 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/gpu/gl/GrGLShaderBuilder.cpp')
| -rw-r--r-- | src/gpu/gl/GrGLShaderBuilder.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gpu/gl/GrGLShaderBuilder.cpp b/src/gpu/gl/GrGLShaderBuilder.cpp index 0845fdd225..a8514ad471 100644 --- a/src/gpu/gl/GrGLShaderBuilder.cpp +++ b/src/gpu/gl/GrGLShaderBuilder.cpp @@ -422,16 +422,16 @@ GrGLEffect* GrGLShaderBuilder::createAndEmitGLEffect( SkTArray<GrGLUniformManager::UniformHandle, true>* samplerHandles) { GrAssert(NULL != stage.getEffect()); - const GrEffect& effect = *stage.getEffect(); - int numTextures = effect.numTextures(); + const GrEffectRef& effect = *stage.getEffect(); + int numTextures = effect->numTextures(); SkSTArray<8, GrGLShaderBuilder::TextureSampler> textureSamplers; textureSamplers.push_back_n(numTextures); for (int i = 0; i < numTextures; ++i) { - textureSamplers[i].init(this, &effect.textureAccess(i), i); + textureSamplers[i].init(this, &effect->textureAccess(i), i); samplerHandles->push_back(textureSamplers[i].fSamplerUniform); } - GrGLEffect* glEffect = effect.getFactory().createGLInstance(effect); + GrGLEffect* glEffect = effect->getFactory().createGLInstance(effect); // Enclose custom code in a block to avoid namespace conflicts this->fVSCode.appendf("\t{ // %s\n", glEffect->name()); |