diff options
| author |  Greg Daniel <egdaniel@google.com> | 2017-04-26 12:19:14 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-04-27 18:15:38 +0000 |
| commit | fdd77daedbba3b7c53be74a82fb9fae891b51696 (patch) | |
| tree | af2780b3f60109deb860b774eb128487d0134de0 /include/gpu/vk | |
| parent | a41d48b739c144ee7b36290a9642064bc6cdcd05 (diff) | |
Plumb the use of GrBackendRenderTarget throughout Skia
Bug: skia:
Change-Id: Ib99a58d9552f5c7b8d77c09dcc72fa88326c26aa
Reviewed-on: https://skia-review.googlesource.com/14148
Reviewed-by: Brian Salomon <bsalomon@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>
Diffstat (limited to 'include/gpu/vk')
| -rw-r--r-- | include/gpu/vk/GrVkDefines.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/gpu/vk/GrVkDefines.h b/include/gpu/vk/GrVkDefines.h index 7b9ee8dadf..7defed2ad5 100644 --- a/include/gpu/vk/GrVkDefines.h +++ b/include/gpu/vk/GrVkDefines.h @@ -9,6 +9,8 @@ #ifndef GrVkDefines_DEFINED #define GrVkDefines_DEFINED +#ifdef SK_VULKAN + #if defined(SK_BUILD_FOR_WIN) || defined(SK_BUILD_FOR_WIN32) # if !defined(VK_USE_PLATFORM_WIN32_KHR) # define VK_USE_PLATFORM_WIN32_KHR @@ -29,8 +31,6 @@ # endif #endif -#if defined(Bool) || defined(Status) || defined(True) || defined(False) -# pragma error "Macros unexpectedly defined." #endif #include <vulkan/vulkan.h> |