fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 16:08:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

nir_to_tgsi: Sort FS output declarations to avoid virglrenderer bugs.

Browse source 
The TGSI debug output is a lot more readable if it's in location order,
anyway.

Acked-by: Gert Wollny <gert.wollny@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12800>
This commit is contained in:
Emma Anholt 2021-08-04 16:58:52 -07:00 • committed by Marge Bot
parent 7dde279db5
commit a292268cd5
1 changed files with 31 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/gallium/auxiliary/nir/nir_to_tgsi.c
View file

@ -194,9 +194,6 @@ ntt_output_decl(struct ntt_compile *c, nir_intrinsic_instr *instr, uint32_t *fra
struct ureg_dst out;
if (c->s->info.stage == MESA_SHADER_FRAGMENT) {
if (semantics.location == FRAG_RESULT_COLOR)
ureg_property(c->ureg, TGSI_PROPERTY_FS_COLOR0_WRITES_ALL_CBUFS, 1);
unsigned semantic_name, semantic_index;
tgsi_get_gl_frag_result_semantic(semantics.location,
&semantic_name, &semantic_index);
@ -387,6 +384,36 @@ ntt_setup_inputs(struct ntt_compile *c)
}
}
static int
ntt_sort_by_location(const nir_variable *a, const nir_variable *b)
{
return a->data.location - b->data.location;
}
/**
* Workaround for virglrenderer requiring that TGSI FS output color variables
* are declared in order. Besides, it's a lot nicer to read the TGSI this way.
*/
static void
ntt_setup_outputs(struct ntt_compile *c)
{
if (c->s->info.stage != MESA_SHADER_FRAGMENT)
return;
nir_sort_variables_with_modes(c->s, ntt_sort_by_location, nir_var_shader_out);
nir_foreach_shader_out_variable(var, c->s) {
if (var->data.location == FRAG_RESULT_COLOR)
ureg_property(c->ureg, TGSI_PROPERTY_FS_COLOR0_WRITES_ALL_CBUFS, 1);
unsigned semantic_name, semantic_index;
tgsi_get_gl_frag_result_semantic(var->data.location,
&semantic_name, &semantic_index);
(void)ureg_DECL_output(c->ureg, semantic_name, semantic_index);
}
}
static enum tgsi_texture_type
tgsi_texture_type_from_sampler_dim(enum glsl_sampler_dim dim, bool is_array, bool is_shadow)
{
@ -3100,6 +3127,7 @@ nir_to_tgsi(struct nir_shader *s,
ureg_setup_shader_info(c->ureg, &s->info);
ntt_setup_inputs(c);
ntt_setup_outputs(c);
ntt_setup_uniforms(c);
if (s->info.stage == MESA_SHADER_FRAGMENT) {