From 132b3a79f462b7ee416ea2ce2adf7c59b4c8d108 Mon Sep 17 00:00:00 2001 From: "Thomas H.P. Andersen" Date: Fri, 26 Jan 2024 16:08:14 +0100 Subject: [PATCH] nvk: promote VK_EXT_line_rasterization to KHR Part-of: --- src/nouveau/vulkan/nvk_cmd_draw.c | 8 ++++---- src/nouveau/vulkan/nvk_physical_device.c | 5 +++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/nouveau/vulkan/nvk_cmd_draw.c b/src/nouveau/vulkan/nvk_cmd_draw.c index 7020f582241..26108a17838 100644 --- a/src/nouveau/vulkan/nvk_cmd_draw.c +++ b/src/nouveau/vulkan/nvk_cmd_draw.c @@ -1363,18 +1363,18 @@ nvk_flush_rs_state(struct nvk_cmd_buffer *cmd) if (BITSET_TEST(dyn->dirty, MESA_VK_DYNAMIC_RS_LINE_MODE)) { switch (dyn->rs.line.mode) { - case VK_LINE_RASTERIZATION_MODE_DEFAULT_EXT: - case VK_LINE_RASTERIZATION_MODE_RECTANGULAR_EXT: + case VK_LINE_RASTERIZATION_MODE_DEFAULT_KHR: + case VK_LINE_RASTERIZATION_MODE_RECTANGULAR_KHR: P_IMMD(p, NV9097, SET_LINE_MULTISAMPLE_OVERRIDE, ENABLE_FALSE); P_IMMD(p, NV9097, SET_ANTI_ALIASED_LINE, ENABLE_FALSE); break; - case VK_LINE_RASTERIZATION_MODE_BRESENHAM_EXT: + case VK_LINE_RASTERIZATION_MODE_BRESENHAM_KHR: P_IMMD(p, NV9097, SET_LINE_MULTISAMPLE_OVERRIDE, ENABLE_TRUE); P_IMMD(p, NV9097, SET_ANTI_ALIASED_LINE, ENABLE_FALSE); break; - case VK_LINE_RASTERIZATION_MODE_RECTANGULAR_SMOOTH_EXT: + case VK_LINE_RASTERIZATION_MODE_RECTANGULAR_SMOOTH_KHR: P_IMMD(p, NV9097, SET_LINE_MULTISAMPLE_OVERRIDE, ENABLE_TRUE); P_IMMD(p, NV9097, SET_ANTI_ALIASED_LINE, ENABLE_TRUE); break; diff --git a/src/nouveau/vulkan/nvk_physical_device.c b/src/nouveau/vulkan/nvk_physical_device.c index 81a7c9a8899..b66bb1c3381 100644 --- a/src/nouveau/vulkan/nvk_physical_device.c +++ b/src/nouveau/vulkan/nvk_physical_device.c @@ -103,6 +103,7 @@ nvk_get_device_extensions(const struct nvk_instance *instance, .KHR_image_format_list = true, .KHR_imageless_framebuffer = true, .KHR_index_type_uint8 = true, + .KHR_line_rasterization = true, .KHR_maintenance1 = true, .KHR_maintenance2 = true, .KHR_maintenance3 = true, @@ -459,7 +460,7 @@ nvk_get_device_features(const struct nv_device_info *info, /* VK_KHR_index_type_uint8 */ .indexTypeUint8 = true, - /* VK_EXT_line_rasterization */ + /* VK_KHR_line_rasterization */ .rectangularLines = true, .bresenhamLines = true, .smoothLines = true, @@ -776,7 +777,7 @@ nvk_get_device_properties(const struct nvk_instance *instance, /* VK_EXT_extended_dynamic_state3 */ .dynamicPrimitiveTopologyUnrestricted = true, - /* VK_EXT_line_rasterization */ + /* VK_KHR_line_rasterization */ .lineSubPixelPrecisionBits = 8, /* VK_EXT_multi_draw */