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

spirv: Ignore ArrayStride for storage classes that should not use it

Browse source 
The stride was already overriden when using
lower_workgroup_access_to_offsets, so elaborate a bit the commentary
there.

Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
This commit is contained in:
Caio Marcelo de Oliveira Filho 2019-07-03 13:14:33 -07:00
parent 026cfa1099
commit 1210e8caaf
1 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/compiler/spirv/spirv_to_nir.c
View file

@ -1383,7 +1383,20 @@ vtn_handle_type(struct vtn_builder *b, SpvOp opcode,
val->type->deref = vtn_value(b, w[3], vtn_value_type_type)->type;
vtn_foreach_decoration(b, val, array_stride_decoration_cb, NULL);
/* Only certain storage classes use ArrayStride. The others (in
* particular Workgroup) are expected to be laid out by the driver.
*/
switch (storage_class) {
case SpvStorageClassUniform:
case SpvStorageClassPushConstant:
case SpvStorageClassStorageBuffer:
case SpvStorageClassPhysicalStorageBufferEXT:
vtn_foreach_decoration(b, val, array_stride_decoration_cb, NULL);
break;
default:
/* Nothing to do. */
break;
}
if (b->physical_ptrs) {
switch (storage_class) {
@ -1398,14 +1411,15 @@ vtn_handle_type(struct vtn_builder *b, SpvOp opcode,
}
} else if (storage_class == SpvStorageClassWorkgroup &&
b->options->lower_workgroup_access_to_offsets) {
/* Workgroup is laid out by the implementation. */
/* Lay out Workgroup types so it can be lowered to offsets during
* SPIR-V to NIR conversion. When not lowering to offsets, the
* stride will be calculated by the driver.
*/
uint32_t size, align;
val->type->deref = vtn_type_layout_std430(b, val->type->deref,
&size, &align);
val->type->length = size;
val->type->align = align;
/* Override any ArrayStride previously set. */
val->type->stride = vtn_align_u32(size, align);
}
}