Vulkan: Introduce Command Buffer Perf Test

src/tests/BUILD.gn

@@ -267,13 +267,20 @@ if (is_win || is_linux || is_android || is_mac) {
       "../../util",
     ]
 
+    sources = rebase_path(perftests_gypi.angle_perf_tests_sources, ".", "../..")
+
+    deps = googletest_deps + [
+             angle_root + ":angle_util_static",
+             angle_root + ":libANGLE",
+             angle_root + ":libEGL_static",
+             angle_root + ":libGLESv2_static",
+           ]
+
     if (is_android) {
       use_native_activity = true
       configs -= [ "//build/config/android:hide_all_but_jni" ]
     }
 
-    sources = rebase_path(perftests_gypi.angle_perf_tests_sources, ".", "../..")
-
     if (is_win) {
       sources +=
           rebase_path(perftests_gypi.angle_perf_tests_win_sources, ".", "../..")
@@ -283,6 +290,14 @@ if (is_win || is_linux || is_android || is_mac) {
       sources += rebase_path(perftests_gypi.angle_perf_tests_vulkan_sources,
                              ".",
                              "../..")
+      if (is_android || is_linux) {
+        sources += rebase_path(
+                perftests_gypi.angle_perf_tests_vulkan_command_buffer_sources,
+                ".",
+                "../..")
+      }
+      deps += [ "$angle_root/third_party/glslang:glslang" ]
+      public_configs = [ "$angle_root/third_party/glslang:glslang_config" ]
     }
 
     if (build_with_chromium) {
@@ -295,13 +310,6 @@ if (is_win || is_linux || is_android || is_mac) {
       angle_root + ":internal_config",
       angle_root + ":libANGLE_config",
     ]
-
-    deps = googletest_deps + [
-             angle_root + ":angle_util_static",
-             angle_root + ":libANGLE",
-             angle_root + ":libEGL_static",
-             angle_root + ":libGLESv2_static",
-           ]
   }
 }
 

src/tests/angle_perftests.gypi

@@ -59,6 +59,13 @@
         [
             '<(angle_path)/src/tests/perf_tests/VulkanPipelineCachePerf.cpp',
         ],
+        # Currently Vulkan Command Buffer Perf Tests compile on Android/Linux
+        'angle_perf_tests_vulkan_command_buffer_sources':
+        [
+            '<(angle_path)/src/tests/perf_tests/VulkanCommandBufferPerf.cpp',
+            '<(angle_path)/src/tests/test_utils/third_party/vulkan_command_buffer_utils.cpp',
+            '<(angle_path)/src/tests/test_utils/third_party/vulkan_command_buffer_utils.h'
+        ],
     },
     # Everything below (except WinRT-related config) must be also maintained for GN.
     # If you change anything below, also update angle/src/tests/BUILD.gn.

src/tests/test_utils/third_party/README.angle

+Name: vulkan_command_buffer_utils.h, vulkan_command_buffer_utils.cpp
+URL: https://github.com/LunarG/VulkanSamples/tree/master/API-Samples/utils
+License: Apache License, Version 2.0
+License File: http://www.apache.org/licenses/LICENSE-2.0
+
+Description:
+Utility functions used to implement Vulkan samples and performance tests.
+Modified and reorganized to add support for running applications using
+various command buffer implementations.
\ No newline at end of file