[PATCH vkd3d v2 6/6] vkd3d-shader: Create descriptor array symbols for resources.
Conor McCarthy
conor.mccarthy6 at bigpond.com
Sun Jul 18 23:47:45 CDT 2021
From: Conor McCarthy <cmccarthy at codeweavers.com>
Signed-off-by: Conor McCarthy <cmccarthy at codeweavers.com>
---
include/vkd3d_shader.h | 6 ++-
libs/vkd3d-shader/spirv.c | 77 ++++++++++++++++++++-------------------
2 files changed, 43 insertions(+), 40 deletions(-)
diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h
index 77758a2b..4593fcec 100644
--- a/include/vkd3d_shader.h
+++ b/include/vkd3d_shader.h
@@ -208,8 +208,10 @@ struct vkd3d_shader_descriptor_binding
/** The binding index of the descriptor. */
unsigned int binding;
/**
- * The size of this descriptor array. Descriptor arrays are not supported in
- * this version of vkd3d-shader, and therefore this value must be 1.
+ * The size of this descriptor array. Descriptor arrays are supported in
+ * this version of vkd3d-shader for all descriptor types except UAV
+ * counters and combined resource/sampler descriptors. For such bindings
+ * this value must be 1. Dynamic array indexing is not supported.
*/
unsigned int count;
};
diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c
index 98714faa..f00b5cd8 100644
--- a/libs/vkd3d-shader/spirv.c
+++ b/libs/vkd3d-shader/spirv.c
@@ -2624,18 +2624,6 @@ static void vkd3d_dxbc_compiler_emit_descriptor_binding(struct vkd3d_dxbc_compil
vkd3d_spirv_build_op_decorate1(builder, variable_id, SpvDecorationBinding, binding->binding);
}
-static void vkd3d_dxbc_compiler_emit_descriptor_binding_for_reg(struct vkd3d_dxbc_compiler *compiler,
- uint32_t variable_id, const struct vkd3d_shader_register *reg, const struct vkd3d_shader_register_range *range,
- enum vkd3d_shader_resource_type resource_type, bool is_uav_counter)
-{
- struct vkd3d_shader_descriptor_binding binding;
- unsigned int binding_base_idx; /* Value not used. */
-
- binding = vkd3d_dxbc_compiler_get_descriptor_binding(compiler, reg, range,
- resource_type, is_uav_counter, &binding_base_idx);
- vkd3d_dxbc_compiler_emit_descriptor_binding(compiler, variable_id, &binding);
-}
-
static const struct vkd3d_symbol *vkd3d_dxbc_compiler_put_symbol(struct vkd3d_dxbc_compiler *compiler,
const struct vkd3d_symbol *symbol)
{
@@ -5687,12 +5675,13 @@ static void vkd3d_dxbc_compiler_emit_resource_declaration(struct vkd3d_dxbc_comp
const struct vkd3d_shader_resource *resource, enum vkd3d_shader_resource_type resource_type,
enum vkd3d_data_type resource_data_type, unsigned int structure_stride, bool raw)
{
- uint32_t counter_type_id, type_id, ptr_type_id, var_id, counter_var_id = 0;
struct vkd3d_spirv_builder *builder = &compiler->spirv_builder;
SpvStorageClass storage_class = SpvStorageClassUniformConstant;
+ uint32_t counter_type_id, type_id, var_id, counter_var_id = 0;
const struct vkd3d_shader_register *reg = &resource->reg.reg;
const struct vkd3d_spirv_resource_type *resource_type_info;
enum vkd3d_shader_component_type sampled_type;
+ const struct vkd3d_symbol *array_symbol;
struct vkd3d_symbol resource_symbol;
bool is_uav;
@@ -5735,17 +5724,12 @@ static void vkd3d_dxbc_compiler_emit_resource_declaration(struct vkd3d_dxbc_comp
resource_type_info, sampled_type, structure_stride || raw, 0);
}
- ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, storage_class, type_id);
- var_id = vkd3d_spirv_build_op_variable(builder, &builder->global_stream,
- ptr_type_id, storage_class, 0);
-
- vkd3d_dxbc_compiler_emit_descriptor_binding_for_reg(compiler, var_id, reg,
- &resource->range, resource_type, false);
-
- vkd3d_dxbc_compiler_emit_register_debug_name(builder, var_id, reg);
+ var_id = vkd3d_dxbc_compiler_build_descriptor_variable(compiler, storage_class, type_id, reg,
+ &resource->range, resource_type, false, &array_symbol);
if (is_uav)
{
+ const struct vkd3d_symbol *counter_array_symbol;
const struct vkd3d_shader_descriptor_info *d;
d = vkd3d_dxbc_compiler_get_descriptor_info(compiler,
@@ -5758,41 +5742,41 @@ static void vkd3d_dxbc_compiler_emit_resource_declaration(struct vkd3d_dxbc_comp
{
assert(structure_stride); /* counters are valid only for structured buffers */
- counter_type_id = vkd3d_spirv_get_type_id(builder, VKD3D_SHADER_COMPONENT_UINT, 1);
if (vkd3d_dxbc_compiler_is_opengl_target(compiler))
{
+ counter_type_id = vkd3d_spirv_get_type_id(builder, VKD3D_SHADER_COMPONENT_UINT, 1);
vkd3d_spirv_enable_capability(builder, SpvCapabilityAtomicStorage);
storage_class = SpvStorageClassAtomicCounter;
- ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, storage_class, counter_type_id);
}
else if (compiler->ssbo_uavs)
{
- uint32_t length_id, array_type_id, struct_id;
+ uint32_t length_id, array_type_id;
length_id = vkd3d_dxbc_compiler_get_constant_uint(compiler, 1);
- array_type_id = vkd3d_spirv_build_op_type_array(builder, counter_type_id, length_id);
+ array_type_id = vkd3d_spirv_build_op_type_array(builder, vkd3d_spirv_get_type_id(builder,
+ VKD3D_SHADER_COMPONENT_UINT, 1), length_id);
vkd3d_spirv_build_op_decorate1(builder, array_type_id, SpvDecorationArrayStride, 4);
- struct_id = vkd3d_spirv_build_op_type_struct(builder, &array_type_id, 1);
- vkd3d_spirv_build_op_decorate(builder, struct_id, SpvDecorationBufferBlock, NULL, 0);
- vkd3d_spirv_build_op_member_decorate1(builder, struct_id, 0, SpvDecorationOffset, 0);
+ counter_type_id = vkd3d_spirv_build_op_type_struct(builder, &array_type_id, 1);
+ vkd3d_spirv_build_op_decorate(builder, counter_type_id, SpvDecorationBufferBlock, NULL, 0);
+ vkd3d_spirv_build_op_member_decorate1(builder, counter_type_id, 0, SpvDecorationOffset, 0);
storage_class = SpvStorageClassUniform;
- ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, storage_class, struct_id);
+ }
+ else
+ {
+ counter_type_id = type_id;
}
- counter_var_id = vkd3d_spirv_build_op_variable(builder, &builder->global_stream,
- ptr_type_id, storage_class, 0);
-
- vkd3d_dxbc_compiler_emit_descriptor_binding_for_reg(compiler,
- counter_var_id, reg, &resource->range, resource_type, true);
-
- vkd3d_spirv_build_op_name(builder, counter_var_id, "u%u_counter", reg->idx[0].offset);
+ /* TODO: UAV counter descriptor arrays. */
+ counter_var_id = vkd3d_dxbc_compiler_build_descriptor_variable(compiler, storage_class,
+ counter_type_id, reg, &resource->range, resource_type, true, &counter_array_symbol);
}
}
vkd3d_symbol_make_resource(&resource_symbol, reg);
resource_symbol.id = var_id;
+ resource_symbol.descriptor_array = array_symbol;
resource_symbol.info.resource.range = resource->range;
resource_symbol.info.resource.sampled_type = sampled_type;
resource_symbol.info.resource.type_id = type_id;
@@ -7787,9 +7771,26 @@ static void vkd3d_dxbc_compiler_prepare_image(struct vkd3d_dxbc_compiler *compil
if (!symbol)
symbol = vkd3d_dxbc_compiler_find_resource(compiler, resource_reg);
- image->id = symbol->id;
+ if (symbol->descriptor_array)
+ {
+ const struct vkd3d_symbol_descriptor_array_data *array_data = &symbol->descriptor_array->info.descriptor_array;
+ uint32_t ptr_type_id, index_id;
+
+ index_id = vkd3d_dxbc_compiler_get_descriptor_index(compiler, resource_reg,
+ array_data->binding_base_idx);
+
+ ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, array_data->storage_class,
+ array_data->contained_type_id);
+ image->image_type_id = array_data->contained_type_id;
+
+ image->id = vkd3d_spirv_build_op_access_chain(builder, ptr_type_id, symbol->id, &index_id, 1);
+ }
+ else
+ {
+ image->id = symbol->id;
+ image->image_type_id = symbol->info.resource.type_id;
+ }
image->sampled_type = symbol->info.resource.sampled_type;
- image->image_type_id = symbol->info.resource.type_id;
image->resource_type_info = symbol->info.resource.resource_type_info;
image->structure_stride = symbol->info.resource.structure_stride;
image->raw = symbol->info.resource.raw;
--
2.31.1
More information about the wine-devel
mailing list