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

radeonsi: kill 16-bit VS outputs if PS doesn't use them or doing Z-only draw

Browse source 
The kill_outputs logic uses our internal IO indices. Just add indices for
16-bit varyings. We don't have enough free indices to use, but we can reuse
the indices that GLES doesn't have. Those are all the legacy desktop GL
varyings.

Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9051>
This commit is contained in:
Marek Olšák 2021-03-29 07:54:11 -04:00
parent 5efdf4afac
commit c53f25b668
4 changed files with 34 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
src/gallium/drivers/radeonsi/si_shader.c
View file

@ -88,34 +88,41 @@ unsigned si_shader_io_get_unique_index(unsigned semantic, bool is_varying)
case VARYING_SLOT_POS:
return 0;
default:
/* Since some shader stages use the the highest used IO index
/* Since some shader stages use the highest used IO index
* to determine the size to allocate for inputs/outputs
* (in LDS, tess and GS rings). GENERIC should be placed right
* after POSITION to make that size as small as possible.
*/
if (semantic >= VARYING_SLOT_VAR0 &&
semantic < VARYING_SLOT_VAR0 + SI_MAX_IO_GENERIC)
return 1 + (semantic - VARYING_SLOT_VAR0);
if (semantic >= VARYING_SLOT_VAR0 && semantic <= VARYING_SLOT_VAR31)
return 1 + (semantic - VARYING_SLOT_VAR0); /* 1..32 */
/* Put 16-bit GLES varyings after 32-bit varyings. They can use the same indices as
* legacy desktop GL varyings because they are mutually exclusive.
*/
if (semantic >= VARYING_SLOT_VAR0_16BIT && semantic <= VARYING_SLOT_VAR15_16BIT)
return 33 + (semantic - VARYING_SLOT_VAR0_16BIT); /* 33..48 */
assert(!"invalid generic index");
return 0;
/* Legacy desktop GL varyings. */
case VARYING_SLOT_FOGC:
return SI_MAX_IO_GENERIC + 1;
return 33;
case VARYING_SLOT_COL0:
return SI_MAX_IO_GENERIC + 2;
return 34;
case VARYING_SLOT_COL1:
return SI_MAX_IO_GENERIC + 3;
return 35;
case VARYING_SLOT_BFC0:
/* If it's a varying, COLOR and BCOLOR alias. */
if (is_varying)
return SI_MAX_IO_GENERIC + 2;
return 34;
else
return SI_MAX_IO_GENERIC + 4;
return 36;
case VARYING_SLOT_BFC1:
if (is_varying)
return SI_MAX_IO_GENERIC + 3;
return 35;
else
return SI_MAX_IO_GENERIC + 5;
return 37;
case VARYING_SLOT_TEX0:
case VARYING_SLOT_TEX1:
case VARYING_SLOT_TEX2:
@ -124,26 +131,25 @@ unsigned si_shader_io_get_unique_index(unsigned semantic, bool is_varying)
case VARYING_SLOT_TEX5:
case VARYING_SLOT_TEX6:
case VARYING_SLOT_TEX7:
return SI_MAX_IO_GENERIC + 6 + (semantic - VARYING_SLOT_TEX0);
/* These are rarely used between LS and HS or ES and GS. */
case VARYING_SLOT_CLIP_DIST0:
return SI_MAX_IO_GENERIC + 6 + 8;
case VARYING_SLOT_CLIP_DIST1:
return SI_MAX_IO_GENERIC + 6 + 8 + 1;
return 38 + (semantic - VARYING_SLOT_TEX0);
case VARYING_SLOT_CLIP_VERTEX:
return SI_MAX_IO_GENERIC + 6 + 8 + 2;
return 46;
/* Varyings present in both GLES and desktop GL must start at 49 after 16-bit varyings. */
case VARYING_SLOT_CLIP_DIST0:
return 49;
case VARYING_SLOT_CLIP_DIST1:
return 50;
case VARYING_SLOT_PSIZ:
return SI_MAX_IO_GENERIC + 6 + 8 + 3;
return 51;
/* These can't be written by LS, HS, and ES. */
case VARYING_SLOT_LAYER:
return SI_MAX_IO_GENERIC + 6 + 8 + 4;
return 52;
case VARYING_SLOT_VIEWPORT:
return SI_MAX_IO_GENERIC + 6 + 8 + 5;
return 53;
case VARYING_SLOT_PRIMITIVE_ID:
STATIC_ASSERT(SI_MAX_IO_GENERIC + 6 + 8 + 6 <= 63);
return SI_MAX_IO_GENERIC + 6 + 8 + 6;
return 54;
}
}

5
src/gallium/drivers/radeonsi/si_shader.h
View file

@ -156,11 +156,6 @@ struct si_context;
#define SI_MAX_ATTRIBS 16
#define SI_MAX_VS_OUTPUTS 40
/* Shader IO unique indices are supported for VARYING_SLOT_VARn with an
* index smaller than this.
*/
#define SI_MAX_IO_GENERIC 32
#define SI_NGG_PRIM_EDGE_FLAG_BITS ((1 << 9) | (1 << 19) | (1 << 29))
/* SGPR user data indices */

2
src/gallium/drivers/radeonsi/si_shader_llvm_vs.c
View file

@ -476,7 +476,7 @@ static void si_build_param_exports(struct si_shader_context *ctx,
continue;
}
if (semantic < VARYING_SLOT_VAR0 + SI_MAX_IO_GENERIC &&
if ((semantic <= VARYING_SLOT_VAR31 || semantic >= VARYING_SLOT_VAR0_16BIT) &&
shader->key.opt.kill_outputs &
(1ull << si_shader_io_get_unique_index(semantic, true)))
continue;

6
src/gallium/drivers/radeonsi/si_state_shaders.c
View file

@ -2565,7 +2565,7 @@ static void si_init_shader_selector_async(void *job, int thread_index)
unsigned semantic = sel->info.output_semantic[i];
unsigned id;
if (semantic < VARYING_SLOT_MAX &&
if ((semantic <= VARYING_SLOT_VAR31 || semantic >= VARYING_SLOT_VAR0_16BIT) &&
semantic != VARYING_SLOT_POS &&
semantic != VARYING_SLOT_PSIZ &&
semantic != VARYING_SLOT_CLIP_VERTEX &&
@ -2734,7 +2734,7 @@ static void *si_create_shader_selector(struct pipe_context *ctx,
semantic == VARYING_SLOT_TESS_LEVEL_OUTER ||
(semantic >= VARYING_SLOT_PATCH0 && semantic < VARYING_SLOT_TESS_MAX)) {
sel->patch_outputs_written |= 1ull << si_shader_io_get_unique_index_patch(semantic);
} else if (semantic < VARYING_SLOT_MAX &&
} else if ((semantic <= VARYING_SLOT_VAR31 || semantic >= VARYING_SLOT_VAR0_16BIT) &&
semantic != VARYING_SLOT_EDGE) {
sel->outputs_written |= 1ull << si_shader_io_get_unique_index(semantic, false);
sel->outputs_written_before_ps |= 1ull
@ -2807,7 +2807,7 @@ static void *si_create_shader_selector(struct pipe_context *ctx,
for (i = 0; i < sel->info.num_inputs; i++) {
unsigned semantic = sel->info.input_semantic[i];
if (semantic < VARYING_SLOT_MAX &&
if ((semantic <= VARYING_SLOT_VAR31 || semantic >= VARYING_SLOT_VAR0_16BIT) &&
semantic != VARYING_SLOT_PNTC) {
sel->inputs_read |= 1ull << si_shader_io_get_unique_index(semantic, true);
}