diff options
| author |  Greg Daniel <egdaniel@google.com> | 2018-07-03 16:18:29 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-07-03 20:46:27 +0000 |
| commit | 108bb232775c0b768ce1beca929ed31a97b46ed3 (patch) | |
| tree | ff882d51dac3e7dfd66ae79a0be0883d6b379c25 /src/gpu/GrBackendSurface.cpp | |
| parent | 58a1605d2b9bab077f53b6a223f9e7ce1891d3ea (diff) | |
Reland "Remove setting/use of GrPixelConfig in GrBackendTex/RT ctors."
This reverts commit 34aa059c1502d67c9a5f4db449667a8709b69fb9.
Reason for revert: <INSERT REASONING HERE>
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 <egdaniel@google.com>
> > Reviewed-by: Robert Phillips <robertphillips@google.com>
>
> 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 <ethannicholas@google.com>
> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
Bug: skia:
Change-Id: Ib1fd10c126862824f3e31c420c697ac749c637f5
Reviewed-on: https://skia-review.googlesource.com/139221
Commit-Queue: Greg Daniel <egdaniel@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'src/gpu/GrBackendSurface.cpp')
| -rw-r--r-- | src/gpu/GrBackendSurface.cpp | 48 |
1 files changed, 4 insertions, 44 deletions
diff --git a/src/gpu/GrBackendSurface.cpp b/src/gpu/GrBackendSurface.cpp index 9977555093..7e10cb20a2 100644 --- a/src/gpu/GrBackendSurface.cpp +++ b/src/gpu/GrBackendSurface.cpp @@ -96,7 +96,7 @@ GrBackendTexture::GrBackendTexture(int width, : fIsValid(true) , fWidth(width) , fHeight(height) - , fConfig(GrVkFormatToPixelConfig(vkInfo.fFormat)) + , fConfig(kUnknown_GrPixelConfig) , fMipMapped(GrMipMapped(vkInfo.fLevelCount > 1)) , fBackend(kVulkan_GrBackend) , fVkInfo(vkInfo, layout.release()) { @@ -117,28 +117,6 @@ GrBackendTexture::GrBackendTexture(int width, , fMtlInfo(mtlInfo) {} #endif -#if GR_TEST_UTILS - -GrBackendTexture::GrBackendTexture(int width, - int height, - GrPixelConfig config, - const GrGLTextureInfo& glInfo) - : GrBackendTexture(width, height, config, GrMipMapped::kNo, glInfo) {} - -GrBackendTexture::GrBackendTexture(int width, - int height, - GrPixelConfig config, - GrMipMapped mipMapped, - const GrGLTextureInfo& glInfo) - : fIsValid(true) - , fWidth(width) - , fHeight(height) - , fConfig(config) - , fMipMapped(mipMapped) - , fBackend(kOpenGL_GrBackend) - , fGLInfo(glInfo) {} -#endif - GrBackendTexture::GrBackendTexture(int width, int height, GrMipMapped mipMapped, @@ -146,7 +124,7 @@ GrBackendTexture::GrBackendTexture(int width, : fIsValid(true) , fWidth(width) , fHeight(height) - , fConfig(GrGLSizedFormatToPixelConfig(glInfo.fFormat)) + , fConfig(kUnknown_GrPixelConfig) , fMipMapped(mipMapped) , fBackend(kOpenGL_GrBackend) , fGLInfo(glInfo) {} @@ -334,7 +312,7 @@ GrBackendRenderTarget::GrBackendRenderTarget(int width, , fHeight(height) , fSampleCnt(SkTMax(1, sampleCnt)) , fStencilBits(0) // We always create stencil buffers internally for vulkan - , fConfig(GrVkFormatToPixelConfig(vkInfo.fFormat)) + , fConfig(kUnknown_GrPixelConfig) , fBackend(kVulkan_GrBackend) , fVkInfo(vkInfo, layout.release()) {} #endif @@ -354,24 +332,6 @@ GrBackendRenderTarget::GrBackendRenderTarget(int width, , fMtlInfo(mtlInfo) {} #endif -#if GR_TEST_UTILS - -GrBackendRenderTarget::GrBackendRenderTarget(int width, - int height, - int sampleCnt, - int stencilBits, - GrPixelConfig config, - const GrGLFramebufferInfo& glInfo) - : fIsValid(true) - , fWidth(width) - , fHeight(height) - , fSampleCnt(SkTMax(1, sampleCnt)) - , fStencilBits(stencilBits) - , fConfig(config) - , fBackend(kOpenGL_GrBackend) - , fGLInfo(glInfo) {} -#endif - GrBackendRenderTarget::GrBackendRenderTarget(int width, int height, int sampleCnt, @@ -382,7 +342,7 @@ GrBackendRenderTarget::GrBackendRenderTarget(int width, , fHeight(height) , fSampleCnt(SkTMax(1, sampleCnt)) , fStencilBits(stencilBits) - , fConfig(GrGLSizedFormatToPixelConfig(glInfo.fFormat)) + , fConfig(kUnknown_GrPixelConfig) , fBackend(kOpenGL_GrBackend) , fGLInfo(glInfo) {} |