Mesa (master): Revert "vc4: do not report alpha-test as supported"
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Wed Oct 23 11:39:18 UTC 2019
Module: Mesa
Branch: master
Commit: 8ae024d029ee23ae59a41cb066e2ad2fb2476f1f
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8ae024d029ee23ae59a41cb066e2ad2fb2476f1f
Author: Erik Faye-Lund <erik.faye-lund at collabora.com>
Date: Wed Oct 23 13:02:55 2019 +0200
Revert "vc4: do not report alpha-test as supported"
This reverts commit a79b93269cf340ce4d23b5b34100039bcaafc841.
Reviewed-by: Jose Maria Casanova <jmcasanova at igalia.com>
---
src/gallium/drivers/vc4/vc4_program.c | 15 ++++++++++++++-
src/gallium/drivers/vc4/vc4_screen.c | 3 ---
2 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/src/gallium/drivers/vc4/vc4_program.c b/src/gallium/drivers/vc4/vc4_program.c
index 8ec181bc8fa..6ea1667ca28 100644
--- a/src/gallium/drivers/vc4/vc4_program.c
+++ b/src/gallium/drivers/vc4/vc4_program.c
@@ -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
diff --git a/src/gallium/drivers/vc4/vc4_screen.c b/src/gallium/drivers/vc4/vc4_screen.c
index d762512a4e7..be20dc90406 100644
--- a/src/gallium/drivers/vc4/vc4_screen.c
+++ b/src/gallium/drivers/vc4/vc4_screen.c
@@ -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);
}
More information about the mesa-commit
mailing list