=?UTF-8?Q?J=C3=B3zef=20Kucia=20?=: vkd3d-shader: Add support for OpenGL atomic counters.
Alexandre Julliard
julliard at winehq.org
Wed Oct 17 18:15:32 CDT 2018
Module: vkd3d
Branch: master
Commit: 170bb60baae7cd2e44236e0aebeaf6263d9444db
URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=170bb60baae7cd2e44236e0aebeaf6263d9444db
Author: Józef Kucia <jkucia at codeweavers.com>
Date: Wed Oct 17 17:59:36 2018 +0200
vkd3d-shader: Add support for OpenGL atomic counters.
Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
include/private/vkd3d_shader.h | 1 +
libs/vkd3d-shader/spirv.c | 46 +++++++++++++++++++++++++++++++++---------
2 files changed, 37 insertions(+), 10 deletions(-)
diff --git a/include/private/vkd3d_shader.h b/include/private/vkd3d_shader.h
index 121fa75..f0ff82b 100644
--- a/include/private/vkd3d_shader.h
+++ b/include/private/vkd3d_shader.h
@@ -96,6 +96,7 @@ struct vkd3d_shader_uav_counter_binding
unsigned int register_index; /* u# */
struct vkd3d_shader_descriptor_binding binding;
+ unsigned int offset;
};
struct vkd3d_shader_push_constant_buffer
diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c
index fce6e03..7cf58f8 100644
--- a/libs/vkd3d-shader/spirv.c
+++ b/libs/vkd3d-shader/spirv.c
@@ -1988,6 +1988,11 @@ static enum vkd3d_shader_target vkd3d_dxbc_compiler_get_target(const struct vkd3
return args ? args->target : VKD3D_SHADER_TARGET_SPIRV_VULKAN_1_0;
}
+static bool vkd3d_dxbc_compiler_is_opengl_target(const struct vkd3d_dxbc_compiler *compiler)
+{
+ return vkd3d_dxbc_compiler_get_target(compiler) == VKD3D_SHADER_TARGET_SPIRV_OPENGL_4_5;
+}
+
static bool vkd3d_dxbc_compiler_check_shader_visibility(const struct vkd3d_dxbc_compiler *compiler,
enum vkd3d_shader_visibility visibility)
{
@@ -2062,6 +2067,9 @@ static struct vkd3d_shader_descriptor_binding vkd3d_dxbc_compiler_get_descriptor
{
const struct vkd3d_shader_uav_counter_binding *current = &shader_interface->uav_counters[i];
+ if (current->offset)
+ FIXME("Atomic counter offsets are not supported yet.\n");
+
/* FIXME: Implement shader visibility for UAV counters. */
if (current->register_index == reg_idx)
return current->binding;
@@ -3837,11 +3845,11 @@ static void vkd3d_dxbc_compiler_emit_resource_declaration(struct vkd3d_dxbc_comp
const struct vkd3d_shader_register *reg, enum vkd3d_shader_resource_type resource_type,
enum vkd3d_data_type resource_data_type, unsigned int structure_stride, bool raw)
{
- const SpvStorageClass storage_class = SpvStorageClassUniformConstant;
+ uint32_t counter_type_id, type_id, ptr_type_id, var_id, counter_var_id = 0;
const struct vkd3d_shader_scan_info *scan_info = compiler->scan_info;
struct vkd3d_spirv_builder *builder = &compiler->spirv_builder;
+ SpvStorageClass storage_class = SpvStorageClassUniformConstant;
const struct vkd3d_spirv_resource_type *resource_type_info;
- uint32_t type_id, ptr_type_id, var_id, counter_var_id = 0;
enum vkd3d_component_type sampled_type;
struct vkd3d_symbol resource_symbol;
bool is_uav;
@@ -3872,6 +3880,15 @@ static void vkd3d_dxbc_compiler_emit_resource_declaration(struct vkd3d_dxbc_comp
if (is_uav && (scan_info->uav_counter_mask & (1u << reg->idx[0].offset)))
{
assert(structure_stride); /* counters are valid only for structured buffers */
+
+ if (vkd3d_dxbc_compiler_is_opengl_target(compiler))
+ {
+ vkd3d_spirv_enable_capability(builder, SpvCapabilityAtomicStorage);
+ storage_class = SpvStorageClassAtomicCounter;
+ counter_type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_UINT, 1);
+ ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, storage_class, counter_type_id);
+ }
+
counter_var_id = vkd3d_spirv_build_op_variable(builder, &builder->global_stream,
ptr_type_id, storage_class, 0);
@@ -5901,7 +5918,8 @@ static void vkd3d_dxbc_compiler_emit_uav_counter_instruction(struct vkd3d_dxbc_c
struct vkd3d_spirv_builder *builder = &compiler->spirv_builder;
const struct vkd3d_shader_dst_param *dst = instruction->dst;
const struct vkd3d_shader_src_param *src = instruction->src;
- uint32_t ptr_type_id, type_id, image_id, result_id;
+ unsigned int memory_semantics = SpvMemorySemanticsMaskNone;
+ uint32_t ptr_type_id, type_id, counter_id, result_id;
uint32_t coordinate_id, sample_id, pointer_id;
const struct vkd3d_symbol *resource_symbol;
uint32_t operands[3];
@@ -5911,18 +5929,26 @@ static void vkd3d_dxbc_compiler_emit_uav_counter_instruction(struct vkd3d_dxbc_c
? SpvOpAtomicIIncrement : SpvOpAtomicIDecrement;
resource_symbol = vkd3d_dxbc_compiler_find_resource(compiler, &src->reg);
- image_id = resource_symbol->info.resource.uav_counter_id;
- assert(image_id);
+ counter_id = resource_symbol->info.resource.uav_counter_id;
+ assert(counter_id);
type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_UINT, 1);
- ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, SpvStorageClassImage, type_id);
- coordinate_id = sample_id = vkd3d_dxbc_compiler_get_constant_uint(compiler, 0);
- pointer_id = vkd3d_spirv_build_op_image_texel_pointer(builder,
- ptr_type_id, image_id, coordinate_id, sample_id);
+ if (vkd3d_dxbc_compiler_is_opengl_target(compiler))
+ {
+ pointer_id = counter_id;
+ memory_semantics |= SpvMemorySemanticsAtomicCounterMemoryMask;
+ }
+ else
+ {
+ ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, SpvStorageClassImage, type_id);
+ coordinate_id = sample_id = vkd3d_dxbc_compiler_get_constant_uint(compiler, 0);
+ pointer_id = vkd3d_spirv_build_op_image_texel_pointer(builder,
+ ptr_type_id, counter_id, coordinate_id, sample_id);
+ }
operands[0] = pointer_id;
operands[1] = vkd3d_dxbc_compiler_get_constant_uint(compiler, SpvScopeDevice);
- operands[2] = vkd3d_dxbc_compiler_get_constant_uint(compiler, SpvMemorySemanticsMaskNone);
+ operands[2] = vkd3d_dxbc_compiler_get_constant_uint(compiler, memory_semantics);
result_id = vkd3d_spirv_build_op_trv(builder, &builder->function_stream,
op, type_id, operands, ARRAY_SIZE(operands));
if (op == SpvOpAtomicIDecrement)
More information about the wine-cvs
mailing list