From b1c12c5eef0172a1f536ecb38a8e0f878b249a1b Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Tue, 25 Apr 2023 15:47:38 +0200 Subject: [PATCH] radv: only enable extendedDynamicState3ConservativeRasterizationMode on GFX9+ If extendedDynamicState3ConservativeRasterizationMode is enabled, VK_EXT_conservative_rasterization is mandatory. Fixes recent updates in dEQP-VK.info.device_mandatory_features. Cc: mesa-stable Signed-off-by: Samuel Pitoiset Part-of: (cherry picked from commit 44a2e5ba383a86b249719a068e199427ceab9a39) --- .pick_status.json | 2 +- src/amd/vulkan/radv_physical_device.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 928431a0970..0de98f1d7f1 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1336,7 +1336,7 @@ "description": "radv: only enable extendedDynamicState3ConservativeRasterizationMode on GFX9+", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null }, diff --git a/src/amd/vulkan/radv_physical_device.c b/src/amd/vulkan/radv_physical_device.c index 976865f0ae5..6f50d6849b4 100644 --- a/src/amd/vulkan/radv_physical_device.c +++ b/src/amd/vulkan/radv_physical_device.c @@ -1240,7 +1240,7 @@ radv_GetPhysicalDeviceFeatures2(VkPhysicalDevice physicalDevice, features->extendedDynamicState3LineStippleEnable = true; features->extendedDynamicState3ColorBlendEnable = true; features->extendedDynamicState3DepthClipEnable = true; - features->extendedDynamicState3ConservativeRasterizationMode = true; + features->extendedDynamicState3ConservativeRasterizationMode = pdevice->rad_info.gfx_level >= GFX9; features->extendedDynamicState3DepthClipNegativeOneToOne = true; features->extendedDynamicState3ProvokingVertexMode = true; features->extendedDynamicState3DepthClampEnable = true;