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/hlsl: Make output semantics on structs cascade down onto the fields.

Browse Source
This commit is contained in:
Francisco Casas
2025-06-17 18:17:28 -04:00
committed by Henri Verbeet
parent f08fed5ffb
commit 7e9834ee36
Notes: Henri Verbeet 2025-07-21 12:34:54 +02:00 
Approved-by: Elizabeth Figura (@zfigura)
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1595
2 changed files with 33 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
libs/vkd3d-shader/hlsl_codegen.c
View File

@@ -233,6 +233,20 @@ static bool divert_written_uniform_derefs_to_temp(struct hlsl_ctx *ctx, struct h
return true; return true;
} }
static void warn_on_field_semantic(struct hlsl_ctx *ctx,
const struct hlsl_struct_field *field, const struct hlsl_semantic *outer)
{
if (!field->semantic.name)
return;
if (!ascii_strcasecmp(field->semantic.name, outer->name) && field->semantic.index == outer->index)
return;
hlsl_warning(ctx, &field->loc, VKD3D_SHADER_WARNING_HLSL_OVERRIDDEN_SEMANTIC,
"Field semantic %s%u is overridden by outer semantic %s%u.\n",
field->semantic.name, field->semantic.index, outer->name, outer->index);
}
static void validate_field_semantic(struct hlsl_ctx *ctx, struct hlsl_struct_field *field) static void validate_field_semantic(struct hlsl_ctx *ctx, struct hlsl_struct_field *field)
{ {
if (!field->semantic.name && hlsl_is_numeric_type(hlsl_get_multiarray_element_type(field->type)) if (!field->semantic.name && hlsl_is_numeric_type(hlsl_get_multiarray_element_type(field->type))
@@ -666,8 +680,6 @@ static void append_output_copy_recurse(struct hlsl_ctx *ctx, struct hlsl_block *
} }
else else
{ {
struct hlsl_semantic semantic_copy;
field = &type->e.record.fields[i]; field = &type->e.record.fields[i];
if (hlsl_type_is_resource(field->type)) if (hlsl_type_is_resource(field->type))
continue; continue;
@@ -675,13 +687,25 @@ static void append_output_copy_recurse(struct hlsl_ctx *ctx, struct hlsl_block *
element_modifiers = combine_field_storage_modifiers(modifiers, field->storage_modifiers); element_modifiers = combine_field_storage_modifiers(modifiers, field->storage_modifiers);
force_align = (i == 0); force_align = (i == 0);
validate_field_semantic(ctx, field); if (semantic->name)
{
warn_on_field_semantic(ctx, field, semantic);
if (!hlsl_clone_semantic(ctx, &semantic_copy, &field->semantic)) append_output_copy_recurse(ctx, block, func, element_type, element_load,
continue; element_modifiers, semantic, stream_index, force_align, create);
append_output_copy_recurse(ctx, block, func, element_type, element_load, }
element_modifiers, &semantic_copy, stream_index, force_align, create); else
hlsl_cleanup_semantic(&semantic_copy); {
struct hlsl_semantic semantic_copy;
validate_field_semantic(ctx, field);
if (!hlsl_clone_semantic(ctx, &semantic_copy, &field->semantic))
continue;
append_output_copy_recurse(ctx, block, func, element_type, element_load,
element_modifiers, &semantic_copy, stream_index, force_align, create);
hlsl_cleanup_semantic(&semantic_copy);
}
} }
} }
} }

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

@@ -184,6 +184,7 @@ enum vkd3d_shader_error
VKD3D_SHADER_WARNING_HLSL_IGNORED_ATTRIBUTE = 5305, VKD3D_SHADER_WARNING_HLSL_IGNORED_ATTRIBUTE = 5305,
VKD3D_SHADER_WARNING_HLSL_IGNORED_DEFAULT_VALUE = 5306, VKD3D_SHADER_WARNING_HLSL_IGNORED_DEFAULT_VALUE = 5306,
VKD3D_SHADER_WARNING_HLSL_IGNORED_MODIFIER = 5307, VKD3D_SHADER_WARNING_HLSL_IGNORED_MODIFIER = 5307,
VKD3D_SHADER_WARNING_HLSL_OVERRIDDEN_SEMANTIC = 5308,
VKD3D_SHADER_ERROR_GLSL_INTERNAL = 6000, VKD3D_SHADER_ERROR_GLSL_INTERNAL = 6000,
VKD3D_SHADER_ERROR_GLSL_BINDING_NOT_FOUND = 6001, VKD3D_SHADER_ERROR_GLSL_BINDING_NOT_FOUND = 6001,