From: Conor McCarthy cmccarthy@codeweavers.com
--- libs/vkd3d-shader/spirv.c | 66 ++++++++++++++++++++++++++++----------- 1 file changed, 48 insertions(+), 18 deletions(-)
diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index fa4d056e..74906abf 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2979,24 +2979,40 @@ static uint32_t spirv_compiler_emit_variable(struct spirv_compiler *compiler, return vkd3d_spirv_build_op_variable(builder, stream, ptr_type_id, storage_class, 0); }
-static uint32_t spirv_compiler_emit_array_variable(struct spirv_compiler *compiler, +static uint32_t spirv_compiler_emit_multi_array_variable(struct spirv_compiler *compiler, struct vkd3d_spirv_stream *stream, SpvStorageClass storage_class, - enum vkd3d_shader_component_type component_type, unsigned int component_count, unsigned int array_length) + enum vkd3d_shader_component_type component_type, unsigned int component_count, + const unsigned int *array_lengths, unsigned int length_count) { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; uint32_t type_id, length_id, ptr_type_id; + unsigned int i;
- if (!array_length) + if (!length_count) return spirv_compiler_emit_variable(compiler, stream, storage_class, component_type, component_count);
type_id = vkd3d_spirv_get_type_id(builder, component_type, component_count); - length_id = spirv_compiler_get_constant_uint(compiler, array_length); - type_id = vkd3d_spirv_get_op_type_array(builder, type_id, length_id); + for (i = 0; i < length_count; ++i) + { + if (!array_lengths[i]) + continue; + length_id = spirv_compiler_get_constant_uint(compiler, array_lengths[i]); + type_id = vkd3d_spirv_get_op_type_array(builder, type_id, length_id); + } + ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, storage_class, type_id); return vkd3d_spirv_build_op_variable(builder, stream, ptr_type_id, storage_class, 0); }
+static uint32_t spirv_compiler_emit_array_variable(struct spirv_compiler *compiler, + struct vkd3d_spirv_stream *stream, SpvStorageClass storage_class, + enum vkd3d_shader_component_type component_type, unsigned int component_count, unsigned int array_length) +{ + return spirv_compiler_emit_multi_array_variable(compiler, stream, storage_class, + component_type, component_count, &array_length, !!array_length); +} + static const struct vkd3d_shader_parameter *spirv_compiler_get_shader_parameter( struct spirv_compiler *compiler, enum vkd3d_shader_parameter_name name) { @@ -4401,17 +4417,22 @@ static void spirv_compiler_decorate_xfb_output(struct spirv_compiler *compiler, vkd3d_spirv_build_op_decorate1(builder, id, SpvDecorationOffset, offset); }
-static uint32_t spirv_compiler_emit_builtin_variable(struct spirv_compiler *compiler, - const struct vkd3d_spirv_builtin *builtin, SpvStorageClass storage_class, unsigned int array_size) +static uint32_t spirv_compiler_emit_multi_array_builtin_variable(struct spirv_compiler *compiler, + const struct vkd3d_spirv_builtin *builtin, SpvStorageClass storage_class, const unsigned int *array_sizes, + unsigned int size_count) { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + unsigned int sizes[2]; uint32_t id;
- array_size = max(array_size, builtin->spirv_array_size); + assert(size_count <= ARRAY_SIZE(sizes)); + memcpy(sizes, array_sizes, size_count * sizeof(sizes[0])); + array_sizes = sizes; + sizes[0] = max(sizes[0], builtin->spirv_array_size);
- id = spirv_compiler_emit_array_variable(compiler, + id = spirv_compiler_emit_multi_array_variable(compiler, &builder->global_stream, storage_class, - builtin->component_type, builtin->component_count, array_size); + builtin->component_type, builtin->component_count, array_sizes, size_count); vkd3d_spirv_add_iface_variable(builder, id); spirv_compiler_decorate_builtin(compiler, id, builtin->spirv_builtin);
@@ -4423,6 +4444,13 @@ static uint32_t spirv_compiler_emit_builtin_variable(struct spirv_compiler *comp return id; }
+static uint32_t spirv_compiler_emit_builtin_variable(struct spirv_compiler *compiler, + const struct vkd3d_spirv_builtin *builtin, SpvStorageClass storage_class, unsigned int array_size) +{ + return spirv_compiler_emit_multi_array_builtin_variable(compiler, builtin, + storage_class, &array_size, 1); +} + static bool needs_private_io_variable(const struct shader_signature *signature, unsigned int reg_idx, const struct vkd3d_spirv_builtin *builtin, unsigned int *component_count, unsigned int *out_write_mask) @@ -4602,7 +4630,8 @@ static uint32_t spirv_compiler_emit_input(struct spirv_compiler *compiler, { if (builtin) { - input_id = spirv_compiler_emit_builtin_variable(compiler, builtin, storage_class, array_size); + input_id = spirv_compiler_emit_multi_array_builtin_variable(compiler, builtin, storage_class, + &array_size, 1); if (reg->type == VKD3DSPR_PATCHCONST) vkd3d_spirv_build_op_decorate(builder, input_id, SpvDecorationPatch, NULL, 0); } @@ -4610,8 +4639,8 @@ static uint32_t spirv_compiler_emit_input(struct spirv_compiler *compiler, { unsigned int location = reg_idx;
- input_id = spirv_compiler_emit_array_variable(compiler, &builder->global_stream, - storage_class, component_type, input_component_count, array_size); + input_id = spirv_compiler_emit_multi_array_variable(compiler, &builder->global_stream, + storage_class, component_type, input_component_count, &array_size, 1); vkd3d_spirv_add_iface_variable(builder, input_id); if (reg->type == VKD3DSPR_PATCHCONST) { @@ -4632,8 +4661,8 @@ static uint32_t spirv_compiler_emit_input(struct spirv_compiler *compiler, if (use_private_var) { storage_class = SpvStorageClassPrivate; - var_id = spirv_compiler_emit_array_variable(compiler, &builder->global_stream, - storage_class, VKD3D_SHADER_COMPONENT_FLOAT, VKD3D_VEC4_SIZE, array_size); + var_id = spirv_compiler_emit_multi_array_variable(compiler, &builder->global_stream, + storage_class, VKD3D_SHADER_COMPONENT_FLOAT, VKD3D_VEC4_SIZE, &array_size, 1); }
vkd3d_symbol_set_register_info(®_symbol, var_id, storage_class, @@ -5034,7 +5063,8 @@ static void spirv_compiler_emit_output(struct spirv_compiler *compiler, if (spirv_compiler_get_current_shader_phase(compiler)) id = spirv_compiler_emit_shader_phase_builtin_variable(compiler, builtin); else - id = spirv_compiler_emit_builtin_variable(compiler, builtin, storage_class, array_size); + id = spirv_compiler_emit_multi_array_builtin_variable(compiler, builtin, storage_class, + &array_size, 1);
if (builtin->spirv_array_size) compiler->output_info[signature_idx].array_element_mask = @@ -5049,8 +5079,8 @@ static void spirv_compiler_emit_output(struct spirv_compiler *compiler, if (is_patch_constant) location += compiler->output_signature->element_count;
- id = spirv_compiler_emit_array_variable(compiler, &builder->global_stream, - storage_class, component_type, output_component_count, array_size); + id = spirv_compiler_emit_multi_array_variable(compiler, &builder->global_stream, + storage_class, component_type, output_component_count, &array_size, 1); vkd3d_spirv_add_iface_variable(builder, id);
if (is_dual_source_blending(compiler) && reg->idx[0].offset < 2)