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: Add a helper to search the scan descriptor info.

Browse Source 
Avoid shadowing "info" in vkd3d_shader_scan_combined_sampler_declaration().
This commit is contained in:
Zebediah Figura
2023-11-24 17:25:55 -06:00
committed by Alexandre Julliard
parent dfea1abbd8
commit 28f32349f4
Notes: Alexandre Julliard 2023-12-07 22:48:02 +01:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Henri Verbeet (@hverbeet)
Approved-by: Alexandre Julliard (@julliard)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/506
1 changed files with 20 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -890,6 +890,21 @@ static void vkd3d_shader_scan_combined_sampler_declaration(
&semantic->resource.range, semantic->resource_type, VKD3D_SHADER_RESOURCE_DATA_FLOAT); &semantic->resource.range, semantic->resource_type, VKD3D_SHADER_RESOURCE_DATA_FLOAT);
} }
static const struct vkd3d_shader_descriptor_info1 *find_descriptor(
const struct vkd3d_shader_scan_descriptor_info1 *info,
enum vkd3d_shader_descriptor_type type, unsigned int register_id)
{
for (unsigned int i = 0; i < info->descriptor_count; ++i)
{
const struct vkd3d_shader_descriptor_info1 *d = &info->descriptors[i];
if (d->type == type && d->register_id == register_id)
return d;
}
return NULL;
}
static void vkd3d_shader_scan_combined_sampler_usage(struct vkd3d_shader_scan_context *context, static void vkd3d_shader_scan_combined_sampler_usage(struct vkd3d_shader_scan_context *context,
const struct vkd3d_shader_register *resource, const struct vkd3d_shader_register *sampler) const struct vkd3d_shader_register *resource, const struct vkd3d_shader_register *sampler)
{ {
@ -915,7 +930,6 @@ static void vkd3d_shader_scan_combined_sampler_usage(struct vkd3d_shader_scan_co
if (vkd3d_shader_ver_ge(context->version, 5, 1)) if (vkd3d_shader_ver_ge(context->version, 5, 1))
{ {
const struct vkd3d_shader_scan_descriptor_info1 *info = context->scan_descriptor_info;
const struct vkd3d_shader_descriptor_info1 *d; const struct vkd3d_shader_descriptor_info1 *d;
bool dynamic_resource, dynamic_sampler; bool dynamic_resource, dynamic_sampler;
@ -930,30 +944,13 @@ static void vkd3d_shader_scan_combined_sampler_usage(struct vkd3d_shader_scan_co
if (dynamic_resource || dynamic_sampler) if (dynamic_resource || dynamic_sampler)
return; return;
for (i = 0; i < info->descriptor_count; ++i) if ((d = find_descriptor(context->scan_descriptor_info,
{ VKD3D_SHADER_DESCRIPTOR_TYPE_SRV, resource->idx[0].offset)))
d = &info->descriptors[i];
if (d->type != VKD3D_SHADER_DESCRIPTOR_TYPE_SRV)
continue;
if (d->register_id != resource->idx[0].offset)
continue;
resource_space = d->register_space; resource_space = d->register_space;
break;
}
if (sampler) if (sampler && (d = find_descriptor(context->scan_descriptor_info,
{ VKD3D_SHADER_DESCRIPTOR_TYPE_SAMPLER, sampler->idx[0].offset)))
for (i = 0; i < info->descriptor_count; ++i) sampler_space = d->register_space;
{
d = &info->descriptors[i];
if (d->type != VKD3D_SHADER_DESCRIPTOR_TYPE_SAMPLER)
continue;
if (d->register_id != sampler->idx[0].offset)
continue;
sampler_space = d->register_space;
break;
}
}
} }
for (i = 0; i < info->combined_sampler_count; ++i) for (i = 0; i < info->combined_sampler_count; ++i)