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>

1 files changed, 3 insertions, 7 deletions

diff --git a/src/gpu/GrTextureProxyPriv.h b/src/gpu/GrTextureProxyPriv.h
index 358369d516..519e96b497 100644
--- a/src/gpu/GrTextureProxyPriv.h
+++ b/src/gpu/GrTextureProxyPriv.h
@@ -31,14 +31,10 @@ public:
     // been instantiated or not.
     GrMipMapped proxyMipMapped() const { return fTextureProxy->fMipMapped; }
 
-    bool isGLTextureRectangleOrExternal() const {
-        return fTextureProxy->isGLTextureRectangleOrExternal();
+    GrTextureType textureType() const { return fTextureProxy->fTextureType; }
+    bool hasRestrictedSampling() const {
+        return GrTextureTypeHasRestrictedSampling(this->textureType());
     }
-    // We assume that if a texture is not a GL_TEXTURE_RECTANGLE or GL_TEXTURE_EXTERNAL then it is a
-    // GL_TEXTURE_2D
-    bool isGLTexture2D() const { return !fTextureProxy->isGLTextureRectangleOrExternal(); }
-    // We only support the clamp wrap mode with gl rectangle or external textures.
-    bool isClampOnly() const { return fTextureProxy->isGLTextureRectangleOrExternal(); }
 
 private:
     explicit GrTextureProxyPriv(GrTextureProxy* textureProxy) : fTextureProxy(textureProxy) {}