diff options
| author |  Brian Salomon <bsalomon@google.com> | 2016-11-07 09:53:44 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-11-07 15:38:03 +0000 |
| commit | 739c5bf111baf977fe418a24fa00ce260989ee9a (patch) | |
| tree | b8a2bbe94bc66fef1912497a72f24bf993a69bf4 /src/gpu/glsl | |
| parent | 4394cc4b00a4b3af9037d3c6a86cfb1f016050a7 (diff) | |
Revert "Revert "Limit GL_TEXTURE_RECTANGLE filtering to bilinear.""
This reverts commit ce4d04ae8eace6ba53ff8b8c8d8f4a2e6af4e59f.
BUG=skia:5932
Original CL description:
>
>Limit GL_TEXTURE_RECTANGLE filtering to bilinear.
>
>Adds a clamp for GrTexture filtering that can be set by a subclass at construction. The clamping is performed by GrTextureParams. GrGLTexture limits filtering to bilinear for rectangle and external textures.
>
>Also moves samplerType() to GrTexturePriv from GrTexture.
>
>BUG=skia:5932
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4455
Change-Id: I4a9f4abac44979cb900f5b04fe741524eade66b1
Reviewed-on: https://skia-review.googlesource.com/4455
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'src/gpu/glsl')
| -rw-r--r-- | src/gpu/glsl/GrGLSLProgramBuilder.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gpu/glsl/GrGLSLProgramBuilder.cpp b/src/gpu/glsl/GrGLSLProgramBuilder.cpp index abfeafda0c..5b1fbe1c79 100644 --- a/src/gpu/glsl/GrGLSLProgramBuilder.cpp +++ b/src/gpu/glsl/GrGLSLProgramBuilder.cpp @@ -8,6 +8,7 @@ #include "glsl/GrGLSLProgramBuilder.h" #include "GrPipeline.h" +#include "GrTexturePriv.h" #include "glsl/GrGLSLFragmentProcessor.h" #include "glsl/GrGLSLGeometryProcessor.h" #include "glsl/GrGLSLVarying.h" @@ -244,7 +245,7 @@ void GrGLSLProgramBuilder::emitSamplers(const GrProcessor& processor, int numTextures = processor.numTextures(); for (int t = 0; t < numTextures; ++t) { const GrTextureAccess& access = processor.textureAccess(t); - GrSLType samplerType = access.getTexture()->samplerType(); + GrSLType samplerType = access.getTexture()->texturePriv().samplerType(); if (kTextureExternalSampler_GrSLType == samplerType) { const char* externalFeatureString = this->glslCaps()->externalTextureExtensionString(); // We shouldn't ever create a GrGLTexture that requires external sampler type |