fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 00:38:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

virgl: drop the separable flag for cases that can't be handled

Browse source 
The host can't assign more than 32 locations explicitly, and we
exhaust this already when we handle patches and generics. So
drop the separable flag in cases when we have other IO that
uses generated names that will have to be matched by name.

v2: skip tests for VS input and FS outputs

Signed-off-by: Gert Wollny <gert.wollny@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20738>
(cherry picked from commit 8084b412ca)
This commit is contained in:
Gert Wollny 2023-01-17 12:27:57 +01:00 • committed by Eric Engestrom
parent 56be7ba217
commit e020f913bb
2 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -4216,7 +4216,7 @@
"description": "virgl: drop the separable flag for cases that can't be handled",
"nominated": false,
"nomination_type": null,
"resolution": 4,
"resolution": 1,
"main_sha": null,
"because_sha": null
},

18
src/gallium/drivers/virgl/virgl_context.c
View file

@ -728,9 +728,25 @@ static void *virgl_shader_encoder(struct pipe_context *ctx,
nir_shader *s = nir_shader_clone(NULL, shader->ir.nir);
/* The host can't handle certain IO slots as separable, because we can't assign
* more than 32 IO locations explicitly, and with varyings and patches we already
* exhaust the possible ways of handling this for the varyings with generic names,
* so drop the flag in these cases */
const uint64_t drop_slots_for_separable_io = 0xffull << VARYING_SLOT_TEX0 |
1 << VARYING_SLOT_FOGC |
1 << VARYING_SLOT_BFC0 |
1 << VARYING_SLOT_BFC1 |
1 << VARYING_SLOT_COL0 |
1 << VARYING_SLOT_COL1;
bool keep_separable_flags = true;
if (s->info.stage != MESA_SHADER_VERTEX)
keep_separable_flags &= !(s->info.inputs_read & drop_slots_for_separable_io);
if (s->info.stage != MESA_SHADER_FRAGMENT)
keep_separable_flags &= !(s->info.outputs_written & drop_slots_for_separable_io);
/* Propagare the separable shader property to the host, unless
* it is an internal shader - these are marked separable even though they are not. */
is_separable = s->info.separate_shader && !s->info.internal;
is_separable = s->info.separate_shader && !s->info.internal && keep_separable_flags;
ntt_tokens = tokens = nir_to_tgsi_options(s, vctx->base.screen, &options); /* takes ownership */
} else {
tokens = shader->tokens;