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

nvk: Use the new load/store_scratch helpers for DRAW_PAD_DW

Browse Source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24326>
This commit is contained in:
Faith Ekstrand
2023-03-27 16:32:41 -05:00
committed by Marge Bot
parent 8ae61af5e3
commit 9009100486
2 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/nouveau/vulkan/nvk_cmd_draw.c
+4 -10
View File
@@ -1803,10 +1803,7 @@ nvk_mme_draw_indirect(struct mme_builder *b)
}
} else {
struct mme_value draw_count = mme_load(b);
struct mme_value pad_dw = mme_load(b);
nvk_mme_spill(b, 0, pad_dw);
mme_free_reg(b, pad_dw);
nvk_mme_load_to_scratch(b, DRAW_PAD_DW);
struct mme_value draw = mme_mov(b, mme_zero());
mme_while(b, ine, draw, draw_count) {
@@ -1816,7 +1813,7 @@ nvk_mme_draw_indirect(struct mme_builder *b)
nvk_mme_build_draw(b, draw);
mme_add_to(b, draw, draw, mme_imm(1));
pad_dw = nvk_mme_fill(b, 0);
struct mme_value pad_dw = nvk_mme_load_scratch(b, DRAW_PAD_DW);
mme_loop(b, pad_dw) {
mme_free_reg(b, mme_load(b));
}
@@ -1924,10 +1921,7 @@ nvk_mme_draw_indexed_indirect(struct mme_builder *b)
}
} else {
struct mme_value draw_count = mme_load(b);
struct mme_value pad_dw = mme_load(b);
nvk_mme_spill(b, 0, pad_dw);
mme_free_reg(b, pad_dw);
nvk_mme_load_to_scratch(b, DRAW_PAD_DW);
struct mme_value draw = mme_mov(b, mme_zero());
mme_while(b, ine, draw, draw_count) {
@@ -1937,7 +1931,7 @@ nvk_mme_draw_indexed_indirect(struct mme_builder *b)
nvk_mme_build_draw_indexed(b, draw);
mme_add_to(b, draw, draw, mme_imm(1));
pad_dw = nvk_mme_fill(b, 0);
struct mme_value pad_dw = nvk_mme_load_scratch(b, DRAW_PAD_DW);
mme_loop(b, pad_dw) {
mme_free_reg(b, mme_load(b));
}
src/nouveau/vulkan/nvk_mme.h
+1
View File
@@ -28,6 +28,7 @@ enum nvk_mme_scratch {
NVK_MME_SCRATCH_CS_INVOCATIONS_HI = 0,
NVK_MME_SCRATCH_CS_INVOCATIONS_LO,
NVK_MME_SCRATCH_DRAW_BEGIN,
NVK_MME_SCRATCH_DRAW_PAD_DW,
/* Must be at the end */
NVK_MME_NUM_SCRATCH,