AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nvk: Move code inside view mask loops to a helper function

Browse Source 
Signed-off-by: Rebecca Mckeever <rebecca.mckeever@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24326>
This commit is contained in:
Rebecca Mckeever
2023-04-07 09:52:22 -07:00
committed by Marge Bot
parent 45001c878f
commit 3e93173cc9
1 changed files with 19 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/nouveau/vulkan/nvk_cmd_draw.c
+19 -39
View File
@@ -1596,6 +1596,22 @@ nvk_mme_build_set_draw_params(struct mme_builder *b,
mme_emit(b, p->first_instance);
}
static void
nvk_mme_emit_view_index(struct mme_builder *b, struct mme_value view_index)
{
/* Set the push constant */
mme_mthd(b, NV9097_LOAD_CONSTANT_BUFFER_OFFSET);
mme_emit(b, mme_imm(nvk_root_descriptor_offset(draw.view_index)));
mme_mthd(b, NV9097_LOAD_CONSTANT_BUFFER(0));
mme_emit(b, view_index);
/* Set the layer to the view index */
STATIC_ASSERT(DRF_LO(NV9097_SET_RT_LAYER_V) == 0);
STATIC_ASSERT(NV9097_SET_RT_LAYER_CONTROL_V_SELECTS_LAYER == 0);
mme_mthd(b, NV9097_SET_RT_LAYER);
mme_emit(b, view_index);
}
static void
nvk_mme_build_draw_loop(struct mme_builder *b,
struct mme_value instance_count,
@@ -1662,19 +1678,7 @@ nvk_mme_build_draw(struct mme_builder *b,
mme_free_reg(b, view_mask);
mme_if(b, ine, has_view, mme_zero()) {
mme_free_reg(b, has_view);
/* Set the push constant */
mme_mthd(b, NV9097_LOAD_CONSTANT_BUFFER_OFFSET);
mme_emit(b, mme_imm(nvk_root_descriptor_offset(draw.view_index)));
mme_mthd(b, NV9097_LOAD_CONSTANT_BUFFER(0));
mme_emit(b, view);
/* Set the layer to the view index */
STATIC_ASSERT(DRF_LO(NV9097_SET_RT_LAYER_V) == 0);
STATIC_ASSERT(NV9097_SET_RT_LAYER_CONTROL_V_SELECTS_LAYER == 0);
mme_mthd(b, NV9097_SET_RT_LAYER);
mme_emit(b, view);
nvk_mme_emit_view_index(b, view);
nvk_mme_build_draw_loop(b, instance_count,
first_vertex, vertex_count);
}
@@ -1799,19 +1803,7 @@ nvk_mme_build_draw_indexed(struct mme_builder *b,
mme_free_reg(b, view_mask);
mme_if(b, ine, has_view, mme_zero()) {
mme_free_reg(b, has_view);
/* Set the push constant */
mme_mthd(b, NV9097_LOAD_CONSTANT_BUFFER_OFFSET);
mme_emit(b, mme_imm(nvk_root_descriptor_offset(draw.view_index)));
mme_mthd(b, NV9097_LOAD_CONSTANT_BUFFER(0));
mme_emit(b, view);
/* Set the layer to the view index */
STATIC_ASSERT(DRF_LO(NV9097_SET_RT_LAYER_V) == 0);
STATIC_ASSERT(NV9097_SET_RT_LAYER_CONTROL_V_SELECTS_LAYER == 0);
mme_mthd(b, NV9097_SET_RT_LAYER);
mme_emit(b, view);
nvk_mme_emit_view_index(b, view);
nvk_mme_build_draw_indexed_loop(b, instance_count,
first_index, index_count);
}
@@ -2321,19 +2313,7 @@ nvk_mme_xfb_draw_indirect(struct mme_builder *b)
mme_free_reg(b, view_mask);
mme_if(b, ine, has_view, mme_zero()) {
mme_free_reg(b, has_view);
/* Set the push constant */
mme_mthd(b, NV9097_LOAD_CONSTANT_BUFFER_OFFSET);
mme_emit(b, mme_imm(nvk_root_descriptor_offset(draw.view_index)));
mme_mthd(b, NV9097_LOAD_CONSTANT_BUFFER(0));
mme_emit(b, view);
/* Set the layer to the view index */
STATIC_ASSERT(DRF_LO(NV9097_SET_RT_LAYER_V) == 0);
STATIC_ASSERT(NV9097_SET_RT_LAYER_CONTROL_V_SELECTS_LAYER == 0);
mme_mthd(b, NV9097_SET_RT_LAYER);
mme_emit(b, view);
nvk_mme_emit_view_index(b, view);
nvk_mme_xfb_draw_indirect_loop(b, instance_count, counter);
}