diff options
| author |  Greg Daniel <egdaniel@google.com> | 2017-04-18 17:12:32 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-04-18 21:55:10 +0000 |
| commit | 7da62b9059f3c1d31624a0e4da96ee5f908f9c12 (patch) | |
| tree | fc57f951a4e8c1900311e8a1ffbdbbaf189715c2 /src/gpu/GrBackendSurface.cpp | |
| parent | b712a85aea212cf5bfe5514a4fefc184545a8d3c (diff) | |
Plumb GrBackendTexture throughout skia.
Bug: skia:
Change-Id: I1bae6768ee7229818a83ba608035a1f7867e6875
Reviewed-on: https://skia-review.googlesource.com/13645
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 | 37 |
1 files changed, 24 insertions, 13 deletions
diff --git a/src/gpu/GrBackendSurface.cpp b/src/gpu/GrBackendSurface.cpp index 9bf85cb7db..97b3b6ee03 100644 --- a/src/gpu/GrBackendSurface.cpp +++ b/src/gpu/GrBackendSurface.cpp @@ -10,20 +10,27 @@ #ifdef SK_VULKAN #include "vk/GrVkTypes.h" #include "vk/GrVkUtil.h" +#endif + GrBackendTexture::GrBackendTexture(int width, int height, - GrVkImageInfo* vkInfo) + const GrVkImageInfo* vkInfo) : fWidth(width) , fHeight(height) - , fConfig(GrVkFormatToPixelConfig(vkInfo->fFormat)) + , fConfig( +#ifdef SK_VULKAN + GrVkFormatToPixelConfig(vkInfo->fFormat) +#else + kUnknown_GrPixelConfig +#endif + ) , fBackend(kVulkan_GrBackend) , fVkInfo(vkInfo) {} -#endif // SK_VULKAN GrBackendTexture::GrBackendTexture(int width, int height, GrPixelConfig config, - GrGLTextureInfo* glInfo) + const GrGLTextureInfo* glInfo) : fWidth(width) , fHeight(height) , fConfig(config) @@ -43,14 +50,14 @@ GrBackendTexture::GrBackendTexture(const GrBackendTextureDesc& desc, GrBackend b , fBackend(backend) , fHandle(desc.fTextureHandle) {} -GrVkImageInfo* GrBackendTexture::getVkImageInfo() { +const GrVkImageInfo* GrBackendTexture::getVkImageInfo() const { if (kVulkan_GrBackend == fBackend) { return fVkInfo; } return nullptr; } -GrGLTextureInfo* GrBackendTexture::getGLTextureInfo() { +const GrGLTextureInfo* GrBackendTexture::getGLTextureInfo() const { if (kOpenGL_GrBackend == fBackend) { return fGLInfo; } @@ -59,27 +66,31 @@ GrGLTextureInfo* GrBackendTexture::getGLTextureInfo() { //////////////////////////////////////////////////////////////////////////////////////////////////// -#ifdef SK_VULKAN GrBackendRenderTarget::GrBackendRenderTarget(int width, int height, int sampleCnt, int stencilBits, - GrVkImageInfo* vkInfo) + const GrVkImageInfo* vkInfo) : fWidth(width) , fHeight(height) , fSampleCnt(sampleCnt) , fStencilBits(stencilBits) - , fConfig(GrVkFormatToPixelConfig(vkInfo->fFormat)) + , fConfig( +#ifdef SK_VULKAN + GrVkFormatToPixelConfig(vkInfo->fFormat) +#else + kUnknown_GrPixelConfig +#endif + ) , fBackend(kVulkan_GrBackend) , fVkInfo(vkInfo) {} -#endif // SK_VULKAN GrBackendRenderTarget::GrBackendRenderTarget(int width, int height, int sampleCnt, int stencilBits, GrPixelConfig config, - GrGLTextureInfo* glInfo) + const GrGLTextureInfo* glInfo) : fWidth(width) , fHeight(height) , fSampleCnt(sampleCnt) @@ -104,14 +115,14 @@ GrBackendRenderTarget::GrBackendRenderTarget(const GrBackendRenderTargetDesc& de , fBackend(backend) , fHandle(desc.fRenderTargetHandle) {} -GrVkImageInfo* GrBackendRenderTarget::getVkImageInfo() { +const GrVkImageInfo* GrBackendRenderTarget::getVkImageInfo() const { if (kVulkan_GrBackend == fBackend) { return fVkInfo; } return nullptr; } -GrGLTextureInfo* GrBackendRenderTarget::getGLTextureInfo() { +const GrGLTextureInfo* GrBackendRenderTarget::getGLTextureInfo() const { if (kOpenGL_GrBackend == fBackend) { return fGLInfo; } |