fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-31 05:30:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

vc4: Handle nir_intrinsic_load_user_clip_plane as a vec4.

Browse source 
I liked having all my NIR be scalar, but nir_validate() complains that the
intrinsic writes 4 components but the destination we set up was only 1
component.  I could generate a new scalar variant, but it's a lot easier
to just leave it as a vec4.  This doesn't hurt codegen since we GC unused
uniforms, and UCP dot products use all the components anyway.
This commit is contained in:
Eric Anholt 2016-04-08 14:53:55 -07:00
parent 40e77741cf
commit 7030eadbed
2 changed files with 11 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/gallium/drivers/vc4/vc4_nir_lower_io.c
View file

@ -380,24 +380,14 @@ vc4_nir_lower_uniform(struct vc4_compile *c, nir_builder *b,
intr_comp->num_components = 1;
nir_ssa_dest_init(&intr_comp->instr, &intr_comp->dest, 1, 32, NULL);
/* Convert the uniform (not user_clip_plane) offset to bytes.
* If it happens to be a constant, constant-folding will clean
* up the shift for us.
/* Convert the uniform offset to bytes. If it happens to be a
* constant, constant-folding will clean up the shift for us.
*/
if (intr->intrinsic == nir_intrinsic_load_uniform) {
/* Convert the base offset to bytes and add the
* component
*/
intr_comp->const_index[0] = (intr->const_index[0] * 16 + i * 4);
intr_comp->const_index[0] = (intr->const_index[0] * 16 + i * 4);
intr_comp->src[0] =
nir_src_for_ssa(nir_ishl(b, intr->src[0].ssa,
nir_imm_int(b, 4)));
} else {
assert(intr->intrinsic ==
nir_intrinsic_load_user_clip_plane);
intr_comp->const_index[0] = intr->const_index[0] * 4 + i;
}
intr_comp->src[0] =
nir_src_for_ssa(nir_ishl(b, intr->src[0].ssa,
nir_imm_int(b, 4)));
dests[i] = &intr_comp->dest.ssa;
@ -428,10 +418,10 @@ vc4_nir_lower_io_instr(struct vc4_compile *c, nir_builder *b,
break;
case nir_intrinsic_load_uniform:
case nir_intrinsic_load_user_clip_plane:
vc4_nir_lower_uniform(c, b, intr);
break;
case nir_intrinsic_load_user_clip_plane:
default:
break;
}

6
src/gallium/drivers/vc4/vc4_program.c
View file

@ -1572,8 +1572,10 @@ ntq_emit_intrinsic(struct vc4_compile *c, nir_intrinsic_instr *instr)
break;
case nir_intrinsic_load_user_clip_plane:
*dest = qir_uniform(c, QUNIFORM_USER_CLIP_PLANE,
instr->const_index[0]);
for (int i = 0; i < instr->num_components; i++) {
dest[i] = qir_uniform(c, QUNIFORM_USER_CLIP_PLANE,
instr->const_index[0] * 4 + i);
}
break;
case nir_intrinsic_load_sample_mask_in: