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

vc4: do not report alpha-test as supported

Browse Source 
This triggers lowering in the state-tracker, which makes things a bit
simpler.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7251>
This commit is contained in:
Erik Faye-Lund
2019-10-07 12:07:47 +02:00
committed by Marge Bot
parent 8ad931808e
commit 1404b8b1e5
2 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/gallium/drivers/vc4/vc4_program.c
View File

@@ -1803,11 +1803,6 @@ ntq_emit_intrinsic(struct vc4_compile *c, nir_intrinsic_instr *instr)
0)); 0));
break; break;
case nir_intrinsic_load_alpha_ref_float:
ntq_store_dest(c, &instr->dest, 0,
qir_uniform(c, QUNIFORM_ALPHA_REF, 0));
break;
case nir_intrinsic_load_sample_mask_in: case nir_intrinsic_load_sample_mask_in:
ntq_store_dest(c, &instr->dest, 0, ntq_store_dest(c, &instr->dest, 0,
qir_uniform(c, QUNIFORM_SAMPLE_MASK, 0)); qir_uniform(c, QUNIFORM_SAMPLE_MASK, 0));
@@ -2256,13 +2251,6 @@ vc4_shader_ntq(struct vc4_context *vc4, enum qstage stage,
c->s = nir_shader_clone(c, key->shader_state->base.ir.nir); c->s = nir_shader_clone(c, key->shader_state->base.ir.nir);
if (stage == QSTAGE_FRAG) { if (stage == QSTAGE_FRAG) {
if (c->fs_key->alpha_test_func != COMPARE_FUNC_ALWAYS) {
NIR_PASS_V(c->s, nir_lower_alpha_test,
c->fs_key->alpha_test_func,
c->fs_key->sample_alpha_to_one &&
c->fs_key->msaa,
NULL);
}
NIR_PASS_V(c->s, vc4_nir_lower_blend, c); NIR_PASS_V(c->s, vc4_nir_lower_blend, c);
} }

3
src/gallium/drivers/vc4/vc4_screen.c
View File

@@ -199,6 +199,9 @@ vc4_screen_get_param(struct pipe_screen *pscreen, enum pipe_cap param)
case PIPE_CAP_UMA: case PIPE_CAP_UMA:
return 1; return 1;
case PIPE_CAP_ALPHA_TEST:
return 0;
default: default:
return u_pipe_screen_get_param_defaults(pscreen, param); return u_pipe_screen_get_param_defaults(pscreen, param);
} }