fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-22 23:58:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

freedreno/ir3: ignore unused inputs

Browse source 
We could end up w/ inputs larger than vec4, simply because unused inputs
are not split.

Fixes things like dEQP-GLES31.functional.separate_shader.random.77 (and
probably a handful of others)

Signed-off-by: Rob Clark <robdclark@gmail.com>
This commit is contained in:
Rob Clark 2018-08-21 08:33:39 -04:00
parent 6b4397feab
commit 1a24f51966
1 changed files with 29 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/gallium/drivers/freedreno/ir3/ir3_compiler_nir.c
View file

@ -3233,6 +3233,25 @@ create_frag_coord(struct ir3_context *ctx, unsigned comp)
} }
} }
static uint64_t
input_bitmask(struct ir3_context *ctx, nir_variable *in)
{
unsigned ncomp = glsl_get_components(in->type);
unsigned slot = in->data.location;
/* let's pretend things other than vec4 don't exist: */
ncomp = MAX2(ncomp, 4);
if (ctx->so->type == SHADER_FRAGMENT) {
/* see st_nir_fixup_varying_slots(): */
if (slot >= VARYING_SLOT_VAR9)
slot -= 9;
}
/* Note that info.inputs_read is in units of vec4 slots: */
return ((1ull << (ncomp/4)) - 1) << slot;
}
static void static void
setup_input(struct ir3_context *ctx, nir_variable *in) setup_input(struct ir3_context *ctx, nir_variable *in)
{ {
@ -3247,6 +3266,15 @@ setup_input(struct ir3_context *ctx, nir_variable *in)
/* let's pretend things other than vec4 don't exist: */ /* let's pretend things other than vec4 don't exist: */
ncomp = MAX2(ncomp, 4); ncomp = MAX2(ncomp, 4);
/* skip unread inputs, we could end up with (for example), unsplit
* matrix/etc inputs in the case they are not read, so just silently
* skip these.
*
*/
if (!(ctx->s->info.inputs_read & input_bitmask(ctx, in)))
return;
compile_assert(ctx, ncomp == 4); compile_assert(ctx, ncomp == 4);
so->inputs[n].slot = slot; so->inputs[n].slot = slot;
@ -3264,7 +3292,7 @@ setup_input(struct ir3_context *ctx, nir_variable *in)
so->frag_coord = true; so->frag_coord = true;
instr = create_frag_coord(ctx, i); instr = create_frag_coord(ctx, i);
} else if (slot == VARYING_SLOT_PNTC) { } else if (slot == VARYING_SLOT_PNTC) {
/* see for example st_get_generic_varying_index().. this is /* see for example st_nir_fixup_varying_slots().. this is
* maybe a bit mesa/st specific. But we need things to line * maybe a bit mesa/st specific. But we need things to line
* up for this in fdN_program: * up for this in fdN_program:
* unsigned texmask = 1 << (slot - VARYING_SLOT_VAR0); * unsigned texmask = 1 << (slot - VARYING_SLOT_VAR0);