commit a9c22578101f54290c878cb6d0265dc0b853b61d
author Brian Salomon <bsalomon@google.com> Mon Aug 05 12:57:09 2019 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Aug 05 19:08:07 2019 +0000
tree 155b685f1dcf0ba2a41501146bd805c54be50d14
parent 2a558f5675f7d68361636127c0b0caa66b7c0800

Pass size and GrPixelConfig to GrSurface/Texture/RenderTarget constructors

Change-Id: I4421354453a22a0a2853fc3cd64199f76b70c9f2
Bug: skia:6718
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/232556
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
Auto-Submit: Brian Salomon <bsalomon@google.com>

include/gpu/GrRenderTarget.h

diff --git a/include/gpu/GrRenderTarget.h b/include/gpu/GrRenderTarget.h
index 5fd0793..2c330da 100644
--- a/include/gpu/GrRenderTarget.h
+++ b/include/gpu/GrRenderTarget.h
@@ -85,7 +85,7 @@
     const GrRenderTargetPriv renderTargetPriv() const;
 
 protected:
-    GrRenderTarget(GrGpu*, const GrSurfaceDesc&, int sampleCount, GrProtected,
+    GrRenderTarget(GrGpu*, const SkISize&, GrPixelConfig, int sampleCount, GrProtected,
                    GrStencilAttachment* = nullptr);
     ~GrRenderTarget() override;
 

include/gpu/GrSurface.h

diff --git a/include/gpu/GrSurface.h b/include/gpu/GrSurface.h
index a928d5e..ab84d65 100644
--- a/include/gpu/GrSurface.h
+++ b/include/gpu/GrSurface.h
@@ -111,11 +111,11 @@
     // Provides access to methods that should be public within Skia code.
     friend class GrSurfacePriv;
 
-    GrSurface(GrGpu* gpu, const GrSurfaceDesc& desc, GrProtected isProtected)
+    GrSurface(GrGpu* gpu, const SkISize& size, GrPixelConfig config, GrProtected isProtected)
             : INHERITED(gpu)
-            , fConfig(desc.fConfig)
-            , fWidth(desc.fWidth)
-            , fHeight(desc.fHeight)
+            , fConfig(config)
+            , fWidth(size.width())
+            , fHeight(size.height())
             , fSurfaceFlags(GrInternalSurfaceFlags::kNone)
             , fIsProtected(isProtected) {}
 

include/gpu/GrTexture.h

diff --git a/include/gpu/GrTexture.h b/include/gpu/GrTexture.h
index 09304d7..6285938 100644
--- a/include/gpu/GrTexture.h
+++ b/include/gpu/GrTexture.h
@@ -81,7 +81,7 @@
     inline const GrTexturePriv texturePriv() const;
 
 protected:
-    GrTexture(GrGpu*, const GrSurfaceDesc&, GrProtected, GrTextureType, GrMipMapsStatus);
+    GrTexture(GrGpu*, const SkISize&, GrPixelConfig, GrProtected, GrTextureType, GrMipMapsStatus);
 
     virtual bool onStealBackendTexture(GrBackendTexture*, SkImage::BackendTextureReleaseProc*) = 0;