OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nvk: promote VK_EXT_line_rasterization to KHR

Browse Source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27297>
This commit is contained in:
Thomas H.P. Andersen
2024-01-26 16:08:14 +01:00
committed by Marge Bot
parent da910fc2fd
commit 132b3a79f4
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/nouveau/vulkan/nvk_cmd_draw.c
View File

@@ -1363,18 +1363,18 @@ nvk_flush_rs_state(struct nvk_cmd_buffer *cmd)
if (BITSET_TEST(dyn->dirty, MESA_VK_DYNAMIC_RS_LINE_MODE)) { if (BITSET_TEST(dyn->dirty, MESA_VK_DYNAMIC_RS_LINE_MODE)) {
switch (dyn->rs.line.mode) { switch (dyn->rs.line.mode) {
case VK_LINE_RASTERIZATION_MODE_DEFAULT_EXT: case VK_LINE_RASTERIZATION_MODE_DEFAULT_KHR:
case VK_LINE_RASTERIZATION_MODE_RECTANGULAR_EXT: case VK_LINE_RASTERIZATION_MODE_RECTANGULAR_KHR:
P_IMMD(p, NV9097, SET_LINE_MULTISAMPLE_OVERRIDE, ENABLE_FALSE); P_IMMD(p, NV9097, SET_LINE_MULTISAMPLE_OVERRIDE, ENABLE_FALSE);
P_IMMD(p, NV9097, SET_ANTI_ALIASED_LINE, ENABLE_FALSE); P_IMMD(p, NV9097, SET_ANTI_ALIASED_LINE, ENABLE_FALSE);
break; 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_LINE_MULTISAMPLE_OVERRIDE, ENABLE_TRUE);
P_IMMD(p, NV9097, SET_ANTI_ALIASED_LINE, ENABLE_FALSE); P_IMMD(p, NV9097, SET_ANTI_ALIASED_LINE, ENABLE_FALSE);
break; 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_LINE_MULTISAMPLE_OVERRIDE, ENABLE_TRUE);
P_IMMD(p, NV9097, SET_ANTI_ALIASED_LINE, ENABLE_TRUE); P_IMMD(p, NV9097, SET_ANTI_ALIASED_LINE, ENABLE_TRUE);
break; break;

5
src/nouveau/vulkan/nvk_physical_device.c
View File

@@ -103,6 +103,7 @@ nvk_get_device_extensions(const struct nvk_instance *instance,
.KHR_image_format_list = true, .KHR_image_format_list = true,
.KHR_imageless_framebuffer = true, .KHR_imageless_framebuffer = true,
.KHR_index_type_uint8 = true, .KHR_index_type_uint8 = true,
.KHR_line_rasterization = true,
.KHR_maintenance1 = true, .KHR_maintenance1 = true,
.KHR_maintenance2 = true, .KHR_maintenance2 = true,
.KHR_maintenance3 = true, .KHR_maintenance3 = true,
@@ -459,7 +460,7 @@ nvk_get_device_features(const struct nv_device_info *info,
/* VK_KHR_index_type_uint8 */ /* VK_KHR_index_type_uint8 */
.indexTypeUint8 = true, .indexTypeUint8 = true,
/* VK_EXT_line_rasterization */ /* VK_KHR_line_rasterization */
.rectangularLines = true, .rectangularLines = true,
.bresenhamLines = true, .bresenhamLines = true,
.smoothLines = true, .smoothLines = true,
@@ -776,7 +777,7 @@ nvk_get_device_properties(const struct nvk_instance *instance,
/* VK_EXT_extended_dynamic_state3 */ /* VK_EXT_extended_dynamic_state3 */
.dynamicPrimitiveTopologyUnrestricted = true, .dynamicPrimitiveTopologyUnrestricted = true,
/* VK_EXT_line_rasterization */ /* VK_KHR_line_rasterization */
.lineSubPixelPrecisionBits = 8, .lineSubPixelPrecisionBits = 8,
/* VK_EXT_multi_draw */ /* VK_EXT_multi_draw */