fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-16 09:20:34 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

nvk: Move setting VB enables and strides into macros

Browse source 
This effectively splits the two states apart so that we can set them
independently.  Inside the macros, we only update states that have
actually changed which should also be a bit more efficient.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30703>
This commit is contained in:
Faith Ekstrand 2024-08-14 11:56:21 -05:00 • committed by Marge Bot
parent 07d7652624
commit 954f274c19
3 changed files with 81 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -490,6 +490,14 @@ nvk_push_draw_state_init(struct nvk_queue *queue, struct nv_push *p)
P_NV9097_SET_VERTEX_STREAM_SUBSTITUTE_A(p, zero_addr >> 32);
P_NV9097_SET_VERTEX_STREAM_SUBSTITUTE_B(p, zero_addr);
P_MTHD(p, NV9097, SET_MME_SHADOW_SCRATCH(NVK_MME_SCRATCH_VB_ENABLES));
P_NV9097_SET_MME_SHADOW_SCRATCH(p, NVK_MME_SCRATCH_VB_ENABLES, 0);
for (uint32_t b = 0; b < 32; b++) {
P_IMMD(p, NV9097, SET_VERTEX_STREAM_A_FORMAT(b), {
.enable = false,
});
}
if (pdev->info.cls_eng3d >= FERMI_A &&
pdev->info.cls_eng3d < MAXWELL_A) {
assert(dev->vab_memory);
@ -1408,6 +1416,60 @@ nvk_flush_shaders(struct nvk_cmd_buffer *cmd)
cmd->state.gfx.shaders_dirty = 0;
}
void
nvk_mme_set_vb_enables(struct mme_builder *b)
{
struct mme_value enables = mme_load(b);
struct mme_value old_enables = nvk_mme_load_scratch(b, VB_ENABLES);
nvk_mme_store_scratch(b, VB_ENABLES, enables);
struct mme_value changed = mme_xor(b, enables, old_enables);
mme_free_reg(b, old_enables);
struct mme_value vb_idx4 = mme_mov(b, mme_zero());
mme_while(b, ine, changed, mme_zero()) {
mme_if(b, ine, mme_and(b, changed, mme_imm(1)), mme_zero()) {
struct mme_value state =
mme_state_arr(b, NV9097_SET_VERTEX_STREAM_A_FORMAT(0), vb_idx4);
mme_merge_to(b, state, state, enables, 12, 1, 0);
mme_mthd_arr(b, NV9097_SET_VERTEX_STREAM_A_FORMAT(0), vb_idx4);
mme_emit(b, state);
}
mme_add_to(b, vb_idx4, vb_idx4, mme_imm(4));
mme_srl_to(b, changed, changed, mme_imm(1));
mme_srl_to(b, enables, enables, mme_imm(1));
}
}
static uint32_t
nvk_mme_vb_stride(uint32_t vb_idx, uint32_t stride)
{
assert(stride < (1 << 12));
assert(vb_idx < (1 << 5));
return (vb_idx << 16) | stride;
}
void
nvk_mme_set_vb_stride(struct mme_builder *b)
{
/* Param is laid out as
*
* bits 0..11 : stride
* bits 16..21 : VB index
*/
struct mme_value param = mme_load(b);
struct mme_value vb_idx4 = mme_merge(b, mme_zero(), param, 2, 5, 16);
struct mme_value state =
mme_state_arr(b, NV9097_SET_VERTEX_STREAM_A_FORMAT(0), vb_idx4);
struct mme_value new_state = mme_merge(b, state, param, 0, 12, 0);
mme_if(b, ine, state, new_state) {
mme_mthd_arr(b, NV9097_SET_VERTEX_STREAM_A_FORMAT(0), vb_idx4);
mme_emit(b, new_state);
}
}
static void
nvk_flush_vi_state(struct nvk_cmd_buffer *cmd)
{
@ -1416,7 +1478,12 @@ nvk_flush_vi_state(struct nvk_cmd_buffer *cmd)
const struct vk_dynamic_graphics_state *dyn =
&cmd->vk.dynamic_graphics_state;
struct nv_push *p = nvk_cmd_buffer_push(cmd, 256);
struct nv_push *p = nvk_cmd_buffer_push(cmd, 258);
if (BITSET_TEST(dyn->dirty, MESA_VK_DYNAMIC_VI_BINDINGS_VALID)) {
P_1INC(p, NVB197, CALL_MME_MACRO(NVK_MME_SET_VB_ENABLES));
P_INLINE_DATA(p, dyn->vi->bindings_valid);
}
if (BITSET_TEST(dyn->dirty, MESA_VK_DYNAMIC_VI) ||
BITSET_TEST(dyn->dirty, MESA_VK_DYNAMIC_VI_BINDINGS_VALID)) {
@ -1444,11 +1511,10 @@ nvk_flush_vi_state(struct nvk_cmd_buffer *cmd)
if (BITSET_TEST(dyn->dirty, MESA_VK_DYNAMIC_VI_BINDINGS_VALID) ||
BITSET_TEST(dyn->dirty, MESA_VK_DYNAMIC_VI_BINDING_STRIDES)) {
for (uint32_t b = 0; b < 32; b++) {
P_IMMD(p, NV9097, SET_VERTEX_STREAM_A_FORMAT(b), {
.stride = dyn->vi_binding_strides[b],
.enable = (dyn->vi->bindings_valid & BITFIELD_BIT(b)) != 0,
});
u_foreach_bit(b, dyn->vi->bindings_valid) {
assert(dyn->vi_binding_strides[b] < (1 << 12));
P_1INC(p, NVB197, CALL_MME_MACRO(NVK_MME_SET_VB_STRIDE));
P_INLINE_DATA(p, nvk_mme_vb_stride(b, dyn->vi_binding_strides[b]));
}
}
}

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

@ -14,6 +14,8 @@ static const nvk_mme_builder_func mme_builders[NVK_MME_COUNT] = {
[NVK_MME_CLEAR] = nvk_mme_clear,
[NVK_MME_BIND_IB] = nvk_mme_bind_ib,
[NVK_MME_BIND_VB] = nvk_mme_bind_vb,
[NVK_MME_SET_VB_ENABLES] = nvk_mme_set_vb_enables,
[NVK_MME_SET_VB_STRIDE] = nvk_mme_set_vb_stride,
[NVK_MME_DRAW] = nvk_mme_draw,
[NVK_MME_DRAW_INDEXED] = nvk_mme_draw_indexed,
[NVK_MME_DRAW_INDIRECT] = nvk_mme_draw_indirect,

7
src/nouveau/vulkan/nvk_mme.h
View file

@ -16,6 +16,8 @@ enum nvk_mme {
NVK_MME_CLEAR,
NVK_MME_BIND_IB,
NVK_MME_BIND_VB,
NVK_MME_SET_VB_ENABLES,
NVK_MME_SET_VB_STRIDE,
NVK_MME_DRAW,
NVK_MME_DRAW_INDEXED,
NVK_MME_DRAW_INDIRECT,
@ -53,6 +55,9 @@ enum nvk_mme_scratch {
NVK_MME_SCRATCH_WRITE_MASK_PIPELINE,
NVK_MME_SCRATCH_CONSERVATIVE_RASTER_STATE,
/* Bitfield of enabled vertex buffer bindings */
NVK_MME_SCRATCH_VB_ENABLES,
/* Addres of cb0 */
NVK_MME_SCRATCH_CB0_ADDR_HI,
NVK_MME_SCRATCH_CB0_ADDR_LO,
@ -150,6 +155,8 @@ void nvk_mme_bind_cbuf_desc(struct mme_builder *b);
void nvk_mme_clear(struct mme_builder *b);
void nvk_mme_bind_ib(struct mme_builder *b);
void nvk_mme_bind_vb(struct mme_builder *b);
void nvk_mme_set_vb_enables(struct mme_builder *b);
void nvk_mme_set_vb_stride(struct mme_builder *b);
void nvk_mme_draw(struct mme_builder *b);
void nvk_mme_draw_indexed(struct mme_builder *b);
void nvk_mme_draw_indirect(struct mme_builder *b);