commit 7226c232d73356a37ec8cfef0ed55147e68dd2fd
author Brian Salomon <bsalomon@google.com> Mon Jul 30 13:13:17 2018 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Jul 30 19:32:13 2018 +0000
tree 47559e4a5994b5cffc5382e9bb230f49b6c04cd7
parent 3ebd354730ea9590bf233deccfc24982ffe48a98

Make GrTextureProxy store a GrTextureType.

Removes flag indicating rectangle or external as its now redundant.

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

tests/RectangleTextureTest.cpp

diff --git a/tests/RectangleTextureTest.cpp b/tests/RectangleTextureTest.cpp
index b3846a1..68e4fea 100644
--- a/tests/RectangleTextureTest.cpp
+++ b/tests/RectangleTextureTest.cpp
@@ -141,10 +141,11 @@
         SkASSERT(rectProxy->mipMapped() == GrMipMapped::kNo);
         SkASSERT(rectProxy->priv().peekTexture()->texturePriv().mipMapped() == GrMipMapped::kNo);
 
-        SkASSERT(rectProxy->texPriv().isGLTextureRectangleOrExternal());
-        SkASSERT(rectProxy->priv().peekTexture()->surfacePriv().isGLTextureRectangleOrExternal());
-        SkASSERT(rectProxy->texPriv().isClampOnly());
-        SkASSERT(rectProxy->priv().peekTexture()->surfacePriv().isClampOnly());
+        SkASSERT(rectProxy->texPriv().textureType() == GrTextureType::kRectangle);
+        SkASSERT(rectProxy->priv().peekTexture()->texturePriv().textureType() ==
+                 GrTextureType::kRectangle);
+        SkASSERT(rectProxy->texPriv().hasRestrictedSampling());
+        SkASSERT(rectProxy->priv().peekTexture()->texturePriv().hasRestrictedSampling());
 
         test_basic_draw_as_src(reporter, context, rectProxy, refPixels);