wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2024-11-21 16:46:41 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader: Store UAV read information in the descriptor scan info.

Browse Source 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Henri Verbeet 2020-06-25 10:48:27 +04:30 committed by Alexandre Julliard
parent 352b8118f3
commit e560db5027
3 changed files with 41 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/vkd3d_shader.h
View File

@ -616,6 +616,7 @@ enum vkd3d_shader_resource_data_type
enum vkd3d_shader_descriptor_info_flag enum vkd3d_shader_descriptor_info_flag
{ {
VKD3D_SHADER_DESCRIPTOR_INFO_FLAG_UAV_COUNTER = 0x00000001, VKD3D_SHADER_DESCRIPTOR_INFO_FLAG_UAV_COUNTER = 0x00000001,
VKD3D_SHADER_DESCRIPTOR_INFO_FLAG_UAV_READ = 0x00000002,
VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_DESCRIPTOR_INFO_FLAG), VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_DESCRIPTOR_INFO_FLAG),
}; };
@ -639,7 +640,6 @@ struct vkd3d_shader_scan_info
struct vkd3d_shader_descriptor_info *descriptors; struct vkd3d_shader_descriptor_info *descriptors;
unsigned int descriptor_count; unsigned int descriptor_count;
unsigned int uav_read_mask; /* VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS */
unsigned int sampler_comparison_mode_mask; /* 16 */ unsigned int sampler_comparison_mode_mask; /* 16 */
bool use_vocp; bool use_vocp;
}; };

56
libs/vkd3d-shader/spirv.c
View File

@ -1863,6 +1863,8 @@ struct vkd3d_symbol_register_data
struct vkd3d_symbol_resource_data struct vkd3d_symbol_resource_data
{ {
unsigned int register_space;
unsigned int register_index;
enum vkd3d_component_type sampled_type; enum vkd3d_component_type sampled_type;
uint32_t type_id; uint32_t type_id;
const struct vkd3d_spirv_resource_type *resource_type_info; const struct vkd3d_spirv_resource_type *resource_type_info;
@ -5186,18 +5188,23 @@ static const struct vkd3d_shader_descriptor_info *vkd3d_dxbc_compiler_get_descri
} }
static uint32_t vkd3d_dxbc_compiler_get_image_type_id(struct vkd3d_dxbc_compiler *compiler, static uint32_t vkd3d_dxbc_compiler_get_image_type_id(struct vkd3d_dxbc_compiler *compiler,
const struct vkd3d_shader_register *reg, const struct vkd3d_spirv_resource_type *resource_type_info, const struct vkd3d_shader_register *reg, unsigned int register_space, unsigned int register_index,
enum vkd3d_component_type data_type, bool raw_structured, uint32_t depth) const struct vkd3d_spirv_resource_type *resource_type_info, enum vkd3d_component_type data_type,
bool raw_structured, uint32_t depth)
{ {
const struct vkd3d_shader_scan_info *scan_info = compiler->scan_info;
struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder;
const struct vkd3d_shader_descriptor_info *d;
uint32_t sampled_type_id; uint32_t sampled_type_id;
SpvImageFormat format; SpvImageFormat format;
format = SpvImageFormatUnknown; format = SpvImageFormatUnknown;
if (reg->type == VKD3DSPR_UAV if (reg->type == VKD3DSPR_UAV)
&& (raw_structured || (scan_info->uav_read_mask & (1u << reg->idx[0].offset)))) {
format = image_format_for_image_read(data_type); d = vkd3d_dxbc_compiler_get_descriptor_info(compiler,
VKD3D_SHADER_DESCRIPTOR_TYPE_UAV, register_space, register_index);
if (raw_structured || (d->flags & VKD3D_SHADER_DESCRIPTOR_INFO_FLAG_UAV_READ))
format = image_format_for_image_read(data_type);
}
sampled_type_id = vkd3d_spirv_get_type_id(builder, data_type, 1); sampled_type_id = vkd3d_spirv_get_type_id(builder, data_type, 1);
return vkd3d_spirv_get_op_type_image(builder, sampled_type_id, resource_type_info->dim, return vkd3d_spirv_get_op_type_image(builder, sampled_type_id, resource_type_info->dim,
@ -5206,16 +5213,15 @@ static uint32_t vkd3d_dxbc_compiler_get_image_type_id(struct vkd3d_dxbc_compiler
} }
static void vkd3d_dxbc_compiler_emit_combined_sampler_declarations(struct vkd3d_dxbc_compiler *compiler, static void vkd3d_dxbc_compiler_emit_combined_sampler_declarations(struct vkd3d_dxbc_compiler *compiler,
const struct vkd3d_shader_register *resource, enum vkd3d_shader_resource_type resource_type, const struct vkd3d_shader_register *resource, unsigned int resource_space, unsigned int resource_index,
enum vkd3d_component_type sampled_type, unsigned int structure_stride, bool raw, enum vkd3d_shader_resource_type resource_type, enum vkd3d_component_type sampled_type,
const struct vkd3d_spirv_resource_type *resource_type_info) unsigned int structure_stride, bool raw, const struct vkd3d_spirv_resource_type *resource_type_info)
{ {
const struct vkd3d_shader_interface_info *shader_interface = &compiler->shader_interface; const struct vkd3d_shader_interface_info *shader_interface = &compiler->shader_interface;
const struct vkd3d_shader_scan_info *scan_info = compiler->scan_info; const struct vkd3d_shader_scan_info *scan_info = compiler->scan_info;
const SpvStorageClass storage_class = SpvStorageClassUniformConstant; const SpvStorageClass storage_class = SpvStorageClassUniformConstant;
struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder;
const struct vkd3d_shader_combined_resource_sampler *current; const struct vkd3d_shader_combined_resource_sampler *current;
const unsigned int resource_index = resource->idx[0].offset;
uint32_t image_type_id, type_id, ptr_type_id, var_id; uint32_t image_type_id, type_id, ptr_type_id, var_id;
enum vkd3d_shader_binding_flag resource_type_flag; enum vkd3d_shader_binding_flag resource_type_flag;
struct vkd3d_symbol symbol; struct vkd3d_symbol symbol;
@ -5241,8 +5247,8 @@ static void vkd3d_dxbc_compiler_emit_combined_sampler_declarations(struct vkd3d_
depth = current->sampler_index != VKD3D_DUMMY_SAMPLER_INDEX depth = current->sampler_index != VKD3D_DUMMY_SAMPLER_INDEX
&& scan_info->sampler_comparison_mode_mask & (1u << current->sampler_index); && scan_info->sampler_comparison_mode_mask & (1u << current->sampler_index);
image_type_id = vkd3d_dxbc_compiler_get_image_type_id(compiler, image_type_id = vkd3d_dxbc_compiler_get_image_type_id(compiler, resource, resource_space,
resource, resource_type_info, sampled_type, structure_stride || raw, depth); resource_index, resource_type_info, sampled_type, structure_stride || raw, depth);
type_id = vkd3d_spirv_get_op_type_sampled_image(builder, image_type_id); type_id = vkd3d_spirv_get_op_type_sampled_image(builder, image_type_id);
ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, storage_class, type_id); ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, storage_class, type_id);
@ -5258,6 +5264,8 @@ static void vkd3d_dxbc_compiler_emit_combined_sampler_declarations(struct vkd3d_
vkd3d_symbol_make_combined_sampler(&symbol, resource_index, current->sampler_index); vkd3d_symbol_make_combined_sampler(&symbol, resource_index, current->sampler_index);
symbol.id = var_id; symbol.id = var_id;
symbol.info.resource.register_space = resource_space;
symbol.info.resource.register_index = resource_index;
symbol.info.resource.sampled_type = sampled_type; symbol.info.resource.sampled_type = sampled_type;
symbol.info.resource.type_id = image_type_id; symbol.info.resource.type_id = image_type_id;
symbol.info.resource.resource_type_info = resource_type_info; symbol.info.resource.resource_type_info = resource_type_info;
@ -5274,7 +5282,6 @@ static void vkd3d_dxbc_compiler_emit_resource_declaration(struct vkd3d_dxbc_comp
unsigned int structure_stride, bool raw) unsigned int structure_stride, bool raw)
{ {
uint32_t counter_type_id, type_id, ptr_type_id, var_id, counter_var_id = 0; 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; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder;
SpvStorageClass storage_class = SpvStorageClassUniformConstant; SpvStorageClass storage_class = SpvStorageClassUniformConstant;
const struct vkd3d_spirv_resource_type *resource_type_info; const struct vkd3d_spirv_resource_type *resource_type_info;
@ -5294,13 +5301,13 @@ static void vkd3d_dxbc_compiler_emit_resource_declaration(struct vkd3d_dxbc_comp
if (vkd3d_dxbc_compiler_has_combined_sampler(compiler, reg, NULL)) if (vkd3d_dxbc_compiler_has_combined_sampler(compiler, reg, NULL))
{ {
vkd3d_dxbc_compiler_emit_combined_sampler_declarations(compiler, vkd3d_dxbc_compiler_emit_combined_sampler_declarations(compiler, reg, register_space,
reg, resource_type, sampled_type, structure_stride, raw, resource_type_info); register_index, resource_type, sampled_type, structure_stride, raw, resource_type_info);
return; return;
} }
type_id = vkd3d_dxbc_compiler_get_image_type_id(compiler, type_id = vkd3d_dxbc_compiler_get_image_type_id(compiler, reg, register_space,
reg, resource_type_info, sampled_type, structure_stride || raw, 0); register_index, resource_type_info, sampled_type, structure_stride || raw, 0);
ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, storage_class, type_id); 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, var_id = vkd3d_spirv_build_op_variable(builder, &builder->global_stream,
ptr_type_id, storage_class, 0); ptr_type_id, storage_class, 0);
@ -5310,15 +5317,16 @@ static void vkd3d_dxbc_compiler_emit_resource_declaration(struct vkd3d_dxbc_comp
vkd3d_dxbc_compiler_emit_register_debug_name(builder, var_id, reg); vkd3d_dxbc_compiler_emit_register_debug_name(builder, var_id, reg);
if (is_uav && !(scan_info->uav_read_mask & (1u << reg->idx[0].offset)))
vkd3d_spirv_build_op_decorate(builder, var_id, SpvDecorationNonReadable, NULL, 0);
if (is_uav) if (is_uav)
{ {
const struct vkd3d_shader_descriptor_info *d; const struct vkd3d_shader_descriptor_info *d;
d = vkd3d_dxbc_compiler_get_descriptor_info(compiler, d = vkd3d_dxbc_compiler_get_descriptor_info(compiler,
VKD3D_SHADER_DESCRIPTOR_TYPE_UAV, register_space, register_index); VKD3D_SHADER_DESCRIPTOR_TYPE_UAV, register_space, register_index);
if (!(d->flags & VKD3D_SHADER_DESCRIPTOR_INFO_FLAG_UAV_READ))
vkd3d_spirv_build_op_decorate(builder, var_id, SpvDecorationNonReadable, NULL, 0);
if (d->flags & VKD3D_SHADER_DESCRIPTOR_INFO_FLAG_UAV_COUNTER) if (d->flags & VKD3D_SHADER_DESCRIPTOR_INFO_FLAG_UAV_COUNTER)
{ {
assert(structure_stride); /* counters are valid only for structured buffers */ assert(structure_stride); /* counters are valid only for structured buffers */
@ -5343,6 +5351,8 @@ static void vkd3d_dxbc_compiler_emit_resource_declaration(struct vkd3d_dxbc_comp
vkd3d_symbol_make_resource(&resource_symbol, reg); vkd3d_symbol_make_resource(&resource_symbol, reg);
resource_symbol.id = var_id; resource_symbol.id = var_id;
resource_symbol.info.resource.register_space = register_space;
resource_symbol.info.resource.register_index = register_index;
resource_symbol.info.resource.sampled_type = sampled_type; resource_symbol.info.resource.sampled_type = sampled_type;
resource_symbol.info.resource.type_id = type_id; resource_symbol.info.resource.type_id = type_id;
resource_symbol.info.resource.resource_type_info = resource_type_info; resource_symbol.info.resource.resource_type_info = resource_type_info;
@ -7237,9 +7247,9 @@ static void vkd3d_dxbc_compiler_prepare_image(struct vkd3d_dxbc_compiler *compil
image->image_id = load ? vkd3d_spirv_build_op_load(builder, image->image_id = load ? vkd3d_spirv_build_op_load(builder,
image->image_type_id, image->id, SpvMemoryAccessMaskNone) : 0; image->image_type_id, image->id, SpvMemoryAccessMaskNone) : 0;
image->image_type_id = vkd3d_dxbc_compiler_get_image_type_id(compiler, image->image_type_id = vkd3d_dxbc_compiler_get_image_type_id(compiler, resource_reg,
resource_reg, image->resource_type_info, image->sampled_type, symbol->info.resource.register_space, symbol->info.resource.register_index, image->resource_type_info,
image->structure_stride || image->raw, depth_comparison); image->sampled_type, image->structure_stride || image->raw, depth_comparison);
if (sampled) if (sampled)
{ {

14
libs/vkd3d-shader/vkd3d_shader_main.c
View File

@ -22,8 +22,6 @@
VKD3D_DEBUG_ENV_NAME("VKD3D_SHADER_DEBUG"); VKD3D_DEBUG_ENV_NAME("VKD3D_SHADER_DEBUG");
STATIC_ASSERT(MEMBER_SIZE(struct vkd3d_shader_scan_info, uav_read_mask) * CHAR_BIT >= VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS);
static void vkd3d_shader_dump_blob(const char *path, const char *prefix, const void *data, size_t size) static void vkd3d_shader_dump_blob(const char *path, const char *prefix, const void *data, size_t size)
{ {
static int shader_id = 0; static int shader_id = 0;
@ -228,11 +226,13 @@ static bool vkd3d_shader_instruction_is_uav_read(const struct vkd3d_shader_instr
|| (handler_idx == VKD3DSIH_LD_STRUCTURED && instruction->src[2].reg.type == VKD3DSPR_UAV); || (handler_idx == VKD3DSIH_LD_STRUCTURED && instruction->src[2].reg.type == VKD3DSPR_UAV);
} }
static void vkd3d_shader_scan_record_uav_read(struct vkd3d_shader_scan_info *scan_info, static void vkd3d_shader_scan_record_uav_read(struct vkd3d_shader_scan_context *context,
const struct vkd3d_shader_register *reg) const struct vkd3d_shader_register *reg)
{ {
assert(reg->idx[0].offset < VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS); struct vkd3d_shader_descriptor_info *d;
scan_info->uav_read_mask |= 1u << reg->idx[0].offset;
d = vkd3d_shader_scan_get_uav_descriptor_info(context, reg->idx[0].offset);
d->flags |= VKD3D_SHADER_DESCRIPTOR_INFO_FLAG_UAV_READ;
} }
static bool vkd3d_shader_instruction_is_uav_counter(const struct vkd3d_shader_instruction *instruction) static bool vkd3d_shader_instruction_is_uav_counter(const struct vkd3d_shader_instruction *instruction)
@ -441,12 +441,12 @@ static void vkd3d_shader_scan_instruction(struct vkd3d_shader_scan_context *cont
for (i = 0; i < instruction->dst_count; ++i) for (i = 0; i < instruction->dst_count; ++i)
{ {
if (instruction->dst[i].reg.type == VKD3DSPR_UAV) if (instruction->dst[i].reg.type == VKD3DSPR_UAV)
vkd3d_shader_scan_record_uav_read(context->scan_info, &instruction->dst[i].reg); vkd3d_shader_scan_record_uav_read(context, &instruction->dst[i].reg);
} }
for (i = 0; i < instruction->src_count; ++i) for (i = 0; i < instruction->src_count; ++i)
{ {
if (instruction->src[i].reg.type == VKD3DSPR_UAV) if (instruction->src[i].reg.type == VKD3DSPR_UAV)
vkd3d_shader_scan_record_uav_read(context->scan_info, &instruction->src[i].reg); vkd3d_shader_scan_record_uav_read(context, &instruction->src[i].reg);
} }
} }