Skip to content
This repository was archived by the owner on Sep 15, 2025. It is now read-only.

Commit 393503c

Browse files
qiaojbaoqiaojbao
committed
Update xgl from commit f6f1c275
Remove acquire/release needsGlobalTransition Handle PAL drm headers move to 'shared' dir Pack 1bit flags before passing them to MetroHash ReportLargeLocalHeapForApu panel setting not applied correctly Add support for NonUniformResouceIndex experiment Support for submitting command buffers separately Fix IsColorFormat() for YUV/Planar formats Fix a fallthrough, asserts, warnings Assign Unorm for all MM formats in GetNumberFormat Fix OOM error when ReportLargeLocalHeapForApu=True Fix Invalid BVH Header With FastLBVH Enabled Fix Barriers for Global CPS Memory Enable ReportLargeLocalHeapForApu by default Set padBufferSizeToNextDword to true Set cpsDispatchIdAddress [Indiana Jones] Fix Hang when RRA tracing enabled Add support for x24_unorm Fix CPS Frontend Stack Size Set enable256KBSwizzleModes Fix pipeline scratch size for non-continuations Bump GPURT version to 53 Fix dynamic state primitive restart Removes asserts in pipeline_binary Remove workaround and enable FastLBVH for DoomEternal Update Khronos Vulkan Headers to 1.4.308 Handle VK_REMAINING_ARRAY_LAYERS in ImageViewCreateInfo Align SRD size for ray tracing Not set force1x1ShaderRate for DynamicRasterizationSamples Extension initialization for VK_EXT_host_image_copy Add debugprintf user data node to the BVH building pipeline Add DispatchPingHw setting Add various RT settings Fix CTS dEQP-VK.image* failures on Strix1 Bump GPURT version to 54 Fix CTS 1.4 Warnings Add support to disable chaining for TimedQueueSubmit path GPA to query Engine/memory clock frequency Fix LlamaCpp backend cannot offload model to Detachable Graphics Remove "\0" in the format string for dbg_printff Restrict 256KB swizzle modes to BPP * sample count >= 16 Update PAL Version in XGL 917 Remove dead codes gated by earlier LLPC version (< 70) Add AppProfile Creo VK_EXT_device_generated_commands - driver implementation Add Strix Halo support
1 parent f140933 commit 393503c

File tree

123 files changed

+3825
-1858
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

123 files changed

+3825
-1858
lines changed

‎cmake/Modules/FindDRM.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
##
22
#######################################################################################################################
33
#
4-
# Copyright (c) 2025 Advanced Micro Devices, Inc. All Rights Reserved.
4+
# Copyright (c) 2024-2025 Advanced Micro Devices, Inc. All Rights Reserved.
55
#
66
# Permission is hereby granted, free of charge, to any person obtaining a copy
77
# of this software and associated documentation files (the "Software"), to deal

‎cmake/Modules/FindKernelHeaders.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
##
22
#######################################################################################################################
33
#
4-
# Copyright (c) 2025 Advanced Micro Devices, Inc. All Rights Reserved.
4+
# Copyright (c) 2024-2025 Advanced Micro Devices, Inc. All Rights Reserved.
55
#
66
# Permission is hereby granted, free of charge, to any person obtaining a copy
77
# of this software and associated documentation files (the "Software"), to deal

‎cmake/Modules/FindXCB.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
##
22
#######################################################################################################################
33
#
4-
# Copyright (c) 2025 Advanced Micro Devices, Inc. All Rights Reserved.
4+
# Copyright (c) 2024-2025 Advanced Micro Devices, Inc. All Rights Reserved.
55
#
66
# Permission is hereby granted, free of charge, to any person obtaining a copy
77
# of this software and associated documentation files (the "Software"), to deal

‎cmake/Modules/XglSetupAmdGlobalRoots.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
##
22
#######################################################################################################################
33
#
4-
# Copyright (c) 2025 Advanced Micro Devices, Inc. All Rights Reserved.
4+
# Copyright (c) 2024-2025 Advanced Micro Devices, Inc. All Rights Reserved.
55
#
66
# Permission is hereby granted, free of charge, to any person obtaining a copy
77
# of this software and associated documentation files (the "Software"), to deal

‎cmake/XglCompileDefinitions.cmake‎

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -58,21 +58,11 @@ macro(xgl_set_compile_definitions)
5858
endif()
5959
#endif
6060

61-
if(VKI_SDK_NEXT)
62-
target_compile_definitions(xgl PRIVATE VKI_SDK_NEXT)
63-
endif()
64-
6561
target_compile_definitions(xgl PRIVATE PAL_BUILD_GFX9=1)
6662

67-
#if VKI_BUILD_GFX115
68-
if(VKI_BUILD_GFX115)
69-
target_compile_definitions(xgl PRIVATE VKI_BUILD_GFX115=1)
70-
endif()
71-
#endif
72-
73-
#if VKI_BUILD_STRIX1
74-
if(VKI_BUILD_STRIX1)
75-
target_compile_definitions(xgl PRIVATE VKI_BUILD_STRIX1=1)
63+
#if VKI_BUILD_STRIX_HALO
64+
if(VKI_BUILD_STRIX_HALO)
65+
target_compile_definitions(xgl PRIVATE VKI_BUILD_STRIX_HALO=1)
7666
endif()
7767
#endif
7868

‎cmake/XglOptions.cmake‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,13 @@ macro(xgl_options)
3939
option(VKI_DEVMODE_COMPILER_SETTINGS "Build with devmode compiler settings?" OFF)
4040
#endif
4141

42-
option(VKI_SDK_NEXT "Build with Vulkan 1.4 support" ON)
43-
4442
option(VKI_ENABLE_PRINTS_ASSERTS "Build with debug print enabled?" OFF)
4543

4644
option(VKI_ENABLE_LTO "Build with LTO enabled?" ON)
4745

4846
option(VKI_ENABLE_GCOV "Build with gcov source code coverage?" OFF)
49-
#if VKI_BUILD_STRIX1
50-
option(VKI_BUILD_STRIX1 "Build vulkan for STRIX1" ON)
47+
#if VKI_BUILD_STRIX_HALO
48+
option(VKI_BUILD_STRIX_HALO "Build vulkan for STRIX_HALO" ON)
5149
#endif
5250

5351
option(VKI_BUILD_TESTS "Build tests?" OFF)

‎cmake/XglOverrides.cmake‎

Lines changed: 7 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
##
22
#######################################################################################################################
33
#
4-
# Copyright (c) 2017-2024 Advanced Micro Devices, Inc. All Rights Reserved.
4+
# Copyright (c) 2017-2025 Advanced Micro Devices, Inc. All Rights Reserved.
55
#
66
# Permission is hereby granted, free of charge, to any person obtaining a copy
77
# of this software and associated documentation files (the "Software"), to deal
@@ -103,12 +103,8 @@ macro(xgl_overrides_pal)
103103
set(PAL_BUILD_GFX11 ON CACHE BOOL "${PROJECT_NAME} override." FORCE)
104104
set(PAL_BUILD_PHOENIX2 ON CACHE BOOL "${PROJECT_NAME} override." FORCE)
105105

106-
#if VKI_BUILD_GFX115
107-
set(PAL_BUILD_GFX115 ${VKI_BUILD_GFX115} CACHE BOOL "${PROJECT_NAME} override." FORCE)
108-
#endif
109-
110-
#if VKI_BUILD_STRIX1
111-
set(PAL_BUILD_STRIX1 ${VKI_BUILD_STRIX1} CACHE BOOL "${PROJECT_NAME} override." FORCE)
106+
#if VKI_BUILD_STRIX_HALO
107+
set(PAL_BUILD_STRIX_HALO ${VKI_BUILD_STRIX_HALO} CACHE BOOL "${PROJECT_NAME} override." FORCE)
112108
#endif
113109

114110
# Wayland
@@ -151,14 +147,11 @@ macro(xgl_overrides_llpc)
151147

152148
set(LLPC_BUILD_GFX11 ON CACHE BOOL "${PROJECT_NAME} override." FORCE)
153149

154-
#if VKI_BUILD_GFX115
155-
if(VKI_BUILD_GFX115)
156-
set(LLPC_BUILD_GFX115 ${VKI_BUILD_GFX115} CACHE BOOL "${PROJECT_NAME} override." FORCE)
157-
endif()
158-
#endif
150+
set(LLPC_BUILD_GFX115 ON CACHE BOOL "${PROJECT_NAME} override." FORCE)
151+
set(LLPC_BUILD_STRIX1 ON CACHE BOOL "${PROJECT_NAME} override." FORCE)
159152

160-
#if VKI_BUILD_STRIX1
161-
set(LLPC_BUILD_STRIX1 ${VKI_BUILD_STRIX1} CACHE BOOL "${PROJECT_NAME} override." FORCE)
153+
#if VKI_BUILD_STRIX_HALO
154+
set(LLPC_BUILD_STRIX_HALO ${VKI_BUILD_STRIX_HALO} CACHE BOOL "${PROJECT_NAME} override." FORCE)
162155
#endif
163156

164157
set(LLPC_CLIENT_INTERFACE_MAJOR_VERSION ${VKI_LLPC_CLIENT_MAJOR_VERSION} CACHE STRING "${PROJECT_NAME} override." FORCE)
@@ -179,15 +172,6 @@ macro(xgl_overrides)
179172

180173
set(GPUOPEN_CLIENT_INTERFACE_MAJOR_VERSION ${VKI_GPUOPEN_CLIENT_MAJOR_VERSION})
181174

182-
#if VKI_BUILD_GFX115
183-
set(VKI_BUILD_GFX115 OFF)
184-
#if VKI_BUILD_STRIX1
185-
if(VKI_BUILD_STRIX1)
186-
set(VKI_BUILD_GFX115 ON)
187-
endif()
188-
#endif
189-
#endif
190-
191175
xgl_get_path()
192176

193177
set(VKI_MEMTRACK ${CMAKE_BUILD_TYPE_DEBUG})

‎cmake/XglVersions.cmake‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ include_guard()
3030
# This will become the value of PAL_CLIENT_INTERFACE_MAJOR_VERSION. It describes the version of the PAL interface
3131
# that the ICD supports. PAL uses this value to enable backwards-compatibility for older interface versions.
3232
# It must be updated on each PAL promotion after handling all of the interface changes described in palLib.h.
33-
set(VKI_PAL_CLIENT_MAJOR_VERSION "911")
33+
set(VKI_PAL_CLIENT_MAJOR_VERSION "917")
3434

3535
# This will become the value of GPUOPEN_CLIENT_INTERFACE_MAJOR_VERSION.
3636
# It describes the interface version of the gpuopen shared module (part of PAL) that the ICD supports.
@@ -39,7 +39,7 @@ set(VKI_GPUOPEN_CLIENT_MAJOR_VERSION "42")
3939
#if VKI_RAY_TRACING
4040
# This will become the value of GPURT_CLIENT_INTERFACE_MAJOR_VERSION if VKI_RAY_TRACING=1.
4141
# It describes the interface version of the GpuRT shared module that the ICD supports.
42-
set(VKI_GPURT_CLIENT_MAJOR_VERSION "52")
42+
set(VKI_GPURT_CLIENT_MAJOR_VERSION "54")
4343
#endif
4444

4545
# This will become the value of LLPC_CLIENT_INTERFACE_MAJOR_VERSION if ICD_BUILD_LLPC=1.

‎icd/CMakeLists.txt‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
##
22
#######################################################################################################################
33
#
4-
# Copyright (c) 2017-2024 Advanced Micro Devices, Inc. All Rights Reserved.
4+
# Copyright (c) 2017-2025 Advanced Micro Devices, Inc. All Rights Reserved.
55
#
66
# Permission is hereby granted, free of charge, to any person obtaining a copy
77
# of this software and associated documentation files (the "Software"), to deal
@@ -61,7 +61,9 @@ endif()
6161
#endif
6262

6363
if (UNIX)
64-
target_include_directories(xgl PRIVATE ${XGL_PAL_PATH}/src/core/os/amdgpu/include/drm)
64+
# 'PAL/src/core/os/amdgpu/include/drm' may be removed later. PAL drm moved to 'shared' dir, old path left for compatibility.
65+
target_include_directories(xgl PRIVATE ${XGL_PAL_PATH}/src/core/os/amdgpu/include/drm)
66+
target_include_directories(xgl PRIVATE ${XGL_PAL_PATH}/shared/amdgpu/include/drm)
6567
endif()
6668

6769
### XGL Subprojects ####################################################################################################

‎icd/Loader/LunarG/Lnx/amd-icd.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
"file_format_version": "1.0.0",
33
"ICD": {
44
"library_path": "@AMDVLK_INSTALL_PATH@/amdvlk@[email protected]",
5-
"api_version": "1.4.304"
5+
"api_version": "1.4.308"
66
},
77
"layer": {
88
"name": "VK_LAYER_AMD_switchable_graphics_@ISABITS@",
99
"type": "GLOBAL",
1010
"library_path": "@AMDVLK_INSTALL_PATH@/amdvlk@[email protected]",
11-
"api_version": "1.4.304",
11+
"api_version": "1.4.308",
1212
"implementation_version": "1",
1313
"description": "AMD switchable graphics layer",
1414
"functions": {

0 commit comments

Comments
 (0)