diff options
author | Brian Salomon <bsalomon@google.com> | 2016-11-04 11:54:32 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-11-04 16:25:25 +0000 |
commit | 4d53c44aa6e8e0d1b6537f83e4287e5a1423ac75 (patch) | |
tree | ca7e88b141ef8667921b1ade269e7e2c838b13c0 /src/gpu/GrTexture.cpp | |
parent | 9598c2fbc29ddb5e5d86c5b82b401b62cee02775 (diff) |
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=4352
Change-Id: I1f023d4f4133e7eb393367580c0558257e56c8db
Reviewed-on: https://skia-review.googlesource.com/4352
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Chris Dalton <csmartdalton@google.com>
Diffstat (limited to 'src/gpu/GrTexture.cpp')
-rw-r--r-- | src/gpu/GrTexture.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gpu/GrTexture.cpp b/src/gpu/GrTexture.cpp index de1135a1eb..6fc1580e89 100644 --- a/src/gpu/GrTexture.cpp +++ b/src/gpu/GrTexture.cpp @@ -70,9 +70,10 @@ GrSurfaceOrigin resolve_origin(const GrSurfaceDesc& desc) { ////////////////////////////////////////////////////////////////////////////// GrTexture::GrTexture(GrGpu* gpu, const GrSurfaceDesc& desc, GrSLType samplerType, - bool wasMipMapDataProvided) + GrTextureParams::FilterMode highestFilterMode, bool wasMipMapDataProvided) : INHERITED(gpu, desc) , fSamplerType(samplerType) + , fHighestFilterMode(highestFilterMode) // Gamma treatment is explicitly set after creation via GrTexturePriv , fGammaTreatment(SkSourceGammaTreatment::kIgnore) { if (wasMipMapDataProvided) { |