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>

1 files changed, 27 insertions, 23 deletions

diff --git a/tests/GrTextureMipMapInvalidationTest.cpp b/tests/GrTextureMipMapInvalidationTest.cpp
index d832889144..8da79c9565 100644
--- a/tests/GrTextureMipMapInvalidationTest.cpp
+++ b/tests/GrTextureMipMapInvalidationTest.cpp
@@ -27,27 +27,31 @@ DEF_GPUTEST_FOR_NULLGL_CONTEXT(GrTextureMipMapInvalidationTest, reporter, ctxInf
 
     GrContext* context = ctxInfo.grContext();
     auto info = SkImageInfo::MakeN32Premul(256, 256);
-    auto surf1 = SkSurface::MakeRenderTarget(context, SkBudgeted::kYes, info);
-    auto surf2 = SkSurface::MakeRenderTarget(context, SkBudgeted::kYes, info);
-    // Draw something just in case we ever had a solid color optimization
-    surf1->getCanvas()->drawCircle(128, 128, 50, SkPaint());
-    surf1->getCanvas()->flush();
-
-    // No mipmaps initially
-    REPORTER_ASSERT(reporter, !isMipped(surf1.get()));
-
-    // Painting with downscale and medium filter quality should result in mipmap creation
-    SkPaint paint;
-    paint.setFilterQuality(kMedium_SkFilterQuality);
-    surf2->getCanvas()->scale(0.2f, 0.2f);
-    surf2->getCanvas()->drawImage(surf1->makeImageSnapshot(), 0, 0, &paint);
-    surf2->getCanvas()->flush();
-    REPORTER_ASSERT(reporter, isMipped(surf1.get()));
-    REPORTER_ASSERT(reporter, !mipsAreDirty(surf1.get()));
-
-    // Changing the contents of the surface should invalidate the mipmap, but not de-allocate
-    surf1->getCanvas()->drawCircle(128, 128, 100, SkPaint());
-    surf1->getCanvas()->flush();
-    REPORTER_ASSERT(reporter, isMipped(surf1.get()));
-    REPORTER_ASSERT(reporter, mipsAreDirty(surf1.get()));
+    for (auto allocateMips : {false, true}) {
+        auto surf1 = SkSurface::MakeRenderTarget(context, SkBudgeted::kYes, info, 0,
+                                                 kBottomLeft_GrSurfaceOrigin, nullptr,
+                                                 allocateMips);
+        auto surf2 = SkSurface::MakeRenderTarget(context, SkBudgeted::kYes, info);
+        // Draw something just in case we ever had a solid color optimization
+        surf1->getCanvas()->drawCircle(128, 128, 50, SkPaint());
+        surf1->getCanvas()->flush();
+
+        // No mipmaps initially
+        REPORTER_ASSERT(reporter, isMipped(surf1.get()) == allocateMips);
+
+        // Painting with downscale and medium filter quality should result in mipmap creation
+        SkPaint paint;
+        paint.setFilterQuality(kMedium_SkFilterQuality);
+        surf2->getCanvas()->scale(0.2f, 0.2f);
+        surf2->getCanvas()->drawImage(surf1->makeImageSnapshot(), 0, 0, &paint);
+        surf2->getCanvas()->flush();
+        REPORTER_ASSERT(reporter, isMipped(surf1.get()) == allocateMips);
+        REPORTER_ASSERT(reporter, !allocateMips || !mipsAreDirty(surf1.get()));
+
+        // Changing the contents of the surface should invalidate the mipmap, but not de-allocate
+        surf1->getCanvas()->drawCircle(128, 128, 100, SkPaint());
+        surf1->getCanvas()->flush();
+        REPORTER_ASSERT(reporter, isMipped(surf1.get()) == allocateMips);
+        REPORTER_ASSERT(reporter, mipsAreDirty(surf1.get()));
+    }
 }