Half-Life-RTX
/
xash3d-fwgs
mirror of https://github.com/w23/xash3d-fwgs
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #707 from 0x4E69676874466F78/no_ray_warn 

Improved warning when there are no ray extensions

fix #670
This commit is contained in:
Ivan Avdeev 2023-12-12 14:42:44 -08:00 committed by GitHub
parent f3f14ac968 726572b78c
commit 9a0ff43a97
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ref/vk/vk_core.c
View File

@ -327,6 +327,8 @@ static int enumerateDevices( vk_available_device_t **available_devices ) {
*available_devices = Mem_Malloc(vk_core.pool, num_physical_devices * sizeof(vk_available_device_t));
this_device = *available_devices;
qboolean has_rt = false;
for (uint32_t i = 0; i < num_physical_devices; ++i) {
uint32_t queue_index = VK_QUEUE_FAMILY_IGNORED;
VkPhysicalDeviceProperties props;
@ -417,7 +419,7 @@ static int enumerateDevices( vk_available_device_t **available_devices ) {
this_device->anisotropy = features.features.samplerAnisotropy;
gEngine.Con_Printf("\t\tAnistoropy supported: %d\n", this_device->anisotropy);
this_device->ray_tracing = deviceSupportsExtensions(extensions, num_device_extensions, device_extensions_rt, ARRAYSIZE(device_extensions_rt));
has_rt |= this_device->ray_tracing = deviceSupportsExtensions(extensions, num_device_extensions, device_extensions_rt, ARRAYSIZE(device_extensions_rt));
gEngine.Con_Printf("\t\tRay tracing supported: %d\n", this_device->ray_tracing);
this_device->nv_checkpoint = vk_core.debug && deviceSupportsExtensions(extensions, num_device_extensions, device_extensions_nv_checkpoint, ARRAYSIZE(device_extensions_nv_checkpoint));
@ -436,6 +438,18 @@ static int enumerateDevices( vk_available_device_t **available_devices ) {
}
Mem_Free(physical_devices);
if (!has_rt) {
gEngine.Con_Printf( "^6===================================================^7\n" );
gEngine.Con_Printf(S_ERROR "^1No ray tracing extensions found.^7\n");
#if defined XASH_64BIT
gEngine.Con_Printf(S_NOTE "^3Check that you have compatible hardware and drivers.^7\n");
#else
gEngine.Con_Printf(S_WARN "^3You're running in ^132-bit ^3mode!^7\n");
gEngine.Con_Printf(S_NOTE "^3Ray Tracing REQUIRES ^264-bit ^3process!\n^5Please rebuild and start the 64-bit xash3d binary.^7\n");
#endif
gEngine.Con_Printf( "^6===================================================^7\n" );
}
return this_device - *available_devices;
}

6
ref/vk/wscript
View File

@ -60,6 +60,12 @@ def configure(conf):
conf.env.LIB_AFTERMATH = [lib]
conf.end_msg('SDK: {0}, includes: {1}, libpath: {2}, lib: {3}'.format(path, conf.env.INCLUDES_AFTERMATH, conf.env.LIBPATH_AFTERMATH, conf.env.LIB_AFTERMATH))
if not conf.options.ALLOW64:
Logs.warn('\x1b[35;20m==============================================================')
Logs.error('\x1b[33;20mNo ray tracing extensions in \x1b[31;1m32-bit \x1b[33;20mmode!')
Logs.warn("Note that Ray Tracing REQUIRES \x1b[32;1m64-bit \x1b[33;20mprocess!\n\x1b[36;20mPlease configure with the 64-bit using \x1b[32;1m-8 \x1b[36;20mor \x1b[32;1m--64bits \x1b[36;20mflags.");
Logs.warn('\x1b[35;20m==============================================================')
# TODO if debug
conf.env.GLSLCFLAGS += ['-g', '-O']