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

Revert "vc4: do not report alpha-test as supported"

Browse Source 
This reverts commit a79b93269c.

Reviewed-by: Jose Maria Casanova <jmcasanova@igalia.com>
This commit is contained in:
Erik Faye-Lund
2019-10-23 13:02:55 +02:00
parent 65328bd32d
commit 8ae024d029
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1806,6 +1806,11 @@ ntq_emit_intrinsic(struct vc4_compile *c, nir_intrinsic_instr *instr)
0));
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:
ntq_store_dest(c, &instr->dest, 0,
qir_uniform(c, QUNIFORM_SAMPLE_MASK, 0));
@@ -2248,8 +2253,16 @@ vc4_shader_ntq(struct vc4_context *vc4, enum qstage stage,
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);
}
struct nir_lower_tex_options tex_options = {
/* We would need to implement txs, but we don't want the

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

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