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>

TBR=egdaniel@google.com,bsalomon@google.com,robertphillips@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>

1 files changed, 18 insertions, 23 deletions

diff --git a/tests/DeferredDisplayListTest.cpp b/tests/DeferredDisplayListTest.cpp
index 697f00328f..996e04fa79 100644
--- a/tests/DeferredDisplayListTest.cpp
+++ b/tests/DeferredDisplayListTest.cpp
@@ -846,31 +846,26 @@ 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 } ) {
-        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);
+        GrBackendFormat format = GrBackendFormat::MakeGL(GR_GL_RGBA8, target);
 
-            GrTextureProxy* backingProxy = ((SkImage_Gpu*) image.get())->peekProxy();
+        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);
 
-            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());
-            }
+        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());
         }
     }
 }