godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-08 12:40:44 +00:00
Code Releases Wiki Activity

Merge pull request #67729 from Riteo/workaround-extension-feature-bug

Browse Source 
Check for a Vulkan extension before checking its features
This commit is contained in:
Rémi Verschelde
2022-10-31 10:48:35 +01:00
parent 62a778fdd6 3ef598c9f8
commit e12043ae3a
1 changed files with 34 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
drivers/vulkan/vulkan_context.cpp
View File

@@ -687,21 +687,43 @@ Error VulkanContext::_check_capabilities() {
vkGetPhysicalDeviceFeatures2_func(gpu, &device_features); vkGetPhysicalDeviceFeatures2_func(gpu, &device_features);
vrs_capabilities.pipeline_vrs_supported = vrs_features.pipelineFragmentShadingRate; // We must check that the relative extension is present before assuming a
vrs_capabilities.primitive_vrs_supported = vrs_features.primitiveFragmentShadingRate; // feature as enabled. Actually, according to the spec we shouldn't add the
vrs_capabilities.attachment_vrs_supported = vrs_features.attachmentFragmentShadingRate; // structs in pNext at all, but this works fine.
// See also: https://github.com/godotengine/godot/issues/65409
for (uint32_t i = 0; i < enabled_extension_count; ++i) {
if (!strcmp(VK_KHR_FRAGMENT_SHADING_RATE_EXTENSION_NAME, extension_names[i])) {
vrs_capabilities.pipeline_vrs_supported = vrs_features.pipelineFragmentShadingRate;
vrs_capabilities.primitive_vrs_supported = vrs_features.primitiveFragmentShadingRate;
vrs_capabilities.attachment_vrs_supported = vrs_features.attachmentFragmentShadingRate;
multiview_capabilities.is_supported = multiview_features.multiview; continue;
multiview_capabilities.geometry_shader_is_supported = multiview_features.multiviewGeometryShader; }
multiview_capabilities.tessellation_shader_is_supported = multiview_features.multiviewTessellationShader;
shader_capabilities.shader_float16_is_supported = shader_features.shaderFloat16; if (!strcmp(VK_KHR_MULTIVIEW_EXTENSION_NAME, extension_names[i])) {
shader_capabilities.shader_int8_is_supported = shader_features.shaderInt8; multiview_capabilities.is_supported = multiview_features.multiview;
multiview_capabilities.geometry_shader_is_supported = multiview_features.multiviewGeometryShader;
multiview_capabilities.tessellation_shader_is_supported = multiview_features.multiviewTessellationShader;
storage_buffer_capabilities.storage_buffer_16_bit_access_is_supported = storage_feature.storageBuffer16BitAccess; continue;
storage_buffer_capabilities.uniform_and_storage_buffer_16_bit_access_is_supported = storage_feature.uniformAndStorageBuffer16BitAccess; }
storage_buffer_capabilities.storage_push_constant_16_is_supported = storage_feature.storagePushConstant16;
storage_buffer_capabilities.storage_input_output_16 = storage_feature.storageInputOutput16; if (!strcmp(VK_KHR_SHADER_FLOAT16_INT8_EXTENSION_NAME, extension_names[i])) {
shader_capabilities.shader_float16_is_supported = shader_features.shaderFloat16;
shader_capabilities.shader_int8_is_supported = shader_features.shaderInt8;
continue;
}
if (!strcmp(VK_KHR_16BIT_STORAGE_EXTENSION_NAME, extension_names[i])) {
storage_buffer_capabilities.storage_buffer_16_bit_access_is_supported = storage_feature.storageBuffer16BitAccess;
storage_buffer_capabilities.uniform_and_storage_buffer_16_bit_access_is_supported = storage_feature.uniformAndStorageBuffer16BitAccess;
storage_buffer_capabilities.storage_push_constant_16_is_supported = storage_feature.storagePushConstant16;
storage_buffer_capabilities.storage_input_output_16 = storage_feature.storageInputOutput16;
continue;
}
}
} }
// Check extended properties. // Check extended properties.