diff options
author | Greg Daniel <egdaniel@google.com> | 2018-07-02 16:47:38 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-07-03 13:41:13 +0000 |
commit | ff2181e62e79ffd2ce628fc8c05b5457d4f54163 (patch) | |
tree | 5185ca093986d1ee49dd3abfa93a00991c77ac7a /include | |
parent | 94d57c477fe122c146a034c625cebb6c44ef21b0 (diff) |
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 <egdaniel@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/gpu/GrBackendSurface.h | 43 |
1 files changed, 13 insertions, 30 deletions
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 |