From 108bb232775c0b768ce1beca929ed31a97b46ed3 Mon Sep 17 00:00:00 2001 From: Greg Daniel Date: Tue, 3 Jul 2018 16:18:29 -0400 Subject: Reland "Remove setting/use of GrPixelConfig in GrBackendTex/RT ctors." This reverts commit 34aa059c1502d67c9a5f4db449667a8709b69fb9. Reason for revert: Original change's description: > Revert "Remove setting/use of GrPixelConfig in GrBackendTex/RT ctors." > > This reverts commit ff2181e62e79ffd2ce628fc8c05b5457d4f54163. > > Reason for revert: suspect it's behind Chrome roll failure > > Original change's description: > > Remove setting/use of GrPixelConfig in GrBackendTex/RT ctors. > > > > Bug: skia: > > Change-Id: I1466668e3502cd1e6e1f6aed4105e0f626d293dd > > Reviewed-on: https://skia-review.googlesource.com/138987 > > Commit-Queue: Greg Daniel > > Reviewed-by: Robert Phillips > > TBR=egdaniel@google.com,bsalomon@google.com,robertphillips@google.com > > Change-Id: I4cba44858aafffbadc45e18349b93c741d7cfc66 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: skia: > Reviewed-on: https://skia-review.googlesource.com/139220 > Reviewed-by: Ethan Nicholas > Commit-Queue: Ethan Nicholas Bug: skia: Change-Id: Ib1fd10c126862824f3e31c420c697ac749c637f5 Reviewed-on: https://skia-review.googlesource.com/139221 Commit-Queue: Greg Daniel Reviewed-by: Robert Phillips --- include/gpu/GrBackendSurface.h | 43 +++++++++++++----------------------------- 1 file changed, 13 insertions(+), 30 deletions(-) (limited to 'include/gpu') diff --git a/include/gpu/GrBackendSurface.h b/include/gpu/GrBackendSurface.h index 7f05bb50ee..dc13795435 100644 --- a/include/gpu/GrBackendSurface.h +++ b/include/gpu/GrBackendSurface.h @@ -128,23 +128,6 @@ public: // Creates an invalid backend texture. GrBackendTexture() : fIsValid(false) {} -#if GR_TEST_UTILS - // GrGLTextureInfo::fFormat is ignored - // Deprecated: Should use version that does not take a GrPixelConfig instead - GrBackendTexture(int width, - int height, - GrPixelConfig config, - const GrGLTextureInfo& glInfo); - - // GrGLTextureInfo::fFormat is ignored - // Deprecated: Should use version that does not take a GrPixelConfig instead - GrBackendTexture(int width, - int height, - GrPixelConfig config, - GrMipMapped, - const GrGLTextureInfo& glInfo); -#endif - // The GrGLTextureInfo must have a valid fFormat. GrBackendTexture(int width, int height, @@ -209,7 +192,12 @@ public: bool isValid() const { return fIsValid; } #if GR_TEST_UTILS - GrPixelConfig testingOnly_getPixelConfig() const; + // We can remove the pixelConfig getter and setter once we remove the GrPixelConfig from the + // GrBackendTexture and plumb the GrPixelconfig manually throughout our code (or remove all use + // of GrPixelConfig in general). + GrPixelConfig pixelConfig() const { return fConfig; } + void setPixelConfig(GrPixelConfig config) { fConfig = config; } + static bool TestingOnly_Equals(const GrBackendTexture& , const GrBackendTexture&); #endif @@ -218,6 +206,7 @@ private: friend class SkImage; friend class SkImage_Gpu; friend class SkSurface; + friend class GrAHardwareBufferImageGenerator; friend class GrBackendTextureImageGenerator; friend class GrProxyProvider; friend class GrGpu; @@ -266,17 +255,6 @@ public: // Creates an invalid backend texture. GrBackendRenderTarget() : fIsValid(false) {} -#if GR_TEST_UTILS - // GrGLTextureInfo::fFormat is ignored - // Deprecated: Should use version that does not take a GrPixelConfig instead - GrBackendRenderTarget(int width, - int height, - int sampleCnt, - int stencilBits, - GrPixelConfig config, - const GrGLFramebufferInfo& glInfo); -#endif - // The GrGLTextureInfo must have a valid fFormat. GrBackendRenderTarget(int width, int height, @@ -348,7 +326,12 @@ public: #if GR_TEST_UTILS - GrPixelConfig testingOnly_getPixelConfig() const; + // We can remove the pixelConfig getter and setter once we remove the pixel config from the + // GrBackendRenderTarget and plumb the pixel config manually throughout our code (or remove all + // use of GrPixelConfig in general). + GrPixelConfig pixelConfig() const { return fConfig; } + void setPixelConfig(GrPixelConfig config) { fConfig = config; } + static bool TestingOnly_Equals(const GrBackendRenderTarget&, const GrBackendRenderTarget&); #endif -- cgit v1.2.3