fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-04 07:00:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

nak/nir: Several FS output fixes

Browse source 
1. Lower arrays to elements
 2. Multiply locations by 4 to get GPR numbers
 3. Fix dual-src blend
 4. Sample mask and depth both consume slots if either is used

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24998>
This commit is contained in:
Faith Ekstrand 2023-09-11 21:05:39 -05:00 • committed by Marge Bot
parent ea750f1ffd
commit 595f03957c
1 changed files with 26 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/nouveau/compiler/nak_nir.c
View file

@ -316,13 +316,6 @@ nak_nir_lower_varyings(nir_shader *nir, nir_variable_mode modes)
return progress;
}
static int
vec_size_4(const struct glsl_type *type, bool bindless)
{
assert(glsl_type_is_vector_or_scalar(type));
return 4;
}
static bool
nak_nir_lower_fs_inputs(nir_shader *nir)
{
@ -372,9 +365,30 @@ nak_nir_lower_fs_inputs(nir_shader *nir)
return true;
}
static int
fs_out_size(const struct glsl_type *type, bool bindless)
{
assert(glsl_type_is_vector_or_scalar(type));
return 4;
}
static bool
nak_nir_lower_fs_outputs(nir_shader *nir)
{
if (nir->info.outputs_written == 0)
return false;
NIR_PASS_V(nir, nir_lower_io_arrays_to_elements_no_indirects, true);
nir_foreach_shader_out_variable(var, nir) {
if (var->data.index > 0) {
assert(var->data.location == FRAG_RESULT_DATA0);
assert(!(nir->info.outputs_written & BITFIELD_BIT(FRAG_RESULT_DATA1)));
var->data.location = FRAG_RESULT_DATA1;
nir->info.outputs_written |= BITFIELD_BIT(FRAG_RESULT_DATA1);
}
}
const uint32_t color_targets =
(nir->info.outputs_written & BITFIELD_BIT(FRAG_RESULT_COLOR)) ?
1 : (nir->info.outputs_written >> FRAG_RESULT_DATA0);
@ -384,35 +398,33 @@ nak_nir_lower_fs_outputs(nir_shader *nir)
nir->info.outputs_written & BITFIELD_BIT(FRAG_RESULT_SAMPLE_MASK);
nir->num_outputs = util_bitcount(color_targets) * 4 +
writes_depth + writes_sample_mask;
(writes_depth || writes_sample_mask) * 2;
nir_foreach_shader_out_variable(var, nir) {
assert(nir->info.outputs_written & BITFIELD_BIT(var->data.location));
switch (var->data.location) {
case FRAG_RESULT_DEPTH:
var->data.driver_location = util_bitcount(color_targets) * 4;
var->data.driver_location = util_bitcount(color_targets) * 4 + 1;
break;
case FRAG_RESULT_COLOR:
var->data.driver_location = 0;
break;
case FRAG_RESULT_SAMPLE_MASK:
var->data.driver_location = util_bitcount(color_targets) * 4;
var->data.driver_location += writes_depth;
break;
default: {
assert(var->data.location >= FRAG_RESULT_DATA0);
const unsigned out = var->data.location - FRAG_RESULT_DATA0;
var->data.driver_location =
util_bitcount(color_targets & BITFIELD_MASK(out));
util_bitcount(color_targets & BITFIELD_MASK(out)) * 4;
break;
}
}
}
bool progress = nir->info.outputs_written != 0;
progress |= OPT(nir, nir_lower_io, nir_var_shader_out, vec_size_4, 0);
NIR_PASS_V(nir, nir_lower_io, nir_var_shader_out, fs_out_size, 0);
return progress;
return true;
}
static bool