fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 22:18:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

vc4: Remove vestiges of alpha test lowering.

Browse source 
We stopped reporting the alpha test screen cap, and stopped using the
value in the key, so now shrink the key.  This gets another switch case
out of the hot uniforms upload path.

Fixes: 1404b8b1e5 ("vc4: do not report alpha-test as supported")
Reviewed-by: Iago Toral Quiroga <itoral@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8601>
(cherry picked from commit cc0841c82a)
This commit is contained in:
Eric Anholt 2021-01-20 12:07:54 -08:00 • committed by Dylan Baker
parent a7abc65a58
commit 6723819cc2
4 changed files with 1 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -526,7 +526,7 @@
"description": "vc4: Remove vestiges of alpha test lowering.",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"master_sha": null,
"because_sha": "1404b8b1e5b6c517851d3296feb659c1fa4cfdef"
},

4
src/gallium/drivers/vc4/vc4_program.c
View file

@ -2742,10 +2742,6 @@ vc4_update_compiled_fs(struct vc4_context *vc4, uint8_t prim_mode)
key->stencil_full_writemasks = vc4->zsa->stencil_uniforms[2] != 0;
key->depth_enabled = (vc4->zsa->base.depth_enabled ||
key->stencil_enabled);
if (vc4->zsa->base.alpha_enabled)
key->alpha_test_func = vc4->zsa->base.alpha_func;
else
key->alpha_test_func = COMPARE_FUNC_ALWAYS;
if (key->is_points) {
key->point_sprite_mask =

2
src/gallium/drivers/vc4/vc4_qir.h
View file

@ -286,7 +286,6 @@ enum quniform_contents {
QUNIFORM_STENCIL,
QUNIFORM_ALPHA_REF,
QUNIFORM_SAMPLE_MASK,
/* Placeholder uniform that will be updated by the kernel when used by
@ -336,7 +335,6 @@ struct vc4_fs_key {
bool sample_coverage;
bool sample_alpha_to_coverage;
bool sample_alpha_to_one;
uint8_t alpha_test_func;
uint8_t logicop_func;
uint32_t point_sprite_mask;
uint32_t ubo_1_size;

6
src/gallium/drivers/vc4/vc4_uniforms.c
View file

@ -340,11 +340,6 @@ vc4_write_uniforms(struct vc4_context *vc4, struct vc4_compiled_shader *shader,
0));
break;
case QUNIFORM_ALPHA_REF:
cl_aligned_f(&uniforms,
vc4->zsa->base.alpha_ref_value);
break;
case QUNIFORM_SAMPLE_MASK:
cl_aligned_u32(&uniforms, vc4->sample_mask);
break;
@ -422,7 +417,6 @@ vc4_set_shader_uniform_dirty_flags(struct vc4_compiled_shader *shader)
break;
case QUNIFORM_STENCIL:
case QUNIFORM_ALPHA_REF:
dirty |= VC4_DIRTY_ZSA;
break;