commit 7e73108a371dfb1dfa05f0810d5463d94bfa06b7
author djsollen <djsollen@google.com> Thu Jun 09 13:07:13 2016 -0700
committer Commit bot <commit-bot@chromium.org> Thu Jun 09 13:07:13 2016 -0700
tree 14d8b2a2bc976dc111c95d8cba55f48aeccf40ff
parent 09b4224be3901b97cc2301115f9a2e9381a39dbb

Cleanup needed to use WindowContext for Android
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2055693003

Review-Url: https://codereview.chromium.org/2055693003

src/gpu/vk/GrVkBackendContext.cpp

diff --git a/src/gpu/vk/GrVkBackendContext.cpp b/src/gpu/vk/GrVkBackendContext.cpp
index 8b6c1da..8256294 100644
--- a/src/gpu/vk/GrVkBackendContext.cpp
+++ b/src/gpu/vk/GrVkBackendContext.cpp
@@ -89,12 +89,12 @@
         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;

src/gpu/vk/GrVkProgramDesc.h

diff --git a/src/gpu/vk/GrVkProgramDesc.h b/src/gpu/vk/GrVkProgramDesc.h
index 33bb26c..3e9a4cb 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;

tools/gpu/GrContextFactory.cpp

diff --git a/tools/gpu/GrContextFactory.cpp b/tools/gpu/GrContextFactory.cpp
index 151bfd9..5b5f314 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"

tools/viewer/sk_app/WindowContext.h

diff --git a/tools/viewer/sk_app/WindowContext.h b/tools/viewer/sk_app/WindowContext.h
index 1fd921a..fdd8474 100644
--- a/tools/viewer/sk_app/WindowContext.h
+++ b/tools/viewer/sk_app/WindowContext.h
@@ -42,6 +42,7 @@
     }
 
     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,