OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

panvk: disable position fifo optimization when multiview enabled

Browse Source 
Without multiview, a shader that doesn't write to the any of the
extended FIFO attributes (pointsize and layer) can be used with either
FIFO format. This allows us to switch to the basic FIFO format when
using the no_psiz variant. In multiview vertex shaders, output offsets
depend on the FIFO format. Instead of trying to patch these in the
no_psiz variant, just don't do the optimization for now.

Signed-off-by: Benjamin Lee <benjamin.lee@collabora.com>
Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31704>
This commit is contained in:
Benjamin Lee
2024-10-16 22:49:24 -07:00
committed by Marge Bot
parent f2b7217197
commit cc22061878
1 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/panfrost/vulkan/csf/panvk_vX_cmd_draw.c
View File

@@ -1554,9 +1554,21 @@ set_tiler_idvs_flags(struct cs_builder *b, struct panvk_cmd_buffer *cmdbuf,
const struct vk_input_assembly_state *ia = &dyns->ia;
const struct vk_rasterization_state *rs = &dyns->rs;
struct mali_primitive_flags_packed tiler_idvs_flags;
/* When drawing non-point primitives, we use the no_psiz variant which has
* point size writes patched out */
bool writes_point_size =
vs->info.vs.writes_point_size &&
ia->primitive_topology == VK_PRIMITIVE_TOPOLOGY_POINT_LIST;
bool multiview = cmdbuf->state.gfx.render.view_mask;
bool writes_layer = vs->info.outputs_written & VARYING_BIT_LAYER;
/* Multiview shaders depend on the FIFO format for indexing per-view
* output writes. We don't currently patch these offsets in the no_psiz
* variant, so we still need the extended format even though the shader
* does not write point size. */
bool extended_fifo = writes_point_size || writes_layer ||
(vs->info.vs.writes_point_size && multiview);
bool dirty = gfx_state_dirty(cmdbuf, VS) || fs_user_dirty(cmdbuf) ||
dyn_gfx_state_dirty(cmdbuf, IA_PRIMITIVE_RESTART_ENABLE) ||
@@ -1568,18 +1580,14 @@ set_tiler_idvs_flags(struct cs_builder *b, struct panvk_cmd_buffer *cmdbuf,
pan_pack(&tiler_idvs_flags, PRIMITIVE_FLAGS, cfg) {
cfg.draw_mode = translate_prim_topology(ia->primitive_topology);
if (writes_point_size) {
cfg.point_size_array_format = MALI_POINT_SIZE_ARRAY_FORMAT_FP16;
cfg.position_fifo_format = MALI_FIFO_FORMAT_EXTENDED;
} else {
cfg.point_size_array_format = MALI_POINT_SIZE_ARRAY_FORMAT_NONE;
cfg.position_fifo_format = MALI_FIFO_FORMAT_BASIC;
}
cfg.point_size_array_format = writes_point_size
? MALI_POINT_SIZE_ARRAY_FORMAT_FP16
: MALI_POINT_SIZE_ARRAY_FORMAT_NONE;
cfg.layer_index_enable = writes_layer;
if (vs->info.outputs_written & VARYING_BIT_LAYER) {
cfg.layer_index_enable = true;
cfg.position_fifo_format = MALI_FIFO_FORMAT_EXTENDED;
}
cfg.position_fifo_format = extended_fifo
? MALI_FIFO_FORMAT_EXTENDED
: MALI_FIFO_FORMAT_BASIC;
cfg.low_depth_cull = cfg.high_depth_cull =
vk_rasterization_state_depth_clip_enable(rs);