diff options
| author | Erik Faye-Lund <[email protected]> | 2019-10-07 12:08:55 +0200 |
|---|---|---|
| committer | Erik Faye-Lund <[email protected]> | 2019-10-17 10:41:36 +0200 |
| commit | 5af272b47469398762e984e27f65fc4ecc293d28 (patch) | |
| tree | e7a65e26ba18bc5fb12ed4915a9e958186edda87 /src/compiler | |
| parent | 9d0523b569bb7208c6e74cafc0f3945415d94336 (diff) | |
nir: drop support for using load_alpha_ref_float
Reviewed-by: Marek Olšák <[email protected]>
Diffstat (limited to 'src/compiler')
| -rw-r--r-- | src/compiler/nir/nir_lower_alpha_test.c | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/src/compiler/nir/nir_lower_alpha_test.c b/src/compiler/nir/nir_lower_alpha_test.c index b652fb796be..a13de554445 100644 --- a/src/compiler/nir/nir_lower_alpha_test.c +++ b/src/compiler/nir/nir_lower_alpha_test.c @@ -40,6 +40,7 @@ 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) { @@ -94,20 +95,16 @@ nir_lower_alpha_test(nir_shader *shader, enum compare_func func, 3); } - 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_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 *condition = nir_compare_func(&b, func, alpha, alpha_ref); |