From 9d0523b569bb7208c6e74cafc0f3945415d94336 Mon Sep 17 00:00:00 2001 From: Erik Faye-Lund Date: Mon, 7 Oct 2019 12:18:09 +0200 Subject: [PATCH] v3d: do not report alpha-test as supported MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This triggers lowering in the state-tracker, which makes things a bit simpler. Reviewed-by: Marek Olšák --- src/broadcom/compiler/nir_to_vir.c | 5 ----- src/broadcom/compiler/vir.c | 6 ------ src/gallium/drivers/v3d/v3d_screen.c | 3 +++ 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/src/broadcom/compiler/nir_to_vir.c b/src/broadcom/compiler/nir_to_vir.c index a982778f8b1..1ca7c2fc646 100644 --- a/src/broadcom/compiler/nir_to_vir.c +++ b/src/broadcom/compiler/nir_to_vir.c @@ -2027,11 +2027,6 @@ ntq_emit_intrinsic(struct v3d_compile *c, nir_intrinsic_instr *instr) vir_uniform(c, QUNIFORM_VIEWPORT_Z_OFFSET, 0)); break; - case nir_intrinsic_load_alpha_ref_float: - ntq_store_dest(c, &instr->dest, 0, - vir_uniform(c, QUNIFORM_ALPHA_REF, 0)); - break; - case nir_intrinsic_load_sample_mask_in: ntq_store_dest(c, &instr->dest, 0, vir_MSF(c)); break; diff --git a/src/broadcom/compiler/vir.c b/src/broadcom/compiler/vir.c index 8cbcc001d18..b86ffc82ea3 100644 --- a/src/broadcom/compiler/vir.c +++ b/src/broadcom/compiler/vir.c @@ -843,12 +843,6 @@ v3d_nir_lower_fs_late(struct v3d_compile *c) if (c->fs_key->clamp_color) NIR_PASS_V(c->s, nir_lower_clamp_color_outputs); - if (c->fs_key->alpha_test) { - NIR_PASS_V(c->s, nir_lower_alpha_test, - c->fs_key->alpha_test_func, - false, NULL); - } - if (c->key->ucp_enables) NIR_PASS_V(c->s, nir_lower_clip_fs, c->key->ucp_enables, false); diff --git a/src/gallium/drivers/v3d/v3d_screen.c b/src/gallium/drivers/v3d/v3d_screen.c index 563a0108e97..9e30268e858 100644 --- a/src/gallium/drivers/v3d/v3d_screen.c +++ b/src/gallium/drivers/v3d/v3d_screen.c @@ -245,6 +245,9 @@ v3d_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); } -- 2.30.2