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

v3d/tex: avoid to ask back for a sampler state if not needed

Browse Source 
So far we were not asking the driver for the sampler state if we could
just use the default P1 values. But even if we need to fill P1 (for
example to fill up the output type of the format), if the texture
operation doesn't need a sampler, we can let that field as NULL (so
default values) and avoid calling back the driver for a sampler.

This is not mandatory for OpenGL (as we always have a sampler object),
although still a good to have. For Vulkan this is needed, as we don't
have a sampler object in that case.

v2: reword comment (Eric)

Reviewed-by: Eric Anholt <eric@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6766>
This commit is contained in:
Alejandro Piñeiro
2020-06-23 01:52:48 +02:00
committed by Marge Bot
parent 0dbf040863
commit b9dd7e30a6
1 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -220,8 +220,11 @@ v3d40_vir_emit_tex(struct v3d_compile *c, nir_tex_instr *instr)
(instr->op == nir_texop_lod ||
memcmp(&p2_unpacked, &p2_unpacked_default, sizeof(p2_unpacked)) != 0);
if (output_type_32_bit ||
nir_tex_instr_need_sampler(instr)) {
/* To handle the cases were we can't just use p1_unpacked_default */
bool non_default_p1_config = nir_tex_instr_need_sampler(instr) ||
output_type_32_bit;
if (non_default_p1_config) {
struct V3D41_TMU_CONFIG_PARAMETER_1 p1_unpacked = {
.output_type_32_bit = output_type_32_bit,
@@ -243,14 +246,21 @@ v3d40_vir_emit_tex(struct v3d_compile *c, nir_tex_instr *instr)
(uint8_t *)&p1_packed,
&p1_unpacked);
/* Load unit number into the high bits of the sampler
* address field, which will be be used by the driver
* to decide which sampler to put in the actual
* address field.
*/
p1_packed |= unit << 24;
if (nir_tex_instr_need_sampler(instr)) {
/* Load unit number into the high bits of the sampler
* address field, which will be be used by the driver
* to decide which sampler to put in the actual
* address field.
*/
p1_packed |= unit << 24;
vir_WRTMUC(c, QUNIFORM_TMU_CONFIG_P1, p1_packed);
vir_WRTMUC(c, QUNIFORM_TMU_CONFIG_P1, p1_packed);
} else {
/* In this case, we don't need to merge in any
* sampler state from the API and can just use
* our packed bits */
vir_WRTMUC(c, QUNIFORM_CONSTANT, p1_packed);
}
} else if (needs_p2_config) {
/* Configuration parameters need to be set up in
* order, and if P2 is needed, you need to set up P1