Link to vulkan in tools but not library.

This also now requires an explicit vulkan proc address getter to be used with GrVkBackendContext::Create.

Change-Id: I768ec487398dab68e6e10409419ac7a00ec1822a
Reviewed-on: https://skia-review.googlesource.com/14322
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>

1 files changed, 5 insertions, 10 deletions

diff --git a/BUILD.gn b/BUILD.gn
index 5d64c58050..76cfbd295f 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -41,7 +41,6 @@ declare_args() {
   skia_enable_tools = is_skia_dev_build
   skia_enable_vulkan_debug_layers = is_skia_dev_build && is_debug
   skia_vulkan_sdk = getenv("VULKAN_SDK")
-  skia_link_with_vulkan = !is_fuchsia
 }
 declare_args() {
   skia_use_dng_sdk = !is_fuchsia && skia_use_libjpeg_turbo && skia_use_zlib
@@ -167,15 +166,6 @@ config("skia_private") {
         lib_dirs += [ "$skia_vulkan_sdk/lib/" ]
       }
     }
-
-    if (skia_link_with_vulkan) {
-      defines += [ "SK_LINK_WITH_VULKAN" ]
-      if (is_win) {
-        libs += [ "vulkan-1.lib" ]
-      } else {
-        libs += [ "vulkan" ]
-      }
-    }
   }
   if (skia_enable_gpu) {
     include_dirs += [ "src/gpu" ]
@@ -911,6 +901,11 @@ if (skia_enable_tools) {
       }
       if (skia_use_vulkan) {
         sources += [ "tools/gpu/vk/VkTestContext.cpp" ]
+        if (is_win) {
+          libs += [ "vulkan-1.lib" ]
+        } else {
+          libs += [ "vulkan" ]
+        }
       }
     }
   }