Revert "nir: drop support for using load_alpha_ref_float"

This reverts commit 5af272b474.

Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Jose Maria Casanova <jmcasanova@igalia.com>
This commit is contained in:
Erik Faye-Lund
2019-10-21 10:48:09 +02:00
parent beb6639a9d
commit acf1bf47cc

View File

@@ -40,7 +40,6 @@ nir_lower_alpha_test(nir_shader *shader, enum compare_func func,
bool alpha_to_one,
const gl_state_index16 *alpha_ref_state_tokens)
{
assert(alpha_ref_state_tokens);
assert(shader->info.stage == MESA_SHADER_FRAGMENT);
nir_foreach_function(function, shader) {
@@ -95,16 +94,20 @@ nir_lower_alpha_test(nir_shader *shader, enum compare_func func,
3);
}
nir_variable *var = nir_variable_create(shader,
nir_var_uniform,
glsl_float_type(),
"gl_AlphaRefMESA");
var->num_state_slots = 1;
var->state_slots = ralloc_array(var, nir_state_slot, 1);
memcpy(var->state_slots[0].tokens,
alpha_ref_state_tokens,
sizeof(var->state_slots[0].tokens));
nir_ssa_def *alpha_ref = nir_load_var(&b, var);
nir_ssa_def *alpha_ref;
if (alpha_ref_state_tokens) {
nir_variable *var = nir_variable_create(shader,
nir_var_uniform,
glsl_float_type(),
"gl_AlphaRefMESA");
var->num_state_slots = 1;
var->state_slots = ralloc_array(var, nir_state_slot, 1);
memcpy(var->state_slots[0].tokens,
alpha_ref_state_tokens,
sizeof(var->state_slots[0].tokens));
alpha_ref = nir_load_var(&b, var);
} else
alpha_ref = nir_load_alpha_ref_float(&b);
nir_ssa_def *condition =
nir_compare_func(&b, func, alpha, alpha_ref);