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/ir: Validate descriptor flags in vsir programs.

Browse Source
This commit is contained in:
Giovanni Mascellani
2025-03-28 15:19:31 +01:00
committed by Henri Verbeet
parent 9c040caa40
commit 32bf71ba96
Notes: Henri Verbeet 2025-07-16 18:16:52 +02:00 
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1620
2 changed files with 31 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
libs/vkd3d-shader/ir.c
View File

@@ -10479,6 +10479,7 @@ static void vsir_validate_descriptors(struct validation_context *ctx)
for (i = 0; i < descriptors->descriptor_count; ++i) for (i = 0; i < descriptors->descriptor_count; ++i)
{ {
const struct vkd3d_shader_descriptor_info1 *descriptor = &descriptors->descriptors[i]; const struct vkd3d_shader_descriptor_info1 *descriptor = &descriptors->descriptors[i];
uint32_t flags_mask = 0;
if (descriptor->type >= VKD3D_SHADER_DESCRIPTOR_TYPE_COUNT) if (descriptor->type >= VKD3D_SHADER_DESCRIPTOR_TYPE_COUNT)
validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_DESCRIPTOR_TYPE, validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_DESCRIPTOR_TYPE,
@@ -10507,6 +10508,35 @@ static void vsir_validate_descriptors(struct validation_context *ctx)
validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_DESCRIPTOR_COUNT, validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_DESCRIPTOR_COUNT,
"Descriptor %u has invalid descriptor count %u starting at index %u.", "Descriptor %u has invalid descriptor count %u starting at index %u.",
i, descriptor->count, descriptor->register_index); i, descriptor->count, descriptor->register_index);
switch (descriptor->type)
{
case VKD3D_SHADER_DESCRIPTOR_TYPE_SRV:
flags_mask = VKD3D_SHADER_DESCRIPTOR_INFO_FLAG_RAW_BUFFER;
break;
case VKD3D_SHADER_DESCRIPTOR_TYPE_UAV:
flags_mask = VKD3D_SHADER_DESCRIPTOR_INFO_FLAG_UAV_COUNTER
| VKD3D_SHADER_DESCRIPTOR_INFO_FLAG_UAV_READ
| VKD3D_SHADER_DESCRIPTOR_INFO_FLAG_UAV_ATOMICS
| VKD3D_SHADER_DESCRIPTOR_INFO_FLAG_RAW_BUFFER;
break;
case VKD3D_SHADER_DESCRIPTOR_TYPE_CBV:
break;
case VKD3D_SHADER_DESCRIPTOR_TYPE_SAMPLER:
flags_mask = VKD3D_SHADER_DESCRIPTOR_INFO_FLAG_SAMPLER_COMPARISON_MODE;
break;
case VKD3D_SHADER_DESCRIPTOR_TYPE_FORCE_32BIT:
break;
}
if (descriptor->flags & ~flags_mask)
validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_FLAGS,
"Descriptor %u of type %#x has invalid flags %#x.",
i, descriptor->type, descriptor->flags);
} }
} }

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

@@ -265,6 +265,7 @@ enum vkd3d_shader_error
VKD3D_SHADER_ERROR_VSIR_INVALID_DESCRIPTOR_TYPE = 9024, VKD3D_SHADER_ERROR_VSIR_INVALID_DESCRIPTOR_TYPE = 9024,
VKD3D_SHADER_ERROR_VSIR_INVALID_RESOURCE_TYPE = 9025, VKD3D_SHADER_ERROR_VSIR_INVALID_RESOURCE_TYPE = 9025,
VKD3D_SHADER_ERROR_VSIR_INVALID_DESCRIPTOR_COUNT = 9026, VKD3D_SHADER_ERROR_VSIR_INVALID_DESCRIPTOR_COUNT = 9026,
VKD3D_SHADER_ERROR_VSIR_INVALID_FLAGS = 9027,
VKD3D_SHADER_WARNING_VSIR_DYNAMIC_DESCRIPTOR_ARRAY = 9300, VKD3D_SHADER_WARNING_VSIR_DYNAMIC_DESCRIPTOR_ARRAY = 9300,