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/msl: Reject shaders with duplicate I/O target locations.

Browse Source 
We'll have to handle them eventually, but let's avoid generating
invalid code in the meantime.
This commit is contained in:
Giovanni Mascellani
2025-07-27 15:06:06 +02:00
committed by Henri Verbeet
parent 9476a235b2
commit 7df92b6e50
Notes: Henri Verbeet 2025-07-28 16:39:33 +02:00 
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1655
1 changed files with 30 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,6 +18,8 @@
#include "vkd3d_shader_private.h" #include "vkd3d_shader_private.h"
#define MAX_IO_REG_COUNT 32
enum msl_data_type enum msl_data_type
{ {
MSL_DATA_FLOAT, MSL_DATA_FLOAT,
@@ -1614,6 +1616,7 @@ static void msl_generate_input_struct_declarations(struct msl_generator *gen)
const struct shader_signature *signature = &gen->program->input_signature; const struct shader_signature *signature = &gen->program->input_signature;
enum vkd3d_shader_type type = gen->program->shader_version.type; enum vkd3d_shader_type type = gen->program->shader_version.type;
struct vkd3d_string_buffer *buffer = gen->buffer; struct vkd3d_string_buffer *buffer = gen->buffer;
bool locations[MAX_IO_REG_COUNT] = {0};
const struct signature_element *e; const struct signature_element *e;
unsigned int i; unsigned int i;
@@ -1626,6 +1629,18 @@ static void msl_generate_input_struct_declarations(struct msl_generator *gen)
if (e->target_location == SIGNATURE_TARGET_LOCATION_UNUSED) if (e->target_location == SIGNATURE_TARGET_LOCATION_UNUSED)
continue; continue;
if (e->target_location >= ARRAY_SIZE(locations))
{
msl_compiler_error(gen, VKD3D_SHADER_ERROR_MSL_INTERNAL,
"Internal compiler error: Unhandled input target location %u.", e->target_location);
continue;
}
if (locations[e->target_location])
msl_compiler_error(gen, VKD3D_SHADER_ERROR_MSL_INTERNAL,
"Internal compiler error: Unhandled duplicate input target location %u.", e->target_location);
locations[e->target_location] = true;
switch (e->sysval_semantic) switch (e->sysval_semantic)
{ {
case VKD3D_SHADER_SV_NONE: case VKD3D_SHADER_SV_NONE:
@@ -1777,6 +1792,7 @@ static void msl_generate_output_struct_declarations(struct msl_generator *gen)
const struct shader_signature *signature = &gen->program->output_signature; const struct shader_signature *signature = &gen->program->output_signature;
enum vkd3d_shader_type type = gen->program->shader_version.type; enum vkd3d_shader_type type = gen->program->shader_version.type;
struct vkd3d_string_buffer *buffer = gen->buffer; struct vkd3d_string_buffer *buffer = gen->buffer;
bool locations[MAX_IO_REG_COUNT] = {0};
const struct signature_element *e; const struct signature_element *e;
unsigned int i; unsigned int i;
@@ -1790,6 +1806,18 @@ static void msl_generate_output_struct_declarations(struct msl_generator *gen)
|| e->sysval_semantic == VKD3D_SHADER_SV_DEPTH) || e->sysval_semantic == VKD3D_SHADER_SV_DEPTH)
continue; continue;
if (e->target_location >= ARRAY_SIZE(locations))
{
msl_compiler_error(gen, VKD3D_SHADER_ERROR_MSL_INTERNAL,
"Internal compiler error: Unhandled input target location %u.", e->target_location);
continue;
}
if (locations[e->target_location])
msl_compiler_error(gen, VKD3D_SHADER_ERROR_MSL_INTERNAL,
"Internal compiler error: Unhandled duplicate input target location %u.", e->target_location);
locations[e->target_location] = true;
if (e->min_precision != VKD3D_SHADER_MINIMUM_PRECISION_NONE) if (e->min_precision != VKD3D_SHADER_MINIMUM_PRECISION_NONE)
{ {
msl_compiler_error(gen, VKD3D_SHADER_ERROR_MSL_INTERNAL, msl_compiler_error(gen, VKD3D_SHADER_ERROR_MSL_INTERNAL,
@@ -1995,8 +2023,8 @@ static void msl_generate_entrypoint(struct msl_generator *gen)
vkd3d_string_buffer_printf(gen->buffer, "vkd3d_%s_in input [[stage_in]])\n{\n", gen->prefix); vkd3d_string_buffer_printf(gen->buffer, "vkd3d_%s_in input [[stage_in]])\n{\n", gen->prefix);
/* TODO: declare #maximum_register + 1 */ /* TODO: declare #maximum_register + 1 */
vkd3d_string_buffer_printf(gen->buffer, " vkd3d_vec4 %s_in[%u];\n", gen->prefix, 32); vkd3d_string_buffer_printf(gen->buffer, " vkd3d_vec4 %s_in[%u];\n", gen->prefix, MAX_IO_REG_COUNT);
vkd3d_string_buffer_printf(gen->buffer, " vkd3d_vec4 %s_out[%u];\n", gen->prefix, 32); vkd3d_string_buffer_printf(gen->buffer, " vkd3d_vec4 %s_out[%u];\n", gen->prefix, MAX_IO_REG_COUNT);
vkd3d_string_buffer_printf(gen->buffer, " vkd3d_%s_out output;\n", gen->prefix); vkd3d_string_buffer_printf(gen->buffer, " vkd3d_%s_out output;\n", gen->prefix);
if (bitmap_is_set(gen->program->io_dcls, VKD3DSPR_SAMPLEMASK)) if (bitmap_is_set(gen->program->io_dcls, VKD3DSPR_SAMPLEMASK))
vkd3d_string_buffer_printf(gen->buffer, " vkd3d_scalar o_mask;\n"); vkd3d_string_buffer_printf(gen->buffer, " vkd3d_scalar o_mask;\n");