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/ir: Validate register id and index for RESOURCE registers.

Browse Source
This commit is contained in:
Giovanni Mascellani
2025-03-15 16:03:50 +01:00
committed by Henri Verbeet
parent 3e44bd4e5b
commit 10d8760134
Notes: Henri Verbeet 2025-04-02 19:43:45 +02:00 
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1437
6 changed files with 41 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libs/vkd3d-shader/glsl.c
View File

@@ -2468,6 +2468,7 @@ int glsl_compile(struct vsir_program *program, uint64_t config_flags,
return ret;
VKD3D_ASSERT(program->normalisation_level == VSIR_NORMALISED_SM6);
VKD3D_ASSERT(program->has_descriptor_info);
vkd3d_glsl_generator_init(&generator, program, compile_info,
combined_sampler_info, message_context);

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

@@ -7782,6 +7782,33 @@ static void vsir_validate_label_register(struct validation_context *ctx,
reg->idx[0].offset, ctx->program->block_count);
}
static void vsir_validate_descriptor_indices(struct validation_context *ctx,
const struct vkd3d_shader_register *reg, enum vkd3d_shader_descriptor_type type, const char *name)
{
const struct vkd3d_shader_descriptor_info1 *descriptor;
if (reg->idx[0].rel_addr)
validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_INDEX,
"Non-NULL indirect address for the ID of a register of type \"%s\".", name);
if (!ctx->program->has_descriptor_info)
return;
if (!(descriptor = vkd3d_shader_find_descriptor(&ctx->program->descriptors, type, reg->idx[0].offset)))
{
validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_INDEX,
"No matching descriptor found for register %s%u.", name, reg->idx[0].offset);
return;
}
if (!reg->idx[1].rel_addr && (reg->idx[1].offset < descriptor->register_index
|| reg->idx[1].offset - descriptor->register_index >= descriptor->count))
validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_INDEX,
"Register index %u doesn't belong to the range [%u, %u] for register %s%u.",
reg->idx[1].offset, descriptor->register_index,
descriptor->register_index + descriptor->count - 1, name, reg->idx[0].offset);
}
static void vsir_validate_constbuffer_register(struct validation_context *ctx,
const struct vkd3d_shader_register *reg)
{
@@ -7855,9 +7882,7 @@ static void vsir_validate_resource_register(struct validation_context *ctx,
return;
}
if (reg->idx[0].rel_addr)
validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_INDEX,
"Non-NULL relative address for the descriptor index of a RESOURCE register.");
vsir_validate_descriptor_indices(ctx, reg, VKD3D_SHADER_DESCRIPTOR_TYPE_SRV, "t");
}
static void vsir_validate_uav_register(struct validation_context *ctx,

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

@@ -1310,6 +1310,7 @@ int msl_compile(struct vsir_program *program, uint64_t config_flags,
return ret;
VKD3D_ASSERT(program->normalisation_level == VSIR_NORMALISED_SM6);
VKD3D_ASSERT(program->has_descriptor_info);
if ((ret = msl_generator_init(&generator, program, compile_info, message_context)) < 0)
return ret;

1
libs/vkd3d-shader/spirv.c
View File

@@ -11361,6 +11361,7 @@ int spirv_compile(struct vsir_program *program, uint64_t config_flags,
return ret;
VKD3D_ASSERT(program->normalisation_level == VSIR_NORMALISED_SM6);
VKD3D_ASSERT(program->has_descriptor_info);
if (!(spirv_compiler = spirv_compiler_create(program, compile_info,
message_context, config_flags)))

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

@@ -1127,7 +1127,7 @@ static void vkd3d_shader_scan_combined_sampler_declaration(
&semantic->resource.range, semantic->resource_type, VKD3D_SHADER_RESOURCE_DATA_FLOAT);
}
static const struct vkd3d_shader_descriptor_info1 *find_descriptor(
const struct vkd3d_shader_descriptor_info1 *vkd3d_shader_find_descriptor(
const struct vkd3d_shader_scan_descriptor_info1 *info,
enum vkd3d_shader_descriptor_type type, unsigned int register_id)
{
@@ -1181,11 +1181,11 @@ static void vkd3d_shader_scan_combined_sampler_usage(struct vkd3d_shader_scan_co
if (dynamic_resource || dynamic_sampler)
return;
if ((d = find_descriptor(context->scan_descriptor_info,
if ((d = vkd3d_shader_find_descriptor(context->scan_descriptor_info,
VKD3D_SHADER_DESCRIPTOR_TYPE_SRV, resource->idx[0].offset)))
resource_space = d->register_space;
if (sampler && (d = find_descriptor(context->scan_descriptor_info,
if (sampler && (d = vkd3d_shader_find_descriptor(context->scan_descriptor_info,
VKD3D_SHADER_DESCRIPTOR_TYPE_SAMPLER, sampler->idx[0].offset)))
sampler_space = d->register_space;
}
@@ -1606,6 +1606,9 @@ static int vsir_program_scan(struct vsir_program *program, const struct vkd3d_sh
vkd3d_shader_scan_context_init(&context, &program->shader_version, compile_info,
add_descriptor_info ? &program->descriptors : NULL, combined_sampler_info, message_context);
if (add_descriptor_info)
program->has_descriptor_info = true;
if (TRACE_ON())
vsir_program_trace(program);

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

@@ -1444,6 +1444,9 @@ struct vkd3d_shader_scan_descriptor_info1
unsigned int descriptor_count;
};
const struct vkd3d_shader_descriptor_info1 *vkd3d_shader_find_descriptor(
const struct vkd3d_shader_scan_descriptor_info1 *info,
enum vkd3d_shader_descriptor_type type, unsigned int register_id);
void vkd3d_shader_free_scan_descriptor_info1(struct vkd3d_shader_scan_descriptor_info1 *scan_descriptor_info);
struct vsir_program
@@ -1456,6 +1459,7 @@ struct vsir_program
struct shader_signature patch_constant_signature;
struct vkd3d_shader_scan_descriptor_info1 descriptors;
bool has_descriptor_info;
unsigned int parameter_count;
const struct vkd3d_shader_parameter1 *parameters;