commit b138fdc65f91d20e423d447e458cee2cdbf3ca3a
author liyuqian <liyuqian@google.com> Fri Apr 29 10:00:26 2016 -0700
committer Commit bot <commit-bot@chromium.org> Fri Apr 29 10:00:26 2016 -0700
tree 81a4fa13a3f06311bc527b8ec070088780368221
parent fb5916486f562b45474fba86ed4bede15b83ef4a

Fix Vulkan Build in Android

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1935523002

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

src/gpu/vk/GrVkBackendContext.cpp

diff --git a/src/gpu/vk/GrVkBackendContext.cpp b/src/gpu/vk/GrVkBackendContext.cpp
index 3d3e983..ae61aa5 100644
--- a/src/gpu/vk/GrVkBackendContext.cpp
+++ b/src/gpu/vk/GrVkBackendContext.cpp
@@ -32,7 +32,11 @@
 #endif
 
 // the minimum version of Vulkan supported
+#ifdef SK_BUILD_FOR_ANDROID
+const uint32_t kGrVkMinimumVersion = VK_MAKE_VERSION(1, 0, 3);
+#else
 const uint32_t kGrVkMinimumVersion = VK_MAKE_VERSION(1, 0, 8);
+#endif
 
 // Create the base Vulkan objects needed by the GrVkGpu object
 const GrVkBackendContext* GrVkBackendContext::Create(uint32_t* presentQueueIndexPtr,

src/gpu/vk/GrVkGpu.cpp

diff --git a/src/gpu/vk/GrVkGpu.cpp b/src/gpu/vk/GrVkGpu.cpp
index 71d3028..20062b7 100644
--- a/src/gpu/vk/GrVkGpu.cpp
+++ b/src/gpu/vk/GrVkGpu.cpp
@@ -82,7 +82,9 @@
 GrVkGpu::GrVkGpu(GrContext* context, const GrContextOptions& options,
                  const GrVkBackendContext* backendCtx)
     : INHERITED(context)
+#ifdef ENABLE_VK_LAYERS
     , fVkInstance(backendCtx->fInstance)
+#endif
     , fDevice(backendCtx->fDevice)
     , fQueue(backendCtx->fQueue)
     , fResourceProvider(this) {

src/gpu/vk/GrVkGpu.h

diff --git a/src/gpu/vk/GrVkGpu.h b/src/gpu/vk/GrVkGpu.h
index 13cbd0c..3f76fd2 100644
--- a/src/gpu/vk/GrVkGpu.h
+++ b/src/gpu/vk/GrVkGpu.h
@@ -204,7 +204,9 @@
 
     // These Vulkan objects are provided by the client, and also stored in fBackendContext.
     // They're copied here for convenient access.
+#ifdef ENABLE_VK_LAYERS
     VkInstance                             fVkInstance;
+#endif
     VkDevice                               fDevice;
     VkQueue                                fQueue;    // Must be Graphics queue
 

tools/vulkan/android/Window_android.cpp

diff --git a/tools/vulkan/android/Window_android.cpp b/tools/vulkan/android/Window_android.cpp
index fb87a3f..87a4d22 100644
--- a/tools/vulkan/android/Window_android.cpp
+++ b/tools/vulkan/android/Window_android.cpp
@@ -35,7 +35,7 @@
     SkDebugf("Title: %s", title);
 }
 
-bool Window_android::attach(BackEndType attachType, int msaaSampleCount, AttachmentInfo*) {
+bool Window_android::attach(BackEndType attachType, int msaaSampleCount) {
     if (kVulkan_BackendType != attachType) {
         return false;
     }

tools/vulkan/android/Window_android.h

diff --git a/tools/vulkan/android/Window_android.h b/tools/vulkan/android/Window_android.h
index a4805bd..fa675fe 100644
--- a/tools/vulkan/android/Window_android.h
+++ b/tools/vulkan/android/Window_android.h
@@ -29,7 +29,7 @@
     void setTitle(const char*) override;
     void show() override {}
 
-    bool attach(BackEndType attachType, int msaaSampleCount, AttachmentInfo*) override;
+    bool attach(BackEndType attachType, int msaaSampleCount) override;
     void inval() override;
 
     void paintIfNeeded();