commit dc82994e3a76141cc037c92a644b7a6c54c87ad7
author Brian Salomon <bsalomon@google.com> Tue Oct 23 16:07:24 2018 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Oct 24 12:43:42 2018 +0000
tree 3e077f9ce91540cbcee1a97cf5ed8d63b3329043
parent 0ade68cb08f070126ec79a00448642db39cd2e4a

Revert "Reland "Reland "Revert "Use OpenGL sampler objects when available.""""

This reverts commit 327955b1ba194eb010ff5a3ef1f32a913d52dd5c.

Bug: skia:8471
Change-Id: I56eb9509f0e2d5c4aa9e2a110a73a09723f77c4a
Reviewed-on: https://skia-review.googlesource.com/c/164617
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>

src/gpu/gl/GrGLTexture.cpp

diff --git a/src/gpu/gl/GrGLTexture.cpp b/src/gpu/gl/GrGLTexture.cpp
index 7cdf505..47878da 100644
--- a/src/gpu/gl/GrGLTexture.cpp
+++ b/src/gpu/gl/GrGLTexture.cpp
@@ -68,8 +68,7 @@
 void GrGLTexture::init(const GrSurfaceDesc& desc, const IDDesc& idDesc) {
     SkASSERT(0 != idDesc.fInfo.fID);
     SkASSERT(0 != idDesc.fInfo.fFormat);
-    fTexParams.invalidate();
-    fTexParamsTimestamp = GrGpu::kExpiredTimestamp;
+    fParamsTimestamp = GrGpu::kExpiredTimestamp;
     fID = idDesc.fInfo.fID;
     fFormat = idDesc.fInfo.fFormat;
     fTextureIDOwnership = idDesc.fOwnership;