From 5338f99a8a75d0e7622a37c5d1c05fcce49f55f5 Mon Sep 17 00:00:00 2001 From: Ethan Nicholas Date: Wed, 19 Apr 2017 15:54:07 -0400 Subject: rectangle texture scaling is now handled in skslc Bug: skia: Change-Id: I658a95576143d69656cd63aec44ff65d430d332f Reviewed-on: https://skia-review.googlesource.com/13813 Reviewed-by: Brian Osman Commit-Queue: Ethan Nicholas --- src/gpu/glsl/GrGLSLShaderBuilder.cpp | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'src/gpu/glsl') diff --git a/src/gpu/glsl/GrGLSLShaderBuilder.cpp b/src/gpu/glsl/GrGLSLShaderBuilder.cpp index 865876611a..2c7e5e476d 100644 --- a/src/gpu/glsl/GrGLSLShaderBuilder.cpp +++ b/src/gpu/glsl/GrGLSLShaderBuilder.cpp @@ -72,18 +72,7 @@ void GrGLSLShaderBuilder::appendTextureLookup(SkString* out, const char* coordName, GrSLType varyingType) const { const GrShaderVar& sampler = fProgramBuilder->samplerVariable(samplerHandle); - GrSLType samplerType = sampler.getType(); - if (samplerType == kTexture2DRectSampler_GrSLType) { - if (varyingType == kVec2f_GrSLType) { - out->appendf("texture(%s, textureSize(%s) * %s)", - sampler.c_str(), sampler.c_str(), coordName); - } else { - out->appendf("texture(%s, vec3(textureSize(%s) * %s.xy, %s.z))", - sampler.c_str(), sampler.c_str(), coordName, coordName); - } - } else { - out->appendf("texture(%s, %s)", sampler.c_str(), coordName); - } + out->appendf("texture(%s, %s)", sampler.c_str(), coordName); append_texture_swizzle(out, fProgramBuilder->samplerSwizzle(samplerHandle)); } -- cgit v1.2.3