wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-04-13 05:43:18 -07:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader: Factor more code into vkd3d_shader_scan_get_uav_descriptor_info().

Browse Source
This commit is contained in:
Zebediah Figura
2023-07-31 17:59:09 -05:00
committed by Alexandre Julliard
parent 8484bd59a6
commit 9c5cb2de18
Notes: Alexandre Julliard 2023-08-14 21:00:15 +02:00 
Approved-by: Henri Verbeet (@hverbeet)
Approved-by: Alexandre Julliard (@julliard)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/295
1 changed files with 13 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -703,18 +703,23 @@ static struct vkd3d_shader_cf_info *vkd3d_shader_scan_find_innermost_loop_cf_inf
return NULL; return NULL;
} }
static struct vkd3d_shader_descriptor_info *vkd3d_shader_scan_get_uav_descriptor_info( static void vkd3d_shader_scan_add_uav_flag(const struct vkd3d_shader_scan_context *context,
const struct vkd3d_shader_scan_context *context, unsigned int range_id) const struct vkd3d_shader_register *reg, uint32_t flag)
{ {
unsigned int range_id = reg->idx[0].offset;
unsigned int i; unsigned int i;
if (!context->scan_descriptor_info)
return;
for (i = 0; i < context->uav_range_count; ++i) for (i = 0; i < context->uav_range_count; ++i)
{ {
if (context->uav_ranges[i].id == range_id) if (context->uav_ranges[i].id == range_id)
return &context->scan_descriptor_info->descriptors[context->uav_ranges[i].descriptor_idx]; {
context->scan_descriptor_info->descriptors[context->uav_ranges[i].descriptor_idx].flags |= flag;
break;
}
} }
return NULL;
} }
static bool vkd3d_shader_instruction_is_uav_read(const struct vkd3d_shader_instruction *instruction) static bool vkd3d_shader_instruction_is_uav_read(const struct vkd3d_shader_instruction *instruction)
@ -730,13 +735,7 @@ static bool vkd3d_shader_instruction_is_uav_read(const struct vkd3d_shader_instr
static void vkd3d_shader_scan_record_uav_read(struct vkd3d_shader_scan_context *context, 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)
{ {
struct vkd3d_shader_descriptor_info *d; vkd3d_shader_scan_add_uav_flag(context, reg, VKD3D_SHADER_DESCRIPTOR_INFO_FLAG_UAV_READ);
if (!context->scan_descriptor_info)
return;
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)
@ -749,13 +748,7 @@ static bool vkd3d_shader_instruction_is_uav_counter(const struct vkd3d_shader_in
static void vkd3d_shader_scan_record_uav_counter(struct vkd3d_shader_scan_context *context, static void vkd3d_shader_scan_record_uav_counter(struct vkd3d_shader_scan_context *context,
const struct vkd3d_shader_register *reg) const struct vkd3d_shader_register *reg)
{ {
struct vkd3d_shader_descriptor_info *d; vkd3d_shader_scan_add_uav_flag(context, reg, VKD3D_SHADER_DESCRIPTOR_INFO_FLAG_UAV_COUNTER);
if (!context->scan_descriptor_info)
return;
d = vkd3d_shader_scan_get_uav_descriptor_info(context, reg->idx[0].offset);
d->flags |= VKD3D_SHADER_DESCRIPTOR_INFO_FLAG_UAV_COUNTER;
} }
static bool vkd3d_shader_instruction_is_uav_atomic_op(const struct vkd3d_shader_instruction *instruction) static bool vkd3d_shader_instruction_is_uav_atomic_op(const struct vkd3d_shader_instruction *instruction)
@ -768,13 +761,7 @@ static bool vkd3d_shader_instruction_is_uav_atomic_op(const struct vkd3d_shader_
static void vkd3d_shader_scan_record_uav_atomic_op(struct vkd3d_shader_scan_context *context, static void vkd3d_shader_scan_record_uav_atomic_op(struct vkd3d_shader_scan_context *context,
const struct vkd3d_shader_register *reg) const struct vkd3d_shader_register *reg)
{ {
struct vkd3d_shader_descriptor_info *d; vkd3d_shader_scan_add_uav_flag(context, reg, VKD3D_SHADER_DESCRIPTOR_INFO_FLAG_UAV_ATOMICS);
if (!context->scan_descriptor_info)
return;
d = vkd3d_shader_scan_get_uav_descriptor_info(context, reg->idx[0].offset);
d->flags |= VKD3D_SHADER_DESCRIPTOR_INFO_FLAG_UAV_ATOMICS;
} }
static bool vkd3d_shader_scan_add_descriptor(struct vkd3d_shader_scan_context *context, static bool vkd3d_shader_scan_add_descriptor(struct vkd3d_shader_scan_context *context,