diff options
| author |  bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-11-05 16:36:02 +0000 |
|---|---|---|
| committer | bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-11-05 16:36:02 +0000 |
| commit | dbe49f735484f8862e378b63d0a074a301093dd0 (patch) | |
| tree | 1508f66f4b524f176fe0d94b9cd0ccd1f5b549a6 /src/gpu/effects | |
| parent | 4187a2fc71e9f72401e5314a1dca41a556096c51 (diff) | |
Remove default texture coords / texture matrix
Review URL: https://codereview.appspot.com/6775100
git-svn-id: http://skia.googlecode.com/svn/trunk@6293 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/gpu/effects')
| -rw-r--r-- | src/gpu/effects/GrConfigConversionEffect.cpp | 3 | ||||
| -rw-r--r-- | src/gpu/effects/GrConvolutionEffect.cpp | 1 | ||||
| -rw-r--r-- | src/gpu/effects/GrSingleTextureEffect.cpp | 4 | ||||
| -rw-r--r-- | src/gpu/effects/GrTextureDomainEffect.cpp | 1 |
4 files changed, 2 insertions, 7 deletions
diff --git a/src/gpu/effects/GrConfigConversionEffect.cpp b/src/gpu/effects/GrConfigConversionEffect.cpp index a2aad29400..d42896d210 100644 --- a/src/gpu/effects/GrConfigConversionEffect.cpp +++ b/src/gpu/effects/GrConfigConversionEffect.cpp @@ -19,7 +19,6 @@ public: const GrConfigConversionEffect& effect = static_cast<const GrConfigConversionEffect&>(s); fSwapRedAndBlue = effect.swapsRedAndBlue(); fPMConversion = effect.pmConversion(); - fRequiresTextureMatrix = false; } virtual void emitCode(GrGLShaderBuilder* builder, @@ -261,7 +260,7 @@ bool GrConfigConversionEffect::InstallEffect(GrTexture* texture, // If we returned a GrConfigConversionEffect that was equivalent to a GrSingleTextureEffect // then we may pollute our texture cache with redundant shaders. So in the case that no // conversions were requested we instead return a GrSingleTextureEffect. - stage->setEffect(SkNEW_ARGS(GrSingleTextureEffect, (texture, matrix)), matrix)->unref(); + stage->setEffect(SkNEW_ARGS(GrSingleTextureEffect, (texture, matrix)))->unref(); return true; } else { if (kRGBA_8888_GrPixelConfig != texture->config() && diff --git a/src/gpu/effects/GrConvolutionEffect.cpp b/src/gpu/effects/GrConvolutionEffect.cpp index 0ab215c126..047dc4165e 100644 --- a/src/gpu/effects/GrConvolutionEffect.cpp +++ b/src/gpu/effects/GrConvolutionEffect.cpp @@ -51,7 +51,6 @@ GrGLConvolutionEffect::GrGLConvolutionEffect(const GrBackendEffectFactory& facto const GrConvolutionEffect& c = static_cast<const GrConvolutionEffect&>(effect); fRadius = c.radius(); - fRequiresTextureMatrix = false; } void GrGLConvolutionEffect::emitCode(GrGLShaderBuilder* builder, diff --git a/src/gpu/effects/GrSingleTextureEffect.cpp b/src/gpu/effects/GrSingleTextureEffect.cpp index 0afa18451b..05eff6b3d4 100644 --- a/src/gpu/effects/GrSingleTextureEffect.cpp +++ b/src/gpu/effects/GrSingleTextureEffect.cpp @@ -16,9 +16,7 @@ class GrGLSingleTextureEffect : public GrGLEffect { public: GrGLSingleTextureEffect(const GrBackendEffectFactory& factory, const GrEffect&) - : INHERITED (factory) { - fRequiresTextureMatrix = false; - } + : INHERITED (factory) {} virtual void emitCode(GrGLShaderBuilder* builder, const GrEffectStage&, diff --git a/src/gpu/effects/GrTextureDomainEffect.cpp b/src/gpu/effects/GrTextureDomainEffect.cpp index 9909c3a649..f5152e6d91 100644 --- a/src/gpu/effects/GrTextureDomainEffect.cpp +++ b/src/gpu/effects/GrTextureDomainEffect.cpp @@ -39,7 +39,6 @@ GrGLTextureDomainEffect::GrGLTextureDomainEffect(const GrBackendEffectFactory& f const GrEffect&) : INHERITED(factory) , fNameUni(GrGLUniformManager::kInvalidUniformHandle) { - fRequiresTextureMatrix = false; fPrevDomain[0] = SK_FloatNaN; } |