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>

1 files changed, 23 insertions, 18 deletions

diff --git a/tests/DeferredDisplayListTest.cpp b/tests/DeferredDisplayListTest.cpp
index 996e04fa79..697f00328f 100644
--- a/tests/DeferredDisplayListTest.cpp
+++ b/tests/DeferredDisplayListTest.cpp
@@ -846,26 +846,31 @@ DEF_GPUTEST_FOR_GL_RENDERING_CONTEXTS(DDLTextureFlagsTest, reporter, ctxInfo) {
     SkDeferredDisplayListRecorder recorder(characterization);
 
     for (GrGLenum target : { GR_GL_TEXTURE_EXTERNAL, GR_GL_TEXTURE_RECTANGLE, GR_GL_TEXTURE_2D } ) {
-        GrBackendFormat format = GrBackendFormat::MakeGL(GR_GL_RGBA8, target);
-
-        sk_sp<SkImage> image = recorder.makePromiseTexture(format, 32, 32, GrMipMapped::kYes,
-                                                           kTopLeft_GrSurfaceOrigin,
-                                                           kRGBA_8888_SkColorType,
-                                                           kPremul_SkAlphaType, nullptr,
-                                                           dummy_fulfill_proc,
-                                                           dummy_release_proc,
-                                                           dummy_done_proc,
-                                                           nullptr);
-        REPORTER_ASSERT(reporter, image);
+        for (auto mipMapped : { GrMipMapped::kNo, GrMipMapped::kYes }) {
+            GrBackendFormat format = GrBackendFormat::MakeGL(GR_GL_RGBA8, target);
+
+            sk_sp<SkImage> image = recorder.makePromiseTexture(format, 32, 32, mipMapped,
+                                                               kTopLeft_GrSurfaceOrigin,
+                                                               kRGBA_8888_SkColorType,
+                                                               kPremul_SkAlphaType, nullptr,
+                                                               dummy_fulfill_proc,
+                                                               dummy_release_proc,
+                                                               dummy_done_proc,
+                                                               nullptr);
+            if (GR_GL_TEXTURE_2D != target && mipMapped == GrMipMapped::kYes) {
+                REPORTER_ASSERT(reporter, !image);
+                continue;
+            }
+            REPORTER_ASSERT(reporter, image);
 
-        GrTextureProxy* backingProxy = ((SkImage_Gpu*) image.get())->peekProxy();
+            GrTextureProxy* backingProxy = ((SkImage_Gpu*) image.get())->peekProxy();
 
-        if (GR_GL_TEXTURE_2D == target) {
-            REPORTER_ASSERT(reporter, !backingProxy->texPriv().doesNotSupportMipMaps());
-            REPORTER_ASSERT(reporter, !backingProxy->texPriv().isClampOnly());
-        } else {
-            REPORTER_ASSERT(reporter, backingProxy->texPriv().doesNotSupportMipMaps());
-            REPORTER_ASSERT(reporter, backingProxy->texPriv().isClampOnly());
+            REPORTER_ASSERT(reporter, backingProxy->mipMapped() == mipMapped);
+            if (GR_GL_TEXTURE_2D == target) {
+                REPORTER_ASSERT(reporter, !backingProxy->texPriv().isClampOnly());
+            } else {
+                REPORTER_ASSERT(reporter, backingProxy->texPriv().isClampOnly());
+            }
         }
     }
 }