Reland "Reland "Require mips to be allocated at texture creation time and disable late allocations.""

This reverts commit 01422bc8eff0c317b9c234b3b4f5a82f1011dfce.

Reason for revert: follow on change may be ready

Original change's description:
> Revert "Reland "Require mips to be allocated at texture creation time and disable late allocations.""
> 
> This reverts commit 9eb36b9eb8e81e970e02fa985ae82fe64de0a8f0.
> 
> Reason for revert: Alpha8 isn't renderable on es2 so we end up dropping draws on certain A8 mip requests
> 
> Original change's description:
> > Reland "Require mips to be allocated at texture creation time and disable late allocations."
> > 
> > This reverts commit 0c78238e2991c95b6fb3c945d4ad2b5d941ae21b.
> > 
> > Reason for revert: <INSERT REASONING HERE>
> > 
> > Original change's description:
> > > Revert "Require mips to be allocated at texture creation time and disable late allocations."
> > > 
> > > This reverts commit cd2c3f9055452d413d6be7ea6dc63fd1922fe994.
> > > 
> > > Reason for revert: Looks to be causing angle failures on initial clear test
> > > 
> > > Original change's description:
> > > > Require mips to be allocated at texture creation time and disable late allocations.
> > > > 
> > > > If we get a non-mipped texture for a draw that wants to be use mip map filter, we
> > > > will copy the texture into a new mipped texture.
> > > > 
> > > > Clean up of unused code in the GPU backends for reallocating for mips will be done
> > > > in a follow up CL.
> > > > 
> > > > Bug: skia:
> > > > Change-Id: Idab588c1abf4bbbf7eeceb3727d500e5df274188
> > > > Reviewed-on: https://skia-review.googlesource.com/132830
> > > > Reviewed-by: Brian Salomon <bsalomon@google.com>
> > > > Commit-Queue: Greg Daniel <egdaniel@google.com>
> > > 
> > >
> > > 
> > > Change-Id: I49f0ace52f2586d61b451630b2e6aae84b420b81
> > > No-Presubmit: true
> > > No-Tree-Checks: true
> > > No-Try: true
> > > Bug: skia:
> > > Reviewed-on: https://skia-review.googlesource.com/133041
> > > Reviewed-by: Greg Daniel <egdaniel@google.com>
> > > Commit-Queue: Greg Daniel <egdaniel@google.com>
> > 
> > Bug: skia:
> > Change-Id: I004447a5f1ec72c3be2318ddea803f57efb12ea4
> > Reviewed-on: https://skia-review.googlesource.com/133340
> > Reviewed-by: Brian Salomon <bsalomon@google.com>
> > Commit-Queue: Greg Daniel <egdaniel@google.com>
> 
> TBR=egdaniel@google.com,bsalomon@google.com,robertphillips@google.com
> 
> Change-Id: I9e9718d380c4d9927ec39e46008750ab7396391f
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: skia:
> Reviewed-on: https://skia-review.googlesource.com/133680
> Reviewed-by: Greg Daniel <egdaniel@google.com>
> Commit-Queue: Greg Daniel <egdaniel@google.com>

TBR=egdaniel@google.com,bsalomon@google.com,robertphillips@google.com

Change-Id: Ic3df69f65a89962b21cdb50ee436a29fd121ab1f
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/133740
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>

3 files changed, 5 insertions, 32 deletions

diff --git a/include/gpu/GrSurface.h b/include/gpu/GrSurface.h
index f3771a74e2..3a7294b26e 100644
--- a/include/gpu/GrSurface.h
+++ b/include/gpu/GrSurface.h
@@ -63,20 +63,9 @@ public:
                               GrMipMapped, bool useNextPow2 = false);
 
 protected:
-    void setDoesNotSupportMipMaps() {
-        SkASSERT(this->asTexture());
-        fSurfaceFlags |= GrInternalSurfaceFlags::kDoesNotSupportMipMaps;
-    }
-    bool doesNotSupportMipMaps() const {
-        return fSurfaceFlags & GrInternalSurfaceFlags::kDoesNotSupportMipMaps;
-    }
-
     void setIsGLTextureRectangleOrExternal() {
         SkASSERT(this->asTexture());
         fSurfaceFlags |= GrInternalSurfaceFlags::kIsGLTextureRectangleOrExternal;
-        // If we are a GL rectangle or external texture, it also means that we do not support
-        // generating mip maps.
-        this->setDoesNotSupportMipMaps();
     }
     bool isGLTextureRectangleOrExternal() const {
         return fSurfaceFlags & GrInternalSurfaceFlags::kIsGLTextureRectangleOrExternal;
diff --git a/include/private/GrTextureProxy.h b/include/private/GrTextureProxy.h
index 8bbdbf2959..fc7f1c54a7 100644
--- a/include/private/GrTextureProxy.h
+++ b/include/private/GrTextureProxy.h
@@ -100,18 +100,8 @@ protected:
 
     sk_sp<GrSurface> createSurface(GrResourceProvider*) const override;
 
-    void setDoesNotSupportMipMaps() {
-        fSurfaceFlags |= GrInternalSurfaceFlags::kDoesNotSupportMipMaps;
-    }
-    bool doesNotSupportMipMaps() const {
-        return fSurfaceFlags & GrInternalSurfaceFlags::kDoesNotSupportMipMaps;
-    }
-
     void setIsGLTextureRectangleOrExternal() {
         fSurfaceFlags |= GrInternalSurfaceFlags::kIsGLTextureRectangleOrExternal;
-        // If we are a GL rectangle or external texture, it also means that we do not support
-        // generating mip maps.
-        this->setDoesNotSupportMipMaps();
     }
     bool isGLTextureRectangleOrExternal() const {
         return fSurfaceFlags & GrInternalSurfaceFlags::kIsGLTextureRectangleOrExternal;
diff --git a/include/private/GrTypesPriv.h b/include/private/GrTypesPriv.h
index 71871a0020..5913a1e48c 100644
--- a/include/private/GrTypesPriv.h
+++ b/include/private/GrTypesPriv.h
@@ -873,20 +873,14 @@ enum class GrInternalSurfaceFlags {
 
     // Texture-only flags
 
-    // This flag is set when the internal texture target doesn't support mipmaps (e.g.,
-    // external and rectangle textures). Note that Ganesh does not internally
-    // create resources with this limitation - this flag will only appear on resources passed
-    // into Ganesh.
-    kDoesNotSupportMipMaps          = 1 << 1,
-
     // This flag is for GL only. It says that the GL texture we will use has a target which is
     // either GL_TEXTURE_RECTANGLE or GL_GL_TEXTURE_EXTERNAL. We use this information to make
     // decisions about various rendering capabilites (e.g. is clamp the only supported wrap mode).
     // Note: Ganesh does not internally create these types of textures so they will only occur on
     // resources passed into Ganesh.
-    kIsGLTextureRectangleOrExternal = 1 << 2,
+    kIsGLTextureRectangleOrExternal = 1 << 1,
 
-    kTextureMask                    = kDoesNotSupportMipMaps | kIsGLTextureRectangleOrExternal,
+    kTextureMask                    = kIsGLTextureRectangleOrExternal,
 
     // RT-only
 
@@ -896,17 +890,17 @@ enum class GrInternalSurfaceFlags {
     //    this is disabled for FBO0
     //    but, otherwise, is enabled whenever MSAA is enabled and GrCaps reports mixed samples
     //        are supported
-    kMixedSampled                   = 1 << 3,
+    kMixedSampled                   = 1 << 2,
 
     // For internal resources:
     //    this is enabled whenever GrCaps reports window rect support
     // For wrapped resources1
     //    this is disabled for FBO0
     //    but, otherwise, is enabled whenever GrCaps reports window rect support
-    kWindowRectsSupport             = 1 << 4,
+    kWindowRectsSupport             = 1 << 3,
 
     // This flag is for use with GL only. It tells us that the internal render target wraps FBO 0.
-    kGLRTFBOIDIs0                   = 1 << 5,
+    kGLRTFBOIDIs0                   = 1 << 4,
 
     kRenderTargetMask               = kMixedSampled | kWindowRectsSupport | kGLRTFBOIDIs0,
 };