wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-12-15 08:03:30 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/msl: Pass a descriptor to msl_get_binding().

Browse Source
This commit is contained in:
Giovanni Mascellani
2025-10-20 17:48:24 +02:00
committed by Henri Verbeet
parent a0db928473
commit 39391230d2
Notes: Henri Verbeet 2025-10-29 13:44:04 +01:00 
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1807
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
libs/vkd3d-shader/msl.c
View File

@@ -209,8 +209,8 @@ static bool msl_check_shader_visibility(const struct msl_generator *gen,
} }
} }
static bool msl_get_binding(const struct msl_generator *gen, unsigned int register_space, unsigned int register_idx, static bool msl_get_binding(const struct msl_generator *gen, const struct vkd3d_shader_descriptor_info1 *descriptor,
enum vkd3d_shader_descriptor_type type, enum vkd3d_shader_binding_flag flags, unsigned int *idx) unsigned int register_idx, enum vkd3d_shader_binding_flag flags, unsigned int *idx)
{ {
const struct vkd3d_shader_interface_info *interface_info = gen->interface_info; const struct vkd3d_shader_interface_info *interface_info = gen->interface_info;
unsigned int i; unsigned int i;
@@ -222,9 +222,9 @@ static bool msl_get_binding(const struct msl_generator *gen, unsigned int regist
{ {
const struct vkd3d_shader_resource_binding *binding = &interface_info->bindings[i]; const struct vkd3d_shader_resource_binding *binding = &interface_info->bindings[i];
if (binding->type != type) if (binding->type != descriptor->type)
continue; continue;
if (binding->register_space != register_space) if (binding->register_space != descriptor->register_space)
continue; continue;
if (binding->register_index != register_idx) if (binding->register_index != register_idx)
continue; continue;
@@ -243,29 +243,28 @@ static bool msl_get_binding(const struct msl_generator *gen, unsigned int regist
static bool msl_get_cbv_binding(const struct msl_generator *gen, static bool msl_get_cbv_binding(const struct msl_generator *gen,
const struct vkd3d_shader_descriptor_info1 *descriptor, unsigned int register_idx, unsigned int *idx) const struct vkd3d_shader_descriptor_info1 *descriptor, unsigned int register_idx, unsigned int *idx)
{ {
return msl_get_binding(gen, descriptor->register_space, register_idx, return msl_get_binding(gen, descriptor, register_idx, VKD3D_SHADER_BINDING_FLAG_BUFFER, idx);
VKD3D_SHADER_DESCRIPTOR_TYPE_CBV, VKD3D_SHADER_BINDING_FLAG_BUFFER, idx);
} }
static bool msl_get_sampler_binding(const struct msl_generator *gen, static bool msl_get_sampler_binding(const struct msl_generator *gen,
const struct vkd3d_shader_descriptor_info1 *descriptor, unsigned int register_idx, unsigned int *idx) const struct vkd3d_shader_descriptor_info1 *descriptor, unsigned int register_idx, unsigned int *idx)
{ {
return msl_get_binding(gen, descriptor->register_space, register_idx, VKD3D_SHADER_DESCRIPTOR_TYPE_SAMPLER, 0, idx); return msl_get_binding(gen, descriptor, register_idx, 0, idx);
} }
static bool msl_get_srv_binding(const struct msl_generator *gen, static bool msl_get_srv_binding(const struct msl_generator *gen,
const struct vkd3d_shader_descriptor_info1 *descriptor, unsigned int register_idx, unsigned int *idx) const struct vkd3d_shader_descriptor_info1 *descriptor, unsigned int register_idx, unsigned int *idx)
{ {
return msl_get_binding(gen, descriptor->register_space, register_idx, return msl_get_binding(gen, descriptor, register_idx,
VKD3D_SHADER_DESCRIPTOR_TYPE_SRV, descriptor->resource_type == VKD3D_SHADER_RESOURCE_BUFFER descriptor->resource_type == VKD3D_SHADER_RESOURCE_BUFFER
? VKD3D_SHADER_BINDING_FLAG_BUFFER : VKD3D_SHADER_BINDING_FLAG_IMAGE, idx); ? VKD3D_SHADER_BINDING_FLAG_BUFFER : VKD3D_SHADER_BINDING_FLAG_IMAGE, idx);
} }
static bool msl_get_uav_binding(const struct msl_generator *gen, static bool msl_get_uav_binding(const struct msl_generator *gen,
const struct vkd3d_shader_descriptor_info1 *descriptor, unsigned int register_idx, unsigned int *idx) const struct vkd3d_shader_descriptor_info1 *descriptor, unsigned int register_idx, unsigned int *idx)
{ {
return msl_get_binding(gen, descriptor->register_space, register_idx, return msl_get_binding(gen, descriptor, register_idx,
VKD3D_SHADER_DESCRIPTOR_TYPE_UAV, descriptor->resource_type == VKD3D_SHADER_RESOURCE_BUFFER descriptor->resource_type == VKD3D_SHADER_RESOURCE_BUFFER
? VKD3D_SHADER_BINDING_FLAG_BUFFER : VKD3D_SHADER_BINDING_FLAG_IMAGE, idx); ? VKD3D_SHADER_BINDING_FLAG_BUFFER : VKD3D_SHADER_BINDING_FLAG_IMAGE, idx);
} }