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

Commit a367518

Browse files
qiaojbaoqiaojbao
committed
Update xgl from commit 36e1c4ef
Update Khronos Vulkan Headers to 1.3.301 Update compliant CTS version to 1.3.9.2 Fix buffer overflow when the count of display modes exceeds MaxModePerScreen(64) (xgl issues #179) Expose extension VK_EXT_swapchain_colorspace Fix command buffer stack usage estimates Add persistent waves to CPS path Extend GFX11 app opts to Strix Copy cbState struct as a whole Add BG3 layer to modify a barrier Disable dcc when the application transitions to the feedback loop image layout (AMDVLK Issue #375) Fix NSA threshold for World War Z and Sniper Elite 5 Get WaveSize from GPURT compiler options Remove unnecessary UpdateFrameTraceController call Update RtFp16BoxNodes Values Change VK_ASSERT_MSG to VK_ASSERT_ALWAYS_MSG Set AllowVaryWaveSize for GPURT shaders Remove VK_ALLOC_A macro Fix nsaThreshold definitions in app_profile Bail out on error when parsing shader profile Enable the option OptimizePointSizeWrite Fix CTS failures in dEQP-VK.pipeline.pipeline_library.graphics_library.misc.other.* Disable descriptorBufferCaptureReplay Disabling DCC for VK_IMAGE_LAYOUT_RENDERING_LOCAL_READ_KHR Update some settings' value [RT] Fix the use of 'forceInvalidAccelStruct' setting Fix usage of LayoutUncompressed for LAYOUT_RENDERING_LOCAL_READ Fix coding standard issues in vk_defines Expose more graphics and compute queues Disable htile for external memory when creating image to work-around the corruption issue in interop with mesa GL Initializing the fence count to 0 for every device index. [DPRINTF] Fix debug printf crash Fix sample shading is enabled for POPS incorrectly Expose VK_KHR_compute_shader_derivatives Fix menu list corruption in Blender 4.3.0 Beta no rgp markers for rgd Bump up GPURT version to 51 Enable GpuRt setting for persistent waves Update PAL Version in XGL 909 VK_EXT_shader_replicated_composites - Driver Implementation Fix "Unknown()" events appearing in RGP captures Specify SRD stride for SrvTable and TypedSrvTables as 4 Fix memory leaks Reset plane index according to the latest aspectMask to fix corruption in Blender 4.3.0 Beta: EEVEE render engine Fix an assertion of incorrect primitive type Remove m_stringTableId from devmode Bugs fix for Proton Raytracing Games Acq rel for CmdWaitEvents Clean up macros and build options
1 parent 786ec85 commit a367518

79 files changed

Lines changed: 1812 additions & 1541 deletions

File tree

Some content is hidden

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

‎CMakeLists.txt‎

Lines changed: 54 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ cmake_policy(SET CMP0091 NEW)
2828

2929
# This part set before "project(XGL VERSION 1 LANGUAGES C CXX)".
3030
# In a system has both gcc and clang compiler.
31-
option(XGL_USE_CLANG "Build with clang?" OFF)
32-
if(UNIX AND XGL_USE_CLANG)
31+
option(VKI_USE_CLANG "Build with clang?" OFF)
32+
if(UNIX AND VKI_USE_CLANG)
3333
list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
3434
include(XglCompilerOptions)
3535
xgl_use_clang_compiler()
@@ -108,75 +108,75 @@ xgl_set_compiler()
108108

109109
### Sanitizers ########################################################################################################
110110
# Temporary variables
111-
set(ICD_SANITIZER_LINK_FLAGS "")
112-
set(ICD_SANITIZER_COMPILE_FLAGS "")
111+
set(VKI_SANITIZER_LINK_FLAGS "")
112+
set(VKI_SANITIZER_COMPILE_FLAGS "")
113113

114-
if(XGL_USE_SANITIZER)
114+
if(VKI_USE_SANITIZER)
115115
# -pthread is needed sometimes to fix a cmake bug: https://gitlab.kitware.com/cmake/cmake/issues/16609
116-
string(APPEND ICD_SANITIZER_LINK_FLAGS " -pthread")
116+
string(APPEND VKI_SANITIZER_LINK_FLAGS " -pthread")
117117
if(UNIX)
118-
if(XGL_USE_SANITIZER MATCHES "Address")
119-
string(APPEND ICD_SANITIZER_LINK_FLAGS " -shared-libasan")
118+
if(VKI_USE_SANITIZER MATCHES "Address")
119+
string(APPEND VKI_SANITIZER_LINK_FLAGS " -shared-libasan")
120120
endif()
121121

122-
if(XGL_USE_SANITIZER STREQUAL "Address")
122+
if(VKI_USE_SANITIZER STREQUAL "Address")
123123
xgl_append_common_sanitizer_flags()
124-
string(APPEND ICD_SANITIZER_COMPILE_FLAGS " -fsanitize=address")
125-
string(APPEND ICD_SANITIZER_LINK_FLAGS " -fsanitize=address")
126-
elseif (XGL_USE_SANITIZER MATCHES "Memory(WithOrigins)?")
124+
string(APPEND VKI_SANITIZER_COMPILE_FLAGS " -fsanitize=address")
125+
string(APPEND VKI_SANITIZER_LINK_FLAGS " -fsanitize=address")
126+
elseif (VKI_USE_SANITIZER MATCHES "Memory(WithOrigins)?")
127127
xgl_append_common_sanitizer_flags()
128-
string(APPEND ICD_SANITIZER_COMPILE_FLAGS " -fsanitize=memory")
129-
string(APPEND ICD_SANITIZER_LINK_FLAGS " -fsanitize=memory")
130-
if(XGL_USE_SANITIZER STREQUAL "MemoryWithOrigins")
131-
string(APPEND ICD_SANITIZER_COMPILE_FLAGS " -fsanitize-memory-track-origins")
132-
string(APPEND ICD_SANITIZER_LINK_FLAGS " -fsanitize-memory-track-origins")
128+
string(APPEND VKI_SANITIZER_COMPILE_FLAGS " -fsanitize=memory")
129+
string(APPEND VKI_SANITIZER_LINK_FLAGS " -fsanitize=memory")
130+
if(VKI_USE_SANITIZER STREQUAL "MemoryWithOrigins")
131+
string(APPEND VKI_SANITIZER_COMPILE_FLAGS " -fsanitize-memory-track-origins")
132+
string(APPEND VKI_SANITIZER_LINK_FLAGS " -fsanitize-memory-track-origins")
133133
endif()
134-
elseif(XGL_USE_SANITIZER STREQUAL "Undefined")
134+
elseif(VKI_USE_SANITIZER STREQUAL "Undefined")
135135
xgl_append_common_sanitizer_flags()
136-
string(APPEND ICD_SANITIZER_COMPILE_FLAGS " -fsanitize=undefined -fno-sanitize=vptr,function \
136+
string(APPEND VKI_SANITIZER_COMPILE_FLAGS " -fsanitize=undefined -fno-sanitize=vptr,function \
137137
-fno-sanitize-recover=all")
138-
string(APPEND ICD_SANITIZER_LINK_FLAGS " -fsanitize=undefined")
139-
elseif(XGL_USE_SANITIZER STREQUAL "Thread")
138+
string(APPEND VKI_SANITIZER_LINK_FLAGS " -fsanitize=undefined")
139+
elseif(VKI_USE_SANITIZER STREQUAL "Thread")
140140
xgl_append_common_sanitizer_flags()
141-
string(APPEND ICD_SANITIZER_COMPILE_FLAGS " -fsanitize=thread")
142-
string(APPEND ICD_SANITIZER_LINK_FLAGS " -fsanitize=thread")
143-
elseif(XGL_USE_SANITIZER STREQUAL "Address;Undefined" OR
144-
XGL_USE_SANITIZER STREQUAL "Undefined;Address")
141+
string(APPEND VKI_SANITIZER_COMPILE_FLAGS " -fsanitize=thread")
142+
string(APPEND VKI_SANITIZER_LINK_FLAGS " -fsanitize=thread")
143+
elseif(VKI_USE_SANITIZER STREQUAL "Address;Undefined" OR
144+
VKI_USE_SANITIZER STREQUAL "Undefined;Address")
145145
xgl_append_common_sanitizer_flags()
146-
string(APPEND ICD_SANITIZER_COMPILE_FLAGS " -fsanitize=address,undefined -fno-sanitize=vptr,function \
146+
string(APPEND VKI_SANITIZER_COMPILE_FLAGS " -fsanitize=address,undefined -fno-sanitize=vptr,function \
147147
-fno-sanitize-recover=all")
148-
string(APPEND ICD_SANITIZER_LINK_FLAGS " -fsanitize=address,undefined")
149-
elseif(XGL_USE_SANITIZER STREQUAL "Leaks")
148+
string(APPEND VKI_SANITIZER_LINK_FLAGS " -fsanitize=address,undefined")
149+
elseif(VKI_USE_SANITIZER STREQUAL "Leaks")
150150
xgl_append_common_sanitizer_flags()
151-
string(APPEND ICD_SANITIZER_COMPILE_FLAGS " -fsanitize=leak")
152-
string(APPEND ICD_SANITIZER_LINK_FLAGS " -fsanitize=leak")
151+
string(APPEND VKI_SANITIZER_COMPILE_FLAGS " -fsanitize=leak")
152+
string(APPEND VKI_SANITIZER_LINK_FLAGS " -fsanitize=leak")
153153
else()
154-
message(FATAL_ERROR "Unsupported value of XGL_USE_SANITIZER: ${XGL_USE_SANITIZER}")
154+
message(FATAL_ERROR "Unsupported value of VKI_USE_SANITIZER: ${VKI_USE_SANITIZER}")
155155
endif()
156156
elseif(MSVC)
157-
if(XGL_USE_SANITIZER STREQUAL "Address")
157+
if(VKI_USE_SANITIZER STREQUAL "Address")
158158
xgl_append_common_sanitizer_flags()
159-
string(APPEND ICD_SANITIZER_COMPILE_FLAGS " -fsanitize=address")
160-
string(APPEND ICD_SANITIZER_LINK_FLAGS " -fsanitize=address")
159+
string(APPEND VKI_SANITIZER_COMPILE_FLAGS " -fsanitize=address")
160+
string(APPEND VKI_SANITIZER_LINK_FLAGS " -fsanitize=address")
161161
else()
162-
message(FATAL_ERROR "This sanitizer not yet supported in the MSVC environment: ${XGL_USE_SANITIZER}")
162+
message(FATAL_ERROR "This sanitizer not yet supported in the MSVC environment: ${VKI_USE_SANITIZER}")
163163
endif()
164164
else()
165-
message(FATAL_ERROR "XGL_USE_SANITIZER is not supported on this platform.")
165+
message(FATAL_ERROR "VKI_USE_SANITIZER is not supported on this platform.")
166166
endif()
167167

168-
if(XGL_USE_SANITIZER MATCHES "(Undefined;)?Address(;Undefined)?")
169-
string(APPEND ICD_SANITIZER_COMPILE_FLAGS " -fsanitize-address-use-after-scope")
168+
if(VKI_USE_SANITIZER MATCHES "(Undefined;)?Address(;Undefined)?")
169+
string(APPEND VKI_SANITIZER_COMPILE_FLAGS " -fsanitize-address-use-after-scope")
170170
endif()
171171
endif()
172172

173-
string(APPEND CMAKE_EXE_LINKER_FLAGS "${ICD_SANITIZER_LINK_FLAGS}")
174-
string(APPEND CMAKE_SHARED_LINKER_FLAGS "${ICD_SANITIZER_LINK_FLAGS}")
175-
string(APPEND CMAKE_C_FLAGS "${ICD_SANITIZER_COMPILE_FLAGS}")
176-
string(APPEND CMAKE_CXX_FLAGS "${ICD_SANITIZER_COMPILE_FLAGS}")
173+
string(APPEND CMAKE_EXE_LINKER_FLAGS "${VKI_SANITIZER_LINK_FLAGS}")
174+
string(APPEND CMAKE_SHARED_LINKER_FLAGS "${VKI_SANITIZER_LINK_FLAGS}")
175+
string(APPEND CMAKE_C_FLAGS "${VKI_SANITIZER_COMPILE_FLAGS}")
176+
string(APPEND CMAKE_CXX_FLAGS "${VKI_SANITIZER_COMPILE_FLAGS}")
177177

178178
# LLVM libc++
179-
if(XGL_ENABLE_LIBCXX)
179+
if(VKI_ENABLE_LIBCXX)
180180
if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
181181
string(APPEND CMAKE_EXE_LINKER_FLAGS " -stdlib=libc++")
182182
string(APPEND CMAKE_SHARED_LINKER_FLAGS " -stdlib=libc++")
@@ -189,24 +189,24 @@ endif()
189189

190190
### GCOV source code coverage #########################################################################################
191191
# Temporary variables
192-
set(ICD_GCOV_LINK_FLAGS "")
193-
set(ICD_GCOV_COMPILE_FLAGS "")
192+
set(VKI_GCOV_LINK_FLAGS "")
193+
set(VKI_GCOV_COMPILE_FLAGS "")
194194

195-
if(XGL_ENABLE_GCOV)
195+
if(VKI_ENABLE_GCOV)
196196
if(UNIX)
197-
message(STATUS "This gcov is supported on the UNIX environment: ${XGL_ENABLE_GCOV}")
197+
message(STATUS "This gcov is supported on the UNIX environment: ${VKI_ENABLE_GCOV}")
198198
xgl_append_gcov_coverage_flags()
199199
elseif(MSVC)
200-
message(FATAL_ERROR "This gcov not yet supported in the MSVC environment: ${XGL_ENABLE_GCOV}")
200+
message(FATAL_ERROR "This gcov not yet supported in the MSVC environment: ${VKI_ENABLE_GCOV}")
201201
else()
202-
message(FATAL_ERROR "XGL_ENABLE_GCOV is not supported on this platform.")
202+
message(FATAL_ERROR "VKI_ENABLE_GCOV is not supported on this platform.")
203203
endif()
204204
endif()
205205

206-
string(APPEND CMAKE_EXE_LINKER_FLAGS "${ICD_GCOV_LINK_FLAGS}")
207-
string(APPEND CMAKE_SHARED_LINKER_FLAGS "${ICD_GCOV_LINK_FLAGS}")
208-
string(APPEND CMAKE_C_FLAGS "${ICD_GCOV_COMPILE_FLAGS}")
209-
string(APPEND CMAKE_CXX_FLAGS "${ICD_GCOV_COMPILE_FLAGS}")
206+
string(APPEND CMAKE_EXE_LINKER_FLAGS "${VKI_GCOV_LINK_FLAGS}")
207+
string(APPEND CMAKE_SHARED_LINKER_FLAGS "${VKI_GCOV_LINK_FLAGS}")
208+
string(APPEND CMAKE_C_FLAGS "${VKI_GCOV_COMPILE_FLAGS}")
209+
string(APPEND CMAKE_CXX_FLAGS "${VKI_GCOV_COMPILE_FLAGS}")
210210

211211
### Generator Dependencies ############################################################################################
212212
# Python3
@@ -228,7 +228,7 @@ endif()
228228
set(PERL_CMD ${PERL_EXECUTABLE})
229229

230230
# Wayland required
231-
if (BUILD_WAYLAND_SUPPORT)
231+
if (VKI_BUILD_WAYLAND)
232232
find_package(PkgConfig REQUIRED)
233233
pkg_check_modules(WAYLAND REQUIRED wayland-client)
234234
endif()

‎cmake/XglCompileDefinitions.cmake‎

Lines changed: 8 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -30,20 +30,13 @@ macro(xgl_set_compile_definitions)
3030
target_compile_definitions(xgl PRIVATE ${TARGET_ARCHITECTURE_ENDIANESS}ENDIAN_CPU)
3131

3232
if(TARGET_ARCHITECTURE_BITS EQUAL 32)
33-
target_compile_definitions(xgl PRIVATE ICD_X86_BUILD)
33+
target_compile_definitions(xgl PRIVATE VKI_X86_BUILD)
3434
elseif(TARGET_ARCHITECTURE_BITS EQUAL 64)
35-
target_compile_definitions(xgl PRIVATE ICD_X64_BUILD)
35+
target_compile_definitions(xgl PRIVATE VKI_X64_BUILD)
3636
endif()
3737

3838
# Turn on the memory tracker if enabled.
39-
if(ICD_MEMTRACK)
40-
target_compile_definitions(xgl PRIVATE ICD_MEMTRACK)
41-
endif()
42-
43-
# Enable relevant GPUOpen preprocessor definitions
44-
if(ICD_GPUOPEN_DEVMODE_BUILD)
45-
target_compile_definitions(xgl PRIVATE ICD_GPUOPEN_DEVMODE_BUILD)
46-
endif()
39+
target_compile_definitions(xgl PRIVATE $<$<BOOL:${VKI_MEMTRACK}>:VKI_MEMTRACK>)
4740

4841
if(ICD_BUILD_LLPC)
4942
target_compile_definitions(xgl PRIVATE ICD_BUILD_LLPC)
@@ -68,13 +61,13 @@ macro(xgl_set_compile_definitions)
6861
target_compile_definitions(xgl PRIVATE PAL_BUILD_GFX9=1)
6962

7063
#if VKI_BUILD_GFX115
71-
if(XGL_BUILD_GFX115)
64+
if(VKI_BUILD_GFX115)
7265
target_compile_definitions(xgl PRIVATE VKI_BUILD_GFX115=1)
7366
endif()
7467
#endif
7568

7669
#if VKI_BUILD_STRIX1
77-
if(XGL_BUILD_STRIX1)
70+
if(VKI_BUILD_STRIX1)
7871
target_compile_definitions(xgl PRIVATE VKI_BUILD_STRIX1=1)
7972
endif()
8073
#endif
@@ -87,17 +80,11 @@ macro(xgl_set_compile_definitions)
8780
endif()
8881
#endif
8982

90-
#if VKI_NORMALIZED_TRIG_FUNCTIONS
91-
if(VKI_NORMALIZED_TRIG_FUNCTIONS)
92-
target_compile_definitions(xgl PRIVATE VKI_NORMALIZED_TRIG_FUNCTIONS)
93-
endif()
94-
#endif
95-
9683
#if VKI_RAY_TRACING
9784
#endif
9885

99-
if (XGL_ENABLE_GCOV)
100-
target_compile_definitions(xgl PRIVATE ICD_ENABLE_GCOV)
86+
if (VKI_ENABLE_GCOV)
87+
target_compile_definitions(xgl PRIVATE VKI_ENABLE_GCOV)
10188
endif()
10289

10390
#if VKI_GPU_DECOMPRESS
@@ -109,7 +96,7 @@ macro(xgl_set_compile_definitions)
10996
#if VKI_RAY_TRACING
11097
#endif
11198

112-
if(BUILD_WAYLAND_SUPPORT)
99+
if(VKI_BUILD_WAYLAND)
113100
target_compile_definitions(xgl PRIVATE VK_USE_PLATFORM_WAYLAND_KHR)
114101
endif()
115102

‎cmake/XglCompilerOptions.cmake‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ macro(xgl_set_compiler)
156156
endif()
157157

158158
# Assertions
159-
if(XGL_ENABLE_ASSERTIONS)
159+
if(VKI_ENABLE_ASSERTIONS)
160160
# MSVC doesn't like _DEBUG on release builds.
161161
if(NOT MSVC)
162162
add_definitions(-D_DEBUG)
@@ -221,7 +221,7 @@ function(xgl_compiler_options TARGET)
221221
-Wno-unused-parameter
222222
)
223223

224-
if(ICD_ANALYSIS_WARNINGS_AS_ERRORS)
224+
if(VKI_ANALYSIS_WARNINGS_AS_ERRORS)
225225
target_compile_options(${TARGET} PRIVATE
226226
-Werror
227227
-Wno-error=comment
@@ -304,7 +304,7 @@ function(xgl_compiler_options TARGET)
304304

305305
if(CMAKE_BUILD_TYPE_RELEASE)
306306
target_compile_options(${TARGET} PRIVATE -O3)
307-
if(XGL_ENABLE_LTO)
307+
if(VKI_ENABLE_LTO)
308308
if(${CMAKE_CXX_COMPILER_ID} MATCHES "GNU")
309309
execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION)
310310
if(GCC_VERSION VERSION_GREATER 5.3 OR GCC_VERSION VERSION_EQUAL 5.3)

‎cmake/XglHelper.cmake‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,19 +28,19 @@ include_guard()
2828
macro(xgl_append_common_sanitizer_flags)
2929
if(NOT MSVC)
3030
# Append -fno-omit-frame-pointer and turn on debug info to get better stack traces.
31-
string(APPEND ICD_SANITIZER_COMPILE_FLAGS " -fno-omit-frame-pointer")
31+
string(APPEND VKI_SANITIZER_COMPILE_FLAGS " -fno-omit-frame-pointer")
3232
if (NOT CMAKE_BUILD_TYPE_DEBUG)
33-
string(APPEND ICD_SANITIZER_COMPILE_FLAGS " -gline-tables-only")
33+
string(APPEND VKI_SANITIZER_COMPILE_FLAGS " -gline-tables-only")
3434
else()
3535
# Use -O1 even in debug mode, otherwise sanitizers slowdown is too large.
36-
string(APPEND ICD_SANITIZER_COMPILE_FLAGS " -O1")
36+
string(APPEND VKI_SANITIZER_COMPILE_FLAGS " -O1")
3737
endif()
3838
elseif(CLANG_CL)
3939
# Keep frame pointers around.
40-
string(APPEND ICD_SANITIZER_COMPILE_FLAGS " /Oy-")
40+
string(APPEND VKI_SANITIZER_COMPILE_FLAGS " /Oy-")
4141
# Always ask the linker to produce symbols with asan.
42-
string(APPEND ICD_SANITIZER_COMPILE_FLAGS " /Z7")
43-
string(APPEND ICD_SANITIZER_LINK_FLAGS " -debug")
42+
string(APPEND VKI_SANITIZER_COMPILE_FLAGS " /Z7")
43+
string(APPEND VKI_SANITIZER_LINK_FLAGS " -debug")
4444
endif()
4545
endmacro()
4646

@@ -49,18 +49,18 @@ macro(xgl_append_gcov_coverage_flags)
4949
# This option is used to compile and link code instrumented for coverage analysis.
5050
# The option --coverage is a synonym for -fprofile-arcs -ftest-coverage (when compiling) and -lgcov (when linking)
5151
# Ref link: https://gcc.gnu.org/onlinedocs/gcc/Instrumentation-Options.html#Instrumentation-Options
52-
string(APPEND ICD_GCOV_COMPILE_FLAGS " --coverage")
53-
string(APPEND ICD_GCOV_LINK_FLAGS " --coverage")
52+
string(APPEND VKI_GCOV_COMPILE_FLAGS " --coverage")
53+
string(APPEND VKI_GCOV_LINK_FLAGS " --coverage")
5454

5555
if (NOT CMAKE_BUILD_TYPE_DEBUG)
5656
# Use -O0 even in not debug mode, otherwise code coverage is not accurate.
57-
string(APPEND ICD_GCOV_COMPILE_FLAGS " -O0")
57+
string(APPEND VKI_GCOV_COMPILE_FLAGS " -O0")
5858
endif()
5959

6060
if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
61-
string(APPEND ICD_GCOV_COMPILE_FLAGS " -Xclang -coverage-cfg-checksum")
62-
string(APPEND ICD_GCOV_COMPILE_FLAGS " -Xclang -coverage-no-function-names-in-data")
63-
string(APPEND ICD_GCOV_COMPILE_FLAGS " -Xclang -coverage-version='408*'")
61+
string(APPEND VKI_GCOV_COMPILE_FLAGS " -Xclang -coverage-cfg-checksum")
62+
string(APPEND VKI_GCOV_COMPILE_FLAGS " -Xclang -coverage-no-function-names-in-data")
63+
string(APPEND VKI_GCOV_COMPILE_FLAGS " -Xclang -coverage-version='408*'")
6464
endif()
6565
else()
6666
message(FATAL_ERROR "Unknown compiler ID: ${CMAKE_CXX_COMPILER_ID}")

‎cmake/XglOptions.cmake‎

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

42-
option(XGL_ENABLE_PRINTS_ASSERTS "Build with debug print enabled?" OFF)
42+
option(VKI_ENABLE_PRINTS_ASSERTS "Build with debug print enabled?" OFF)
4343

44-
option(XGL_ENABLE_LTO "Build with LTO enabled?" ON)
44+
option(VKI_ENABLE_LTO "Build with LTO enabled?" ON)
4545

46-
option(XGL_ENABLE_GCOV "Build with gcov source code coverage?" OFF)
47-
#if VKI_BUILD_GFX115
48-
option(XGL_BUILD_GFX115 "Build vulkan for GFX115" ON)
49-
#endif
46+
option(VKI_ENABLE_GCOV "Build with gcov source code coverage?" OFF)
5047
#if VKI_BUILD_STRIX1
51-
option(XGL_BUILD_STRIX1 "Build vulkan for STRIX1" ON)
48+
option(VKI_BUILD_STRIX1 "Build vulkan for STRIX1" ON)
5249
#endif
5350

54-
option(XGL_BUILD_TESTS "Build tests?" OFF)
51+
option(VKI_BUILD_TESTS "Build tests?" OFF)
5552

56-
option(XGL_BUILD_TOOLS "Build tools?" OFF)
53+
option(VKI_BUILD_TOOLS "Build tools?" OFF)
5754

5855
#if VKI_RAY_TRACING
5956
option(VKI_RAY_TRACING "Build vulkan with RAY_TRACING" ON)
@@ -65,22 +62,16 @@ macro(xgl_options)
6562

6663
option(ICD_BUILD_LLPC "Build LLPC?" ON)
6764

68-
option(XGL_LLVM_UPSTREAM "Build with upstreamed LLVM?" OFF)
69-
70-
option(XGL_ENABLE_ASSERTIONS "Enable assertions in release builds" OFF)
71-
72-
option(XGL_ENABLE_LIBCXX "Use libc++. This is intended for MemorySanitizer support only." OFF)
73-
74-
option(ICD_GPUOPEN_DEVMODE_BUILD "Build ${PROJECT_NAME} with GPU Open Developer Mode driver support?" ON)
65+
option(VKI_ENABLE_ASSERTIONS "Enable assertions in release builds" OFF)
7566

76-
option(ICD_MEMTRACK "Turn on memory tracking?" ${CMAKE_BUILD_TYPE_DEBUG})
67+
option(VKI_ENABLE_LIBCXX "Use libc++. This is intended for MemorySanitizer support only." OFF)
7768

7869
if(UNIX AND (NOT ANDROID))
79-
option(BUILD_WAYLAND_SUPPORT "Build XGL with Wayland support" ON)
70+
option(VKI_BUILD_WAYLAND "Build XGL with Wayland support" ON)
8071

81-
option(BUILD_DRI3_SUPPORT "Build XGL with Dri3 support" ON)
72+
option(VKI_BUILD_DRI3 "Build XGL with Dri3 support" ON)
8273
endif()
8374

84-
option(ICD_ANALYSIS_WARNINGS_AS_ERRORS "Warnings as errors?" OFF)
75+
option(VKI_ANALYSIS_WARNINGS_AS_ERRORS "Warnings as errors?" OFF)
8576

8677
endmacro()

0 commit comments

Comments
 (0)