Merge branch 'internal_master_prm' into dev

dstutt · Dec 6, 2021 · b8ed024 · b8ed024
2 parents c3d0470 + da1a583
commit b8ed024
Show file tree

Hide file tree

Showing 88 changed files with 4,623 additions and 1,244 deletions.
diff --git a/cmake/XglCompilerOptions.cmake b/cmake/XglCompilerOptions.cmake
@@ -308,6 +308,7 @@ function(xgl_compiler_options TARGET)
                     # add global definition to enable LTO here since some components have no option
                     # to enable it.
                     add_definitions("-flto=thin")
+                    add_link_options("-flto=thin")
                     message(WARNING "LTO enabled for ${TARGET}")
                 endif()
             endif()

diff --git a/cmake/XglPackaging.cmake b/cmake/XglPackaging.cmake
@@ -161,7 +161,8 @@ function(generatePackageTarget)
     endif()
     set(CPACK_DEBIAN_PACKAGE_PRIORITY "optional")
     set(CPACK_DEBIAN_PACKAGE_SECTION "libs")
-    set(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>=2.17), libgcc1 (>= 1:3.4), libstdc++6 (>= 5.2), libssl1.1")
+    set(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>=2.17), libgcc1 (>= 1:3.4), libstdc++6 (>= 5.2)")
+    set(CPACK_DEBIAN_PACKAGE_RECOMMENDS "libssl1.1")
     if(PACKAGE_RELEASE)
       set(CPACK_PACKAGE_VERSION "${PACKAGE_VERSION}-${PACKAGE_RELEASE}")
     else()
@@ -185,7 +186,14 @@ function(generatePackageTarget)
     set(CPACK_RPM_PACKAGE_DESCRIPTION "${PACKAGE_DESCRIPTION}")
     set(CPACK_RPM_PACKAGE_GROUP "System Environment/Libraries")
     set(CPACK_RPM_PACKAGE_LICENSE "MIT")
-    set(CPACK_RPM_PACKAGE_REQUIRES "openssl-libs(x86-${TARGET_ARCHITECTURE_BITS})")
+    execute_process(COMMAND ${lsb_release_exec} -rs
+                   OUTPUT_VARIABLE lsb_release_number
+                   OUTPUT_STRIP_TRAILING_WHITESPACE)
+    if (rpm_distros MATCHES "RedHat.*" AND NOT lsb_release_number MATCHES "7.*")
+      set(CPACK_RPM_PACKAGE_SUGGESTS "openssl-libs(x86-${TARGET_ARCHITECTURE_BITS})")
+    else()
+      message(WARNING "soft dependency of openssl-libs is not added")
+    endif()
   endif()
 
   include(CPack)

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

diff --git a/icd/api/app_profile.cpp b/icd/api/app_profile.cpp
@@ -433,6 +433,18 @@ constexpr AppProfilePatternEntry AppNameValheim =
     "valheim"
 };
 
+constexpr AppProfilePatternEntry AppExeKnockoutcity =
+{
+    PatternExeNameLower,
+    "knockoutcity"
+};
+
+constexpr AppProfilePatternEntry AppNameEvilGenius2 =
+{
+    PatternAppNameLower,
+    "evil genius 2"
+};
+
 constexpr AppProfilePatternEntry PatternEnd = {};
 
 // This is a table of patterns.  The first matching pattern in this table will be returned.
@@ -798,6 +810,20 @@ AppProfilePattern AppPatternTable[] =
             PatternEnd
         }
     },
+    {
+       AppProfile::KnockoutCity,
+       {
+           AppExeKnockoutcity,
+           PatternEnd
+       }
+    },
+    {
+       AppProfile::EvilGenius2,
+       {
+           AppNameEvilGenius2,
+           PatternEnd
+       }
+    },
 
     {
         AppProfile::ScimitarEngine,

diff --git a/icd/api/app_resource_optimizer.cpp b/icd/api/app_resource_optimizer.cpp
@@ -447,6 +447,7 @@ void ResourceOptimizer::BuildAppProfile()
 #if ICD_RUNTIME_APP_PROFILE
 void ResourceOptimizer::BuildRuntimeProfile()
 {
+    memset(&m_runtimeProfile, 0, sizeof(m_runtimeProfile));
     // TODO: JSON parsing should go here
 }
 #endif

diff --git a/icd/api/app_shader_optimizer.cpp b/icd/api/app_shader_optimizer.cpp
@@ -174,13 +174,6 @@ void ShaderOptimizer::ApplyProfileToShaderCreateInfo(
                     options.pNggState->enableNgg = false;
                 }
 
-#if LLPC_CLIENT_INTERFACE_MAJOR_VERSION < 45
-                if (shaderCreate.apply.nggFasterLaunchRate)
-                {
-                    options.pNggState->enableFastLaunch = true;
-                }
-#endif
-
                 if (shaderCreate.apply.nggVertexReuse)
                 {
                     options.pNggState->enableVertexReuse = true;

diff --git a/icd/api/compiler_solution_llpc.cpp b/icd/api/compiler_solution_llpc.cpp
@@ -140,9 +140,6 @@ VkResult CompilerSolutionLlpc::BuildShaderModule(
 
     auto pPipelineCompiler = m_pPhysicalDevice->GetCompiler();
     pPipelineCompiler->ApplyPipelineOptions(pDevice, 0, &moduleInfo.options.pipelineOptions);
-#if LLPC_CLIENT_INTERFACE_MAJOR_VERSION < 50
-    moduleInfo.options.enableOpt = (flags & VK_SHADER_MODULE_ENABLE_OPT_BIT) ? true : false;
-#endif
 
     Vkgc::Result llpcResult = m_pLlpc->BuildShaderModule(&moduleInfo, &buildOut);