Merge branch 'master' into dev

GPUOpen-Drivers · Jun 4, 2024 · 0f303c3 · 0f303c3
2 parents a9625be + 3abea9d
commit 0f303c3
Show file tree

Hide file tree

Showing 64 changed files with 2,412 additions and 478 deletions.
diff --git a/cmake/XglCompileDefinitions.cmake b/cmake/XglCompileDefinitions.cmake
@@ -119,6 +119,9 @@ macro(xgl_set_compile_definitions)
     endif()
 #endif
 
+#if VKI_RAY_TRACING
+#endif
+
     if (XGL_ENABLE_GCOV)
         target_compile_definitions(xgl PRIVATE ICD_ENABLE_GCOV)
     endif()
@@ -132,6 +135,9 @@ macro(xgl_set_compile_definitions)
 #if VKI_RAY_TRACING
 #endif
 
+#if VKI_RAY_TRACING
+#endif
+
 #if VKI_RAY_TRACING
 #endif
 

diff --git a/cmake/XglVersions.cmake b/cmake/XglVersions.cmake
@@ -28,7 +28,7 @@ include_guard()
 # This will become the value of PAL_CLIENT_INTERFACE_MAJOR_VERSION.  It describes the version of the PAL interface
 # that the ICD supports.  PAL uses this value to enable backwards-compatibility for older interface versions.
 # It must be updated on each PAL promotion after handling all of the interface changes described in palLib.h.
-set(ICD_PAL_CLIENT_MAJOR_VERSION "867")
+set(ICD_PAL_CLIENT_MAJOR_VERSION "878")
 
 # This will become the value of GPUOPEN_CLIENT_INTERFACE_MAJOR_VERSION if ICD_GPUOPEN_DEVMODE_BUILD=1.
 # It describes the interface version of the gpuopen shared module (part of PAL) that the ICD supports.

diff --git a/icd/CMakeLists.txt b/icd/CMakeLists.txt
@@ -169,6 +169,7 @@ if (VKI_RAY_TRACING)
         api/raytrace/vk_ray_tracing_pipeline.cpp
         api/raytrace/ray_tracing_device.cpp
         api/vk_deferred_operation.cpp
+        api/appopt/bvh_batch_layer.cpp
     )
 endif()
 #endif

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.3.280"
+    "api_version": "1.3.285"
   },
   "layer": {
     "name": "VK_LAYER_AMD_switchable_graphics_@ISABITS@",
     "type": "GLOBAL",
     "library_path": "@AMDVLK_INSTALL_PATH@/amdvlk@[email protected]",
-    "api_version": "1.3.280",
+    "api_version": "1.3.285",
     "implementation_version": "1",
     "description": "AMD switchable graphics layer",
     "functions": {

diff --git a/icd/api/app_profile.cpp b/icd/api/app_profile.cpp
@@ -100,6 +100,12 @@ struct AppProfilePattern
     AppProfilePatternEntry entries[16];
 };
 
+// define PatternEnd
+
+constexpr AppProfilePatternEntry PatternEnd = {};
+
+// Section START AppProfilePatternEntry for all Games
+
 constexpr AppProfilePatternEntry AppNameDoom =
 {
     PatternAppNameLower,
@@ -600,6 +606,24 @@ constexpr AppProfilePatternEntry AppNameX4Foundations
     "x4"
 };
 
+constexpr AppProfilePatternEntry AppNameHaloInfiniteLauncher
+{
+    PatternAppNameLower,
+    "haloinfinite.exe"
+};
+
+constexpr AppProfilePatternEntry AppNameTf2Win64
+{
+    PatternAppNameLower,
+    "tf_win64.exe"
+};
+
+constexpr AppProfilePatternEntry AppNameTf2Linux64
+{
+    PatternAppNameLower,
+    "tf_linux64"
+};
+
 constexpr AppProfilePatternEntry AppNameX4Engine
 {
     PatternEngineNameLower,
@@ -732,9 +756,36 @@ constexpr AppProfilePatternEntry AppEngineQuanticDream
     "quantic dream engine"
 };
 
-constexpr AppProfilePatternEntry PatternEnd = {};
+constexpr AppProfilePatternEntry AppNameEnshrouded =
+{
+    PatternAppNameLower,
+    "enshrouded"
+};
+
+constexpr AppProfilePatternEntry AppEngineHolistic =
+{
+    PatternEngineNameLower,
+    "holistic"
+};
+
+constexpr AppProfilePatternEntry AppNameWindowKill =
+{
+    PatternAppNameLower,
+    "windowkill"
+};
+
+constexpr AppProfilePatternEntry AppEngineGodot =
+{
+    PatternEngineNameLower,
+    "godot engine"
+};
+
+// Section END of AppProfilePatternEntry for all games
 
 // This is a table of patterns.  The first matching pattern in this table will be returned.
+// Note: If an app gets detected by both app name and engine name,
+// whatever comes first in this array will be the chosen app profile in ScanApplicationProfile().
+// This should get fixed so not as to get bitten by the order here!
 AppProfilePattern AppPatternTable[] =
 {
     {
@@ -800,14 +851,6 @@ AppProfilePattern AppPatternTable[] =
         }
     },
 
-    {
-        AppProfile::IdTechEngine,
-        {
-            AppEngineIdTech,
-            PatternEnd
-        }
-    },
-
     {
         AppProfile::Dota2,
         {
@@ -1375,6 +1418,32 @@ AppProfilePattern AppPatternTable[] =
         }
     },
 
+    {
+        AppProfile::DxvkHaloInfiniteLauncher,
+        {
+            AppNameHaloInfiniteLauncher,
+            AppEngineDXVK,
+            PatternEnd
+        }
+    },
+
+    {
+        AppProfile::DxvkTf2,
+        {
+            AppNameTf2Win64,
+            AppEngineDXVK,
+            PatternEnd
+        }
+    },
+
+    {
+        AppProfile::DxvkTf2,
+        {
+            AppNameTf2Linux64,
+            AppEngineDXVK,
+            PatternEnd
+        }
+    },
     {
         AppProfile::MetalGearSolid5,
         {
@@ -1466,6 +1535,23 @@ AppProfilePattern AppPatternTable[] =
         }
     },
 
+    {
+        AppProfile::Enshrouded,
+        {
+            AppNameEnshrouded,
+            AppEngineHolistic,
+            PatternEnd
+        }
+    },
+
+    {
+        AppProfile::HolisticEngine,
+        {
+            AppEngineHolistic,
+            PatternEnd
+        }
+    },
+
     {
         AppProfile::Zink,
         {
@@ -1496,6 +1582,23 @@ AppProfilePattern AppPatternTable[] =
             AppEngineDXVK,
             PatternEnd
         }
+    },
+
+    {
+        AppProfile::IdTechEngine,
+        {
+            AppEngineIdTech,
+            PatternEnd
+        }
+    },
+
+    {
+        AppProfile::WindowKill,
+        {
+            AppNameWindowKill,
+            AppEngineGodot,
+            PatternEnd
+        }
     }
 };
 

diff --git a/icd/api/app_shader_optimizer.cpp b/icd/api/app_shader_optimizer.cpp
@@ -1154,12 +1154,22 @@ void ShaderOptimizer::BuildAppProfile()
     if ((m_settings.pipelineProfileIgnoresAppProfile == false) && (pMemory != nullptr))
     {
         memset(pMemory, 0, newSize);
+        BuildAppProfileGeneric();
         {
             BuildAppProfileLlpc();
         }
     }
 }
 
+// =====================================================================================================================
+void ShaderOptimizer::BuildAppProfileGeneric()
+{
+    const AppProfile        appProfile   = m_pDevice->GetAppProfile();
+    const Pal::GpuType      gpuType      = m_pDevice->VkPhysicalDevice(DefaultDeviceIndex)->PalProperties().gpuType;
+
+    uint32 i = 0;
+}
+
 // =====================================================================================================================
 void ShaderOptimizer::BuildAppProfileLlpc()
 {