diff options
author | 2017-06-13 22:16:08 +0000 | |
---|---|---|
committer | 2017-06-13 22:16:19 +0000 | |
commit | fad9e3f54112ea8c8bb6bb72384f47b9759578f5 (patch) | |
tree | b4a713dabc9aaa76149222a5816a35d7f3fa5417 /tools | |
parent | 4f8c695736c8ae4fed2190a8e1301a4f4a979898 (diff) |
Revert "Update skia to use ifdefs for Vulkan code instead of dummy header"
This reverts commit c0f8e426c59eec6c720b8e1329dcb966cf1b6800.
Reason for revert: Experiment to see if this will unblock the Android roll
Original change's description:
> Update skia to use ifdefs for Vulkan code instead of dummy header
>
> Bug: skia:6721
> Change-Id: I80a4c9f2acc09c174497f625c50ed12a8bb76505
> Reviewed-on: https://skia-review.googlesource.com/19547
> Reviewed-by: Mike Klein <mtklein@google.com>
> Commit-Queue: Greg Daniel <egdaniel@google.com>
TBR=egdaniel@google.com,mtklein@google.com,bsalomon@google.com
Change-Id: Ib51c1672570f2071a17b6fbde692a5174b0358ce
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:6721
Reviewed-on: https://skia-review.googlesource.com/19724
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'tools')
-rw-r--r-- | tools/gpu/GrTest.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/tools/gpu/GrTest.cpp b/tools/gpu/GrTest.cpp index f486993bbc..5a9fc9690e 100644 --- a/tools/gpu/GrTest.cpp +++ b/tools/gpu/GrTest.cpp @@ -61,15 +61,14 @@ void SetupAlwaysEvictAtlas(GrContext* context) { GrBackendTexture CreateBackendTexture(GrBackend backend, int width, int height, GrPixelConfig config, GrBackendObject handle) { -#if SK_VULKAN - if (kVulkan_GrBackend == backend) { + if (kOpenGL_GrBackend == backend) { + GrGLTextureInfo* glInfo = (GrGLTextureInfo*)(handle); + return GrBackendTexture(width, height, config, *glInfo); + } else { + SkASSERT(kVulkan_GrBackend == backend); GrVkImageInfo* vkInfo = (GrVkImageInfo*)(handle); return GrBackendTexture(width, height, *vkInfo); } -#endif - SkASSERT(kOpenGL_GrBackend == backend); - GrGLTextureInfo* glInfo = (GrGLTextureInfo*)(handle); - return GrBackendTexture(width, height, config, *glInfo); } }; |