diff options
| -rw-r--r-- | src/gpu/vk/GrVkBackendContext.cpp | 4 | ||||
| -rw-r--r-- | src/gpu/vk/GrVkProgramDesc.h | 1 | ||||
| -rw-r--r-- | tools/gpu/GrContextFactory.cpp | 2 | ||||
| -rw-r--r-- | tools/viewer/sk_app/WindowContext.h | 1 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/gpu/vk/GrVkBackendContext.cpp b/src/gpu/vk/GrVkBackendContext.cpp index 8b6c1dadc6..8256294a53 100644 --- a/src/gpu/vk/GrVkBackendContext.cpp +++ b/src/gpu/vk/GrVkBackendContext.cpp @@ -89,12 +89,12 @@ const GrVkBackendContext* GrVkBackendContext::Create(uint32_t* presentQueueIndex instanceExtensionNames.push_back(VK_KHR_WIN32_SURFACE_EXTENSION_NAME); extensionFlags |= kKHR_win32_surface_GrVkExtensionFlag; } -#elif SK_BUILD_FOR_ANDROID +#elif defined(SK_BUILD_FOR_ANDROID) if (extensions.hasInstanceExtension(VK_KHR_ANDROID_SURFACE_EXTENSION_NAME)) { instanceExtensionNames.push_back(VK_KHR_ANDROID_SURFACE_EXTENSION_NAME); extensionFlags |= kKHR_android_surface_GrVkExtensionFlag; } -#elif SK_BUILD_FOR_UNIX +#elif defined(SK_BUILD_FOR_UNIX) if (extensions.hasInstanceExtension(VK_KHR_XCB_SURFACE_EXTENSION_NAME)) { instanceExtensionNames.push_back(VK_KHR_XCB_SURFACE_EXTENSION_NAME); extensionFlags |= kKHR_xcb_surface_GrVkExtensionFlag; diff --git a/src/gpu/vk/GrVkProgramDesc.h b/src/gpu/vk/GrVkProgramDesc.h index 33bb26c799..3e9a4cbb29 100644 --- a/src/gpu/vk/GrVkProgramDesc.h +++ b/src/gpu/vk/GrVkProgramDesc.h @@ -13,7 +13,6 @@ #include "GrGpu.h" #include "GrTypesPriv.h" -#include "shaderc/shaderc.h" #include "vk/GrVkDefines.h" class GrVkGpu; diff --git a/tools/gpu/GrContextFactory.cpp b/tools/gpu/GrContextFactory.cpp index 151bfd95b3..5b5f31415d 100644 --- a/tools/gpu/GrContextFactory.cpp +++ b/tools/gpu/GrContextFactory.cpp @@ -19,7 +19,7 @@ #if SK_MESA #include "gl/mesa/GLTestContext_mesa.h" #endif -#if SK_VULKAN +#ifdef SK_VULKAN #include "vk/VkTestContext.h" #endif #include "gl/null/NullGLTestContext.h" diff --git a/tools/viewer/sk_app/WindowContext.h b/tools/viewer/sk_app/WindowContext.h index 1fd921afb2..fdd847445c 100644 --- a/tools/viewer/sk_app/WindowContext.h +++ b/tools/viewer/sk_app/WindowContext.h @@ -42,6 +42,7 @@ public: } virtual GrBackendContext getBackendContext() = 0; + GrContext* getGrContext() const { return fContext; } sk_sp<SkSurface> createRenderSurface(sk_sp<GrRenderTarget>, int colorBits); void presentRenderSurface(sk_sp<SkSurface> renderSurface, sk_sp<GrRenderTarget> rt, |