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, 7 insertions, 1 deletions

diff --git a/src/gpu/GrTexture.cpp b/src/gpu/GrTexture.cpp
index 0051a225ef..cd3e7055ab 100644
--- a/src/gpu/GrTexture.cpp
+++ b/src/gpu/GrTexture.cpp
@@ -25,8 +25,14 @@ void GrTexture::markMipMapsDirty() {
 }
 
 void GrTexture::markMipMapsClean() {
-    SkASSERT(GrMipMapsStatus::kNotAllocated != fMipMapsStatus);
+    const bool sizeChanged = 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 {