From 1b5629273323e3f64bf65ef03ed5116737359cf2 Mon Sep 17 00:00:00 2001 From: Faith Ekstrand Date: Fri, 5 Jul 2024 13:38:58 -0500 Subject: [PATCH] nvk: Don't emit conservative rasterization before Maxwell B Part-of: --- src/nouveau/vulkan/nvk_cmd_draw.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/nouveau/vulkan/nvk_cmd_draw.c b/src/nouveau/vulkan/nvk_cmd_draw.c index 71a93dc2ac4..4106270e961 100644 --- a/src/nouveau/vulkan/nvk_cmd_draw.c +++ b/src/nouveau/vulkan/nvk_cmd_draw.c @@ -1828,7 +1828,9 @@ nvk_flush_rs_state(struct nvk_cmd_buffer *cmd) if (BITSET_TEST(dyn->dirty, MESA_VK_DYNAMIC_RS_CONSERVATIVE_MODE) || BITSET_TEST(dyn->dirty, MESA_VK_DYNAMIC_RS_EXTRA_PRIMITIVE_OVERESTIMATION_SIZE)) { - if (dyn->rs.conservative_mode == VK_CONSERVATIVE_RASTERIZATION_MODE_DISABLED_EXT) { + if (nvk_cmd_buffer_3d_cls(cmd) < MAXWELL_B) { + assert(dyn->rs.conservative_mode == VK_CONSERVATIVE_RASTERIZATION_MODE_DISABLED_EXT); + } else if (dyn->rs.conservative_mode == VK_CONSERVATIVE_RASTERIZATION_MODE_DISABLED_EXT) { P_IMMD(p, NVB197, SET_CONSERVATIVE_RASTER, ENABLE_FALSE); } else { uint32_t extra_overestimate =