commit e7ce4e53915d026720005ca2c1831a5c28f77b3f
author Corentin Wallez <cwallez@chromium.org> Fri Nov 22 16:13:50 2019 +0100
committer Corentin Wallez <cwallez@google.com> Mon Nov 25 18:57:15 2019 +0000
tree e27ba2145473fa7b0949aa2823f5717ef1ae2c31
parent deac536f357074b97f40305c1e215213d91936da

Make GN builds produce an ICD JSON in the build dir

ANGLE already has this logic, but with Dawn looking to use Swiftshader
as well, there would have been a conflict when both ANGLE and Dawn tried
to generate the same ICD JSON file.

Having this logic in Swiftshader's GN files means that any number of
component of projects using GN (aka Chromium) can use swiftshader
without issues.

Bug: dawn:283
Change-Id: I8531c98c370db01563dc102f259164e0393242ca
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/38491
Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>
Reviewed-by: Alexis Hétu <sugoi@google.com>
Tested-by: Corentin Wallez <cwallez@google.com>

src/Vulkan/BUILD.gn

diff --git a/src/Vulkan/BUILD.gn b/src/Vulkan/BUILD.gn
index 8340717..701ed4d 100644
--- a/src/Vulkan/BUILD.gn
+++ b/src/Vulkan/BUILD.gn
@@ -14,6 +14,7 @@
 
 import("//build_overrides/build.gni")
 import("../swiftshader.gni")
+import("vulkan.gni")
 
 # Need a separate config to ensure the warnings are added to the end.
 config("swiftshader_libvulkan_private_config") {
@@ -96,13 +97,9 @@
       "VkSemaphoreExternalLinux.hpp",
     ]
   } else if (is_fuchsia) {
-    sources += [
-      "VkSemaphoreExternalFuchsia.hpp",
-    ]
+    sources += [ "VkSemaphoreExternalFuchsia.hpp" ]
   } else {
-    sources += [
-      "VkSemaphoreExternalNone.hpp",
-    ]
+    sources += [ "VkSemaphoreExternalNone.hpp" ]
   }
 }
 
@@ -168,8 +165,8 @@
   }
 
   deps = [
-    "../../third_party/marl:Marl",
     "${swiftshader_spirv_tools_dir}:SPIRV-Tools",
+    "../../third_party/marl:Marl",
     "../Device",
     "../Pipeline",
     "../Reactor:swiftshader_llvm_reactor",
@@ -188,3 +185,39 @@
     ":swiftshader_libvulkan_headers",
   ]
 }
+
+# Generates an ICD JSON file that can be used by all targets in this GN build
+# (ANGLE, Dawn, Chromium).
+action("icd_file") {
+  output_icd_file = "${root_build_dir}/${swiftshader_icd_file_name}"
+  input_file = swiftshader_icd_file_name
+
+  if (is_win) {
+    library_path = ".\\vk_swiftshader.dll"
+  } else if (is_mac) {
+    library_path = "./libvk_swiftshader.dylib"
+  } else {
+    library_path = "./libvk_swiftshader.so"
+  }
+
+  script = "write_icd_json.py"
+  args = [
+    "--input",
+    rebase_path(input_file, root_build_dir),
+    "--output",
+    rebase_path(output_icd_file, root_build_dir),
+    "--library_path",
+    library_path,
+  ]
+
+  inputs = [
+    input_file,
+  ]
+  outputs = [
+    output_icd_file,
+  ]
+
+  deps = [
+    ":swiftshader_libvulkan",
+  ]
+}