NeroReflex/mesa
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

nvk: Support extendedDynamicState3ColorWriteMask

Browse source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24872>
This commit is contained in:
Faith Ekstrand 2023-12-15 17:37:38 -06:00
parent c7135e94cb
commit b42fae61bb
3 changed files with 9 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/nouveau/vulkan/nvk_cmd_draw.c
View file

@ -448,6 +448,7 @@ nvk_cmd_buffer_dirty_render_pass(struct nvk_cmd_buffer *cmd)
BITSET_SET(dyn->dirty, MESA_VK_DYNAMIC_CB_COLOR_WRITE_ENABLES);
BITSET_SET(dyn->dirty, MESA_VK_DYNAMIC_CB_BLEND_ENABLES);
BITSET_SET(dyn->dirty, MESA_VK_DYNAMIC_CB_BLEND_EQUATIONS);
BITSET_SET(dyn->dirty, MESA_VK_DYNAMIC_CB_WRITE_MASKS);
/* These depend on the depth/stencil format */
BITSET_SET(dyn->dirty, MESA_VK_DYNAMIC_DS_DEPTH_TEST_ENABLE);
@ -1694,15 +1695,20 @@ nvk_flush_cb_state(struct nvk_cmd_buffer *cmd)
}
}
if (BITSET_TEST(dyn->dirty, MESA_VK_DYNAMIC_CB_COLOR_WRITE_ENABLES)) {
if (BITSET_TEST(dyn->dirty, MESA_VK_DYNAMIC_CB_WRITE_MASKS) ||
BITSET_TEST(dyn->dirty, MESA_VK_DYNAMIC_CB_COLOR_WRITE_ENABLES)) {
uint32_t color_write_enables = 0x0;
for (uint8_t a = 0; a < render->color_att_count; a++) {
if (dyn->cb.color_write_enables & BITFIELD_BIT(a))
color_write_enables |= 0xf << (4 * a);
}
uint32_t att_write_mask = 0x0;
for (uint8_t a = 0; a < render->color_att_count; a++)
att_write_mask |= dyn->cb.attachments[a].write_mask << (a * 4);
P_IMMD(p, NV9097, SET_MME_SHADOW_SCRATCH(NVK_MME_SCRATCH_WRITE_MASK_DYN),
color_write_enables);
color_write_enables & att_write_mask);
P_1INC(p, NV9097, CALL_MME_MACRO(NVK_MME_SET_WRITE_MASK));
P_INLINE_DATA(p, render->color_att_count);

8
src/nouveau/vulkan/nvk_graphics_pipeline.c
View file

@ -103,14 +103,6 @@ emit_pipeline_ct_write_state(struct nv_push *p,
}
}
if (cb != NULL) {
assert(cb->attachment_count == att_count);
uint32_t wm = 0;
for (uint32_t a = 0; a < cb->attachment_count; a++)
wm |= cb->attachments[a].write_mask << (a * 4);
write_mask &= wm;
}
P_IMMD(p, NV9097, SET_MME_SHADOW_SCRATCH(NVK_MME_SCRATCH_WRITE_MASK_PIPELINE),
write_mask);

2
src/nouveau/vulkan/nvk_physical_device.c
View file

@ -399,7 +399,7 @@ nvk_get_device_features(const struct nv_device_info *info,
.extendedDynamicState3LogicOpEnable = true,
.extendedDynamicState3ColorBlendEnable = true,
.extendedDynamicState3ColorBlendEquation = true,
.extendedDynamicState3ColorWriteMask = false,
.extendedDynamicState3ColorWriteMask = true,
.extendedDynamicState3RasterizationStream = false,
.extendedDynamicState3ConservativeRasterizationMode = false,
.extendedDynamicState3ExtraPrimitiveOverestimationSize = false,