Merge branch 'internal_master_prm'

dstutt · Sep 30, 2021 · 9244bd3 · 9244bd3
2 parents d8bb7de + a9ae5bd
commit 9244bd3
Show file tree

Hide file tree

Showing 58 changed files with 2,238 additions and 1,942 deletions.
diff --git a/cmake/XglOptions.cmake b/cmake/XglOptions.cmake
@@ -42,6 +42,9 @@ macro(xgl_options)
 
     option(XGL_BUILD_NAVI23 "Build open source vulkan for Navi23" ON)
 
+    option(XGL_BUILD_TESTS "Build all tests?" OFF)
+
+    # Deprecated, use XGL_BUILD_TESTS instead.
     option(XGL_BUILD_LIT "Build with Lit test?" OFF)
 
     option(XGL_BUILD_CACHE_CREATOR "Build cache-creator tools?" OFF)

diff --git a/cmake/XglOverrides.cmake b/cmake/XglOverrides.cmake
@@ -185,9 +185,13 @@ macro(xgl_overrides_vkgc)
     set(LLPC_CLIENT_INTERFACE_MAJOR_VERSION ${ICD_LLPC_CLIENT_MAJOR_VERSION} CACHE STRING "${PROJECT_NAME} override." FORCE)
 
     if(ICD_BUILD_LLPC)
+        set(LLPC_BUILD_TESTS ${XGL_BUILD_TESTS} CACHE BOOL "${PROJECT_NAME} override." FORCE)
 
         set(LLPC_BUILD_LIT ${XGL_BUILD_LIT} CACHE BOOL "${PROJECT_NAME} override." FORCE)
 
+        if(XGL_BUILD_LIT)
+            message(DEPRECATION "XGL_BUILD_LIT is deprecated, use XGL_BUILD_TESTS instead")
+        endif()
         set(LLPC_BUILD_NAVI12 ${XGL_BUILD_NAVI12} CACHE BOOL "${PROJECT_NAME} override." FORCE)
 
         set(LLPC_BUILD_NAVI22 ${XGL_BUILD_NAVI22} CACHE BOOL "${PROJECT_NAME} override." FORCE)

diff --git a/icd/CMakeLists.txt b/icd/CMakeLists.txt
@@ -136,9 +136,6 @@ target_sources(xgl PRIVATE
     api/vk_descriptor_update_template.cpp
     api/appopt/barrier_filter_layer.cpp
     api/appopt/strange_brigade_layer.cpp
-    api/appopt/async_layer.cpp
-    api/appopt/async_shader_module.cpp
-    api/appopt/async_partial_pipeline.cpp
     api/appopt/g_shader_profile.cpp
     api/render_state_cache.cpp
     api/renderpass/renderpass_builder.cpp

diff --git a/icd/Loader/LunarG/Lnx/amd-icd.json b/icd/Loader/LunarG/Lnx/amd-icd.json
@@ -2,13 +2,13 @@
   "file_format_version": "1.0.0",
   "ICD": {
     "library_path": "@AMDVLK_INSTALL_PATH@/amdvlk@[email protected]",
-    "api_version": "1.2.188"
+    "api_version": "1.2.191"
   },
   "layer": {
     "name": "VK_LAYER_AMD_switchable_graphics_@ISABITS@",
     "type": "GLOBAL",
     "library_path": "@AMDVLK_INSTALL_PATH@/amdvlk@[email protected]",
-    "api_version": "1.2.188",
+    "api_version": "1.2.191",
     "implementation_version": "1",
     "description": "AMD switchable graphics layer",
     "functions": {

diff --git a/icd/api/appopt/async_layer.cpp b/icd/api/appopt/async_layer.cpp
diff --git a/icd/api/appopt/async_layer.h b/icd/api/appopt/async_layer.h