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>

1 files changed, 1 insertions, 7 deletions

diff --git a/src/gpu/GrTexture.cpp b/src/gpu/GrTexture.cpp
index cd3e7055ab..0051a225ef 100644
--- a/src/gpu/GrTexture.cpp
+++ b/src/gpu/GrTexture.cpp
@@ -25,14 +25,8 @@ void GrTexture::markMipMapsDirty() {
 }
 
 void GrTexture::markMipMapsClean() {
-    const bool sizeChanged = GrMipMapsStatus::kNotAllocated == fMipMapsStatus;
+    SkASSERT(GrMipMapsStatus::kNotAllocated != fMipMapsStatus);
     fMipMapsStatus = GrMipMapsStatus::kValid;
-    if (sizeChanged) {
-        // This must not be called until after changing fMipMapsStatus.
-        this->didChangeGpuMemorySize();
-        // TODO(http://skbug.com/4548) - The desc and scratch key should be
-        // updated to reflect the newly-allocated mipmaps.
-    }
 }
 
 size_t GrTexture::onGpuMemorySize() const {