commit 8642467d97c392bdc3c1dbee1a1f003e948f6187
author Antonio Maiorano <amaiorano@google.com> Mon Jan 18 16:39:49 2021 -0500
committer swiftshader-scoped@luci-project-accounts.iam.gserviceaccount.com <swiftshader-scoped@luci-project-accounts.iam.gserviceaccount.com> Wed Jan 20 20:02:44 2021 +0000
tree 26e015abbcf3575d370be5e6b7949819c3804b10
parent e27e7488e4ad0ef2099149c66e8b57742e9d5a1c

Move reusable Vulkan code from VulkanBenchmarks to new VulkanWrapper library

This will allow us to reuse this code across unit tests and benchmarks.

Bug: b/176981107
Change-Id: Ie5ea3708cb959dbd0189658b42f01bad998ae94a
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/51869
Reviewed-by: Nicolas Capens <nicolascapens@google.com>
Tested-by: Antonio Maiorano <amaiorano@google.com>
Commit-Queue: Antonio Maiorano <amaiorano@google.com>
Kokoro-Result: kokoro <noreply+kokoro@google.com>

CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6d243b8..a880c50 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -984,6 +984,11 @@
 endif()
 
 if(SWIFTSHADER_BUILD_BENCHMARKS)
+    if (NOT TARGET glslang)
+        add_subdirectory(${THIRD_PARTY_DIR}/glslang)
+    endif()
+    add_subdirectory(${TESTS_DIR}/VulkanWrapper) # Add VulkanWrapper target
+
     if (NOT TARGET benchmark::benchmark)
         set(BENCHMARK_ENABLE_TESTING FALSE CACHE BOOL FALSE FORCE)
         add_subdirectory(${THIRD_PARTY_DIR}/benchmark)
@@ -991,10 +996,6 @@
         set_target_properties(benchmark_main PROPERTIES FOLDER "third_party")
     endif()
 
-    if (NOT TARGET glslang)
-        add_subdirectory(${THIRD_PARTY_DIR}/glslang)
-    endif()
-
     add_subdirectory(${TESTS_DIR}/ReactorBenchmarks) # Add ReactorBenchmarks target
     add_subdirectory(${TESTS_DIR}/SystemBenchmarks) # Add system-benchmarks target
     add_subdirectory(${TESTS_DIR}/VulkanBenchmarks) # Add VulkanBenchmarks target