wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-01-28 13:05:02 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader: Add register ID to struct vkd3d_shader_descriptor_info1.

Browse Source
This commit is contained in:
Zebediah Figura 2023-07-31 18:59:16 -05:00 committed by Alexandre Julliard
parent 4e9798f6f7
commit 7d02922541
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
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -765,9 +765,9 @@ static void vkd3d_shader_scan_record_uav_atomic_op(struct vkd3d_shader_scan_cont
} }
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,
enum vkd3d_shader_descriptor_type type, const struct vkd3d_shader_register_range *range, enum vkd3d_shader_descriptor_type type, const struct vkd3d_shader_register *reg,
enum vkd3d_shader_resource_type resource_type, enum vkd3d_shader_resource_data_type resource_data_type, const struct vkd3d_shader_register_range *range, enum vkd3d_shader_resource_type resource_type,
unsigned int flags) enum vkd3d_shader_resource_data_type resource_data_type, unsigned int flags)
{ {
struct vkd3d_shader_scan_descriptor_info1 *info = context->scan_descriptor_info; struct vkd3d_shader_scan_descriptor_info1 *info = context->scan_descriptor_info;
struct vkd3d_shader_descriptor_info1 *d; struct vkd3d_shader_descriptor_info1 *d;
@ -781,6 +781,7 @@ static bool vkd3d_shader_scan_add_descriptor(struct vkd3d_shader_scan_context *c
d = &info->descriptors[info->descriptor_count]; d = &info->descriptors[info->descriptor_count];
d->type = type; d->type = type;
d->register_id = reg->idx[0].offset;
d->register_space = range->space; d->register_space = range->space;
d->register_index = range->first; d->register_index = range->first;
d->resource_type = resource_type; d->resource_type = resource_type;
@ -817,7 +818,7 @@ static void vkd3d_shader_scan_constant_buffer_declaration(struct vkd3d_shader_sc
if (!context->scan_descriptor_info) if (!context->scan_descriptor_info)
return; return;
vkd3d_shader_scan_add_descriptor(context, VKD3D_SHADER_DESCRIPTOR_TYPE_CBV, &cb->range, vkd3d_shader_scan_add_descriptor(context, VKD3D_SHADER_DESCRIPTOR_TYPE_CBV, &cb->src.reg, &cb->range,
VKD3D_SHADER_RESOURCE_BUFFER, VKD3D_SHADER_RESOURCE_DATA_UINT, 0); VKD3D_SHADER_RESOURCE_BUFFER, VKD3D_SHADER_RESOURCE_DATA_UINT, 0);
} }
@ -834,7 +835,7 @@ static void vkd3d_shader_scan_sampler_declaration(struct vkd3d_shader_scan_conte
flags = VKD3D_SHADER_DESCRIPTOR_INFO_FLAG_SAMPLER_COMPARISON_MODE; flags = VKD3D_SHADER_DESCRIPTOR_INFO_FLAG_SAMPLER_COMPARISON_MODE;
else else
flags = 0; flags = 0;
vkd3d_shader_scan_add_descriptor(context, VKD3D_SHADER_DESCRIPTOR_TYPE_SAMPLER, &sampler->range, vkd3d_shader_scan_add_descriptor(context, VKD3D_SHADER_DESCRIPTOR_TYPE_SAMPLER, &sampler->src.reg, &sampler->range,
VKD3D_SHADER_RESOURCE_NONE, VKD3D_SHADER_RESOURCE_DATA_UINT, flags); VKD3D_SHADER_RESOURCE_NONE, VKD3D_SHADER_RESOURCE_DATA_UINT, flags);
} }
@ -851,7 +852,8 @@ static void vkd3d_shader_scan_resource_declaration(struct vkd3d_shader_scan_cont
type = VKD3D_SHADER_DESCRIPTOR_TYPE_UAV; type = VKD3D_SHADER_DESCRIPTOR_TYPE_UAV;
else else
type = VKD3D_SHADER_DESCRIPTOR_TYPE_SRV; type = VKD3D_SHADER_DESCRIPTOR_TYPE_SRV;
vkd3d_shader_scan_add_descriptor(context, type, &resource->range, resource_type, resource_data_type, 0); vkd3d_shader_scan_add_descriptor(context, type, &resource->reg.reg, &resource->range,
resource_type, resource_data_type, 0);
if (type == VKD3D_SHADER_DESCRIPTOR_TYPE_UAV) if (type == VKD3D_SHADER_DESCRIPTOR_TYPE_UAV)
vkd3d_shader_scan_add_uav_range(context, resource->reg.reg.idx[0].offset, vkd3d_shader_scan_add_uav_range(context, resource->reg.reg.idx[0].offset,
context->scan_descriptor_info->descriptor_count - 1); context->scan_descriptor_info->descriptor_count - 1);
@ -1178,9 +1180,10 @@ static int scan_with_parser(const struct vkd3d_shader_compile_info *compile_info
for (i = 0; i < ARRAY_SIZE(parser->shader_desc.flat_constant_count); ++i) for (i = 0; i < ARRAY_SIZE(parser->shader_desc.flat_constant_count); ++i)
{ {
struct vkd3d_shader_register_range range = {.space = 0, .first = i, .last = i}; struct vkd3d_shader_register_range range = {.space = 0, .first = i, .last = i};
struct vkd3d_shader_register reg = {.idx[0].offset = i, .idx_count = 1};
if (parser->shader_desc.flat_constant_count[i].external) if (parser->shader_desc.flat_constant_count[i].external)
vkd3d_shader_scan_add_descriptor(&context, VKD3D_SHADER_DESCRIPTOR_TYPE_CBV, vkd3d_shader_scan_add_descriptor(&context, VKD3D_SHADER_DESCRIPTOR_TYPE_CBV, &reg,
&range, VKD3D_SHADER_RESOURCE_BUFFER, VKD3D_SHADER_RESOURCE_DATA_UINT, 0); &range, VKD3D_SHADER_RESOURCE_BUFFER, VKD3D_SHADER_RESOURCE_DATA_UINT, 0);
} }

1
libs/vkd3d-shader/vkd3d_shader_private.h
View File

@ -1115,6 +1115,7 @@ struct vkd3d_shader_descriptor_info1
enum vkd3d_shader_descriptor_type type; enum vkd3d_shader_descriptor_type type;
unsigned int register_space; unsigned int register_space;
unsigned int register_index; unsigned int register_index;
unsigned int register_id;
enum vkd3d_shader_resource_type resource_type; enum vkd3d_shader_resource_type resource_type;
enum vkd3d_shader_resource_data_type resource_data_type; enum vkd3d_shader_resource_data_type resource_data_type;
unsigned int flags; unsigned int flags;