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

v3d/tex: Configuration Parameter 1 can be only skipped if P2 can be skipped too

Browse Source 
Configuration Parameter packets 1 and 2 are pointed as optional, but
it is not clearly stated if you can skip only P1 when P2 is needed.

In the practice, it seems that the situation P0 - non-P1 - P2 can
causes problems, and at least on the simulator, it seems that sampler
info are attempted to be accessed. So let's just be conservative, and
only skip P1 configuration if we can skip P2 configuration too.

Reviewed-by: Eric Anholt <eric@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4677>
This commit is contained in:
Alejandro Piñeiro
2020-04-21 01:09:00 +02:00
parent d0b644d9f9
commit 9967c26ae6
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/broadcom/compiler/v3d40_tex.c
View File

@@ -216,7 +216,14 @@ v3d40_vir_emit_tex(struct v3d_compile *c, nir_tex_instr *instr)
bool output_type_32_bit = (c->key->tex[unit].return_size == 32 &&
!instr->is_shadow);
if (output_type_32_bit || texture_instr_need_sampler(instr)) {
/*
* p1 is optional, but we can skip it only if p2 can be skipped too
*/
bool needs_p2_config =
memcmp(&p2_unpacked, &p2_unpacked_default, sizeof(p2_unpacked)) != 0;
if (needs_p2_config || output_type_32_bit ||
texture_instr_need_sampler(instr)) {
struct V3D41_TMU_CONFIG_PARAMETER_1 p1_unpacked = {
.output_type_32_bit = output_type_32_bit,
@@ -248,7 +255,7 @@ v3d40_vir_emit_tex(struct v3d_compile *c, nir_tex_instr *instr)
vir_WRTMUC(c, QUNIFORM_TMU_CONFIG_P1, p1_packed);
}
if (memcmp(&p2_unpacked, &p2_unpacked_default, sizeof(p2_unpacked)) != 0)
if (needs_p2_config)
vir_WRTMUC(c, QUNIFORM_CONSTANT, p2_packed);
if (instr->op == nir_texop_txf) {