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

Revert "fix C90" 

This reverts commit 4e761ee485.
This commit is contained in:
NightFox 2021-12-10 01:03:34 +03:00 committed by Ivan Avdeev
parent a55b260905
commit 84b358b096
1 changed files with 17 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
ref_vk/vk_core.c
View File

@ -432,7 +432,23 @@ static qboolean createDevice( void ) {
for (int i = 0; i < num_available_devices; ++i) {
const vk_available_device_t *candidate_device = available_devices + i;
// Skip non-target device
Q_snprintf( unique_deviceID, sizeof( unique_deviceID ), "%04x:%04x", candidate_device->props.vendorID, candidate_device->props.deviceID );
if (is_target_device && !is_target_device_found && Q_stricmp(vk_device_target_id->string, unique_deviceID)) {
if (i == num_available_devices-1) {
gEngine.Con_Printf("Not found device %s, start on %s. Please set a valid device.\n", vk_device_target_id->string, unique_deviceID);
} else {
gEngine.Con_Printf("Skip device %s, because selected %s\n", unique_deviceID, vk_device_target_id->string);
continue;
}
} else {
is_target_device_found = true;
}
if (candidate_device->ray_tracing && !CVAR_TO_BOOL(vk_only)) {
vk_core.rtx = true;
}
VkPhysicalDeviceAccelerationStructureFeaturesKHR accel_feature = {
.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ACCELERATION_STRUCTURE_FEATURES_KHR,
.pNext = NULL,
@ -497,28 +513,6 @@ static qboolean createDevice( void ) {
.ppEnabledExtensionNames = device_extensions,
};
// Skip non-target device
Q_snprintf( unique_deviceID, sizeof( unique_deviceID ), "%04x:%04x", candidate_device->props.vendorID, candidate_device->props.deviceID );
// default_device_id for vk_device_target_id
if (i == 0) { // TODO: select device with RTX by default
//Q_strncpy( vk_core.default_device_id, unique_deviceID, sizeof( vk_core.default_device_id ));
gEngine.Cvar_Set("vk_device_target_id", unique_deviceID);
}
if (is_target_device && !is_target_device_found && Q_stricmp(vk_device_target_id->string, unique_deviceID)) {
if (i == num_available_devices-1) {
gEngine.Con_Printf("Not found device %s, start on %s. Please set a valid device.\n", vk_device_target_id->string, unique_deviceID);
} else {
gEngine.Con_Printf("Skip device %s, because selected %s\n", unique_deviceID, vk_device_target_id->string);
continue;
}
} else {
is_target_device_found = true;
}
if (candidate_device->ray_tracing && !CVAR_TO_BOOL(vk_only)) {
vk_core.rtx = true;
}
// FIXME do only once
vkGetPhysicalDeviceMemoryProperties(candidate_device->device, &vk_core.physical_device.memory_properties);