Browse Source

Revert "fix build"

qcomopts2
CamilleLaVey 1 week ago
parent
commit
a4a139edf7
  1. 4
      src/video_core/vulkan_common/vulkan_device.cpp
  2. 6
      src/video_core/vulkan_common/vulkan_device.h

4
src/video_core/vulkan_common/vulkan_device.cpp

@ -1308,10 +1308,10 @@ void Device::RemoveUnsuitableExtensions() {
VK_EXT_CUSTOM_BORDER_COLOR_EXTENSION_NAME);
// VK_KHR_dynamic_rendering
if (!features.dynamic_rendering.dynamicRendering && extensions.dynamic_rendering_ext) {
if (!features.dynamic_rendering.dynamicRendering && extensions.dynamic_rendering) {
LOG_WARNING(Render_Vulkan,
"VK_KHR_dynamic_rendering reported but dynamicRendering feature not available, disabling");
RemoveExtensionFeature(extensions.dynamic_rendering_ext, features.dynamic_rendering,
RemoveExtensionFeature(extensions.dynamic_rendering, features.dynamic_rendering,
VK_KHR_DYNAMIC_RENDERING_EXTENSION_NAME);
}

6
src/video_core/vulkan_common/vulkan_device.h

@ -110,7 +110,7 @@ VK_DEFINE_HANDLE(VmaAllocator)
EXTENSION(EXT, FILTER_CUBIC, filter_cubic) \
EXTENSION(QCOM, FILTER_CUBIC_WEIGHTS, filter_cubic_weights) \
EXTENSION(EXT, GRAPHICS_PIPELINE_LIBRARY, graphics_pipeline_library) \
EXTENSION(KHR, DYNAMIC_RENDERING, dynamic_rendering_ext) \
EXTENSION(KHR, DYNAMIC_RENDERING, dynamic_rendering) \
// Define extensions which must be supported.
#define FOR_EACH_VK_MANDATORY_EXTENSION(EXTENSION_NAME) \
@ -357,8 +357,8 @@ public:
/// Returns true if the device supports VK_KHR_dynamic_rendering.
bool IsDynamicRenderingSupported() const {
return features.dynamic_rendering.dynamicRendering &&
(instance_version >= VK_API_VERSION_1_3 || extensions.dynamic_rendering_ext);
return features.dynamic_rendering.dynamicRendering &&
(instance_version >= VK_API_VERSION_1_3 || extensions.dynamic_rendering);
}
/// Returns true if ASTC is natively supported.

Loading…
Cancel
Save