fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-27 10:30:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

st/mesa: switch ATI_fs to IO intrinsics

Browse source 
Reviewed-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32779>
This commit is contained in:
Marek Olšák 2024-12-24 12:06:14 -05:00 • committed by Marge Bot
parent 40848ba97e
commit 7e39045733
1 changed files with 11 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/mesa/state_tracker/st_atifs_to_nir.c
View file

@ -41,12 +41,9 @@ struct st_translate {
nir_def *temps[MAX_PROGRAM_TEMPS];
nir_variable *fragcolor;
nir_variable *constants;
nir_variable *samplers[MAX_TEXTURE_UNITS];
nir_def *inputs[VARYING_SLOT_MAX];
unsigned current_pass;
bool regs_written[MAX_NUM_PASSES_ATI][MAX_NUM_FRAGMENT_REGISTERS_ATI];
@ -113,15 +110,15 @@ apply_swizzle(struct st_translate *t,
static nir_def *
load_input(struct st_translate *t, gl_varying_slot slot)
{
if (!t->inputs[slot]) {
nir_variable *var = nir_create_variable_with_location(t->b->shader, nir_var_shader_in, slot,
glsl_vec4_type());
var->data.interpolation = INTERP_MODE_NONE;
nir_def *baryc = nir_load_barycentric_pixel(t->b, 32);
t->inputs[slot] = nir_load_var(t->b, var);
if (slot != VARYING_SLOT_COL0 && slot != VARYING_SLOT_COL1) {
nir_intrinsic_set_interp_mode(nir_instr_as_intrinsic(baryc->parent_instr),
INTERP_MODE_SMOOTH);
}
return t->inputs[slot];
return nir_load_interpolated_input(t->b, 4, 32, baryc, nir_imm_int(t->b, 0),
.io_semantics.location = slot);
}
static nir_def *
@ -447,9 +444,7 @@ st_translate_atifs_program(struct ati_fragment_shader *atifs,
nir_shader *s = t->b->shader;
s->info.name = ralloc_asprintf(s, "ATIFS%d", program->Id);
s->info.internal = false;
t->fragcolor = nir_create_variable_with_location(b.shader, nir_var_shader_out,
FRAG_RESULT_COLOR, glsl_vec4_type());
s->info.io_lowered = true;
st_atifs_setup_uniforms(t, program);
@ -466,8 +461,10 @@ st_translate_atifs_program(struct ati_fragment_shader *atifs,
}
}
if (t->regs_written[atifs->NumPasses-1][0])
nir_store_var(t->b, t->fragcolor, t->temps[0], 0xf);
if (t->regs_written[atifs->NumPasses-1][0]) {
nir_store_output(t->b, t->temps[0], nir_imm_int(t->b, 0),
.io_semantics.location = FRAG_RESULT_COLOR);
}
return b.shader;
}