wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-09-12 18:50:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader: Get rid of the uav_ranges array.

Browse Source 
This is now redundant; the register ID is encoded into the scan descriptors.
This commit is contained in:
Zebediah Figura
2023-07-31 19:10:37 -05:00
committed by Alexandre Julliard
parent 7d02922541
commit 983d01df8c
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 3 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -599,14 +599,6 @@ struct vkd3d_shader_scan_context
size_t cf_info_size; size_t cf_info_size;
size_t cf_info_count; size_t cf_info_count;
struct
{
unsigned int id;
unsigned int descriptor_idx;
} *uav_ranges;
size_t uav_ranges_size;
size_t uav_range_count;
enum vkd3d_shader_api_version api_version; enum vkd3d_shader_api_version api_version;
}; };
@@ -635,7 +627,6 @@ static void vkd3d_shader_scan_context_init(struct vkd3d_shader_scan_context *con
static void vkd3d_shader_scan_context_cleanup(struct vkd3d_shader_scan_context *context) static void vkd3d_shader_scan_context_cleanup(struct vkd3d_shader_scan_context *context)
{ {
vkd3d_free(context->uav_ranges);
vkd3d_free(context->cf_info); vkd3d_free(context->cf_info);
} }
@@ -712,11 +703,11 @@ static void vkd3d_shader_scan_add_uav_flag(const struct vkd3d_shader_scan_contex
if (!context->scan_descriptor_info) if (!context->scan_descriptor_info)
return; return;
for (i = 0; i < context->uav_range_count; ++i) for (i = 0; i < context->scan_descriptor_info->descriptor_count; ++i)
{ {
if (context->uav_ranges[i].id == range_id) if (context->scan_descriptor_info->descriptors[i].register_id == range_id)
{ {
context->scan_descriptor_info->descriptors[context->uav_ranges[i].descriptor_idx].flags |= flag; context->scan_descriptor_info->descriptors[i].flags |= flag;
break; break;
} }
} }
@@ -793,23 +784,6 @@ static bool vkd3d_shader_scan_add_descriptor(struct vkd3d_shader_scan_context *c
return true; return true;
} }
static bool vkd3d_shader_scan_add_uav_range(struct vkd3d_shader_scan_context *context,
unsigned int id, unsigned int descriptor_idx)
{
if (!vkd3d_array_reserve((void **)&context->uav_ranges, &context->uav_ranges_size,
context->uav_range_count + 1, sizeof(*context->uav_ranges)))
{
ERR("Failed to allocate UAV range.\n");
return false;
}
context->uav_ranges[context->uav_range_count].id = id;
context->uav_ranges[context->uav_range_count].descriptor_idx = descriptor_idx;
++context->uav_range_count;
return true;
}
static void vkd3d_shader_scan_constant_buffer_declaration(struct vkd3d_shader_scan_context *context, static void vkd3d_shader_scan_constant_buffer_declaration(struct vkd3d_shader_scan_context *context,
const struct vkd3d_shader_instruction *instruction) const struct vkd3d_shader_instruction *instruction)
{ {
@@ -854,9 +828,6 @@ static void vkd3d_shader_scan_resource_declaration(struct vkd3d_shader_scan_cont
type = VKD3D_SHADER_DESCRIPTOR_TYPE_SRV; type = VKD3D_SHADER_DESCRIPTOR_TYPE_SRV;
vkd3d_shader_scan_add_descriptor(context, type, &resource->reg.reg, &resource->range, vkd3d_shader_scan_add_descriptor(context, type, &resource->reg.reg, &resource->range,
resource_type, resource_data_type, 0); resource_type, resource_data_type, 0);
if (type == VKD3D_SHADER_DESCRIPTOR_TYPE_UAV)
vkd3d_shader_scan_add_uav_range(context, resource->reg.reg.idx[0].offset,
context->scan_descriptor_info->descriptor_count - 1);
} }
static void vkd3d_shader_scan_typed_resource_declaration(struct vkd3d_shader_scan_context *context, static void vkd3d_shader_scan_typed_resource_declaration(struct vkd3d_shader_scan_context *context,