When creating emptyp MipMap proxies, don't instantiate them immediately. Attempt 3

original: https://skia-review.googlesource.com/106966

Bug: skia:
Change-Id: I779985cef2d3c4f36a0129d8ecedd12e510bec7e
Reviewed-on: https://skia-review.googlesource.com/107781
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>

1 files changed, 3 insertions, 2 deletions

diff --git a/src/gpu/GrTextureRenderTargetProxy.cpp b/src/gpu/GrTextureRenderTargetProxy.cpp
index 2d5dbeee9f..50077c4c0f 100644
--- a/src/gpu/GrTextureRenderTargetProxy.cpp
+++ b/src/gpu/GrTextureRenderTargetProxy.cpp
@@ -19,12 +19,13 @@
 // GrRenderTargetProxy) so its constructor must be explicitly called.
 GrTextureRenderTargetProxy::GrTextureRenderTargetProxy(const GrCaps& caps,
                                                        const GrSurfaceDesc& desc,
+                                                       GrMipMapped mipMapped,
                                                        SkBackingFit fit,
                                                        SkBudgeted budgeted,
                                                        uint32_t flags)
         : GrSurfaceProxy(desc, fit, budgeted, flags)
         // for now textures w/ data are always wrapped
-        , GrTextureProxy(desc, fit, budgeted, nullptr, 0, flags)
+        , GrTextureProxy(desc, mipMapped, fit, budgeted, nullptr, 0, flags)
         , GrRenderTargetProxy(caps, desc, fit, budgeted, flags) {
 }
 
@@ -59,7 +60,7 @@ size_t GrTextureRenderTargetProxy::onUninstantiatedGpuMemorySize() const {
     int colorSamplesPerPixel = this->numColorSamples();
     if (colorSamplesPerPixel > 1) {
         // Add one to account for the resolve buffer.
-        ++colorSamplesPerPixel += 1;
+        ++colorSamplesPerPixel;
     }
 
     // TODO: do we have enough information to improve this worst case estimate?