fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-25 00:00:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

nvk: Combine CLEAR_VIEWS and CLEAR_LAYERS MME macros

Browse source 
Check view_mask inside the macro to determine which loop to run. In
emit_clear_rects(), move code out of if/else that is the same in both
branches.

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-03-31 15:41:16 -07:00 • committed by Marge Bot
parent b6a3dd4b51
commit 45001c878f
3 changed files with 42 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

89
src/nouveau/vulkan/nvk_cmd_clear.c
View file

@ -12,38 +12,42 @@
#include "nvk_cl9097.h"
#include "drf.h"
void nvk_mme_clear_views(struct mme_builder *b)
void nvk_mme_clear(struct mme_builder *b)
{
struct mme_value payload = mme_load(b);
struct mme_value view_mask = nvk_mme_load_scratch(b, VIEW_MASK);
struct mme_value bit = mme_mov(b, mme_imm(1));
const uint32_t arr_idx = 1 << DRF_LO(NV9097_CLEAR_SURFACE_RT_ARRAY_INDEX);
mme_loop(b, mme_imm(32)) {
mme_if(b, ine, mme_and(b, view_mask, bit), mme_zero()) {
mme_if(b, ine, view_mask, mme_zero()) {
struct mme_value bit = mme_mov(b, mme_imm(1));
mme_loop(b, mme_imm(32)) {
mme_if(b, ine, mme_and(b, view_mask, bit), mme_zero()) {
mme_mthd(b, NV9097_CLEAR_SURFACE);
mme_emit(b, payload);
}
mme_add_to(b, payload, payload, mme_imm(arr_idx));
mme_sll_to(b, bit, bit, mme_imm(1));
}
mme_free_reg(b, bit);
}
mme_if(b, ieq, view_mask, mme_zero()) {
struct mme_value layer_count = mme_load(b);
mme_loop(b, layer_count) {
mme_mthd(b, NV9097_CLEAR_SURFACE);
mme_emit(b, payload);
mme_add_to(b, payload, payload, mme_imm(arr_idx));
}
mme_add_to(b, payload, payload, mme_imm(arr_idx));
mme_sll_to(b, bit, bit, mme_imm(1));
mme_free_reg(b, layer_count);
}
}
void nvk_mme_clear_layers(struct mme_builder *b)
{
struct mme_value payload = mme_load(b);
struct mme_value layer_count = mme_load(b);
const uint32_t arr_idx = 1 << DRF_LO(NV9097_CLEAR_SURFACE_RT_ARRAY_INDEX);
mme_loop(b, layer_count) {
mme_mthd(b, NV9097_CLEAR_SURFACE);
mme_emit(b, payload);
mme_add_to(b, payload, payload, mme_imm(arr_idx));
}
mme_free_reg(b, payload);
mme_free_reg(b, view_mask);
}
static void
@ -69,36 +73,21 @@ emit_clear_rects(struct nvk_cmd_buffer *cmd,
.ymax = rects[r].rect.offset.y + rects[r].rect.extent.height,
});
if (render->view_mask) {
uint32_t payload;
V_NV9097_CLEAR_SURFACE(payload, {
.z_enable = clear_depth,
.stencil_enable = clear_stencil,
.r_enable = color_att >= 0,
.g_enable = color_att >= 0,
.b_enable = color_att >= 0,
.a_enable = color_att >= 0,
.mrt_select = color_att >= 0 ? color_att : 0,
.rt_array_index = rects[r].baseArrayLayer,
});
uint32_t payload;
V_NV9097_CLEAR_SURFACE(payload, {
.z_enable = clear_depth,
.stencil_enable = clear_stencil,
.r_enable = color_att >= 0,
.g_enable = color_att >= 0,
.b_enable = color_att >= 0,
.a_enable = color_att >= 0,
.mrt_select = color_att >= 0 ? color_att : 0,
.rt_array_index = rects[r].baseArrayLayer,
});
P_1INC(p, NV9097, CALL_MME_MACRO(NVK_MME_CLEAR_VIEWS));
P_INLINE_DATA(p, payload);
} else {
uint32_t payload;
V_NV9097_CLEAR_SURFACE(payload, {
.z_enable = clear_depth,
.stencil_enable = clear_stencil,
.r_enable = color_att >= 0,
.g_enable = color_att >= 0,
.b_enable = color_att >= 0,
.a_enable = color_att >= 0,
.mrt_select = color_att >= 0 ? color_att : 0,
.rt_array_index = rects[r].baseArrayLayer,
});
P_1INC(p, NV9097, CALL_MME_MACRO(NVK_MME_CLEAR_LAYERS));
P_INLINE_DATA(p, payload);
P_1INC(p, NV9097, CALL_MME_MACRO(NVK_MME_CLEAR));
P_INLINE_DATA(p, payload);
if (render->view_mask == 0) {
P_INLINE_DATA(p, rects[r].layerCount);
}
}

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

@ -3,8 +3,7 @@
#include "nvk_private.h"
static const nvk_mme_builder_func mme_builders[NVK_MME_COUNT] = {
[NVK_MME_CLEAR_VIEWS] = nvk_mme_clear_views,
[NVK_MME_CLEAR_LAYERS] = nvk_mme_clear_layers,
[NVK_MME_CLEAR] = nvk_mme_clear,
[NVK_MME_DRAW] = nvk_mme_draw,
[NVK_MME_DRAW_INDEXED] = nvk_mme_draw_indexed,
[NVK_MME_DRAW_INDIRECT] = nvk_mme_draw_indirect,

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

@ -6,8 +6,7 @@
struct nv_device_info;
enum nvk_mme {
NVK_MME_CLEAR_VIEWS,
NVK_MME_CLEAR_LAYERS,
NVK_MME_CLEAR,
NVK_MME_DRAW,
NVK_MME_DRAW_INDEXED,
NVK_MME_DRAW_INDIRECT,
@ -105,8 +104,7 @@ uint32_t *nvk_build_mme(const struct nv_device_info *devinfo,
void nvk_test_build_all_mmes(const struct nv_device_info *devinfo);
void nvk_mme_clear_views(struct mme_builder *b);
void nvk_mme_clear_layers(struct mme_builder *b);
void nvk_mme_clear(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);