wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2024-09-13 09:16:14 -07:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/hlsl: Check for duplicate attributes in function declaration.

Browse Source
This commit is contained in:
Shaun Ren 2024-08-11 21:50:54 -04:00 committed by Henri Verbeet
parent 855b9713b8
commit 73ee5a135a
Notes: Henri Verbeet 2024-09-04 18:50:05 +02:00 
Approved-by: Elizabeth Figura (@zfigura)
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1015
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libs/vkd3d-shader/hlsl.y
View File

@ -516,7 +516,7 @@ enum loop_type
LOOP_DO_WHILE LOOP_DO_WHILE
}; };
static bool attribute_list_has_duplicates(const struct parse_attribute_list *attrs) static void check_attribute_list_for_duplicates(struct hlsl_ctx *ctx, const struct parse_attribute_list *attrs)
{ {
unsigned int i, j; unsigned int i, j;
@ -525,11 +525,10 @@ static bool attribute_list_has_duplicates(const struct parse_attribute_list *att
for (j = i + 1; j < attrs->count; ++j) for (j = i + 1; j < attrs->count; ++j)
{ {
if (!strcmp(attrs->attrs[i]->name, attrs->attrs[j]->name)) if (!strcmp(attrs->attrs[i]->name, attrs->attrs[j]->name))
return true; hlsl_error(ctx, &attrs->attrs[j]->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_SYNTAX,
"Found duplicate attribute \"%s\".", attrs->attrs[j]->name);
} }
} }
return false;
} }
static void resolve_loop_continue(struct hlsl_ctx *ctx, struct hlsl_block *block, enum loop_type type, static void resolve_loop_continue(struct hlsl_ctx *ctx, struct hlsl_block *block, enum loop_type type,
@ -700,9 +699,7 @@ static struct hlsl_block *create_loop(struct hlsl_ctx *ctx, enum loop_type type,
unsigned int i, unroll_limit = 0; unsigned int i, unroll_limit = 0;
struct hlsl_ir_node *loop; struct hlsl_ir_node *loop;
if (attribute_list_has_duplicates(attributes)) check_attribute_list_for_duplicates(ctx, attributes);
hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_INVALID_SYNTAX, "Found duplicate attribute.");
check_loop_attributes(ctx, attributes, loc); check_loop_attributes(ctx, attributes, loc);
/* Ignore unroll(0) attribute, and any invalid attribute. */ /* Ignore unroll(0) attribute, and any invalid attribute. */
@ -6980,6 +6977,8 @@ func_prototype:
func_prototype_no_attrs func_prototype_no_attrs
| attribute_list func_prototype_no_attrs | attribute_list func_prototype_no_attrs
{ {
check_attribute_list_for_duplicates(ctx, &$1);
if ($2.first) if ($2.first)
{ {
$2.decl->attr_count = $1.count; $2.decl->attr_count = $1.count;
@ -8245,8 +8244,7 @@ selection_statement:
struct hlsl_ir_node *instr; struct hlsl_ir_node *instr;
unsigned int i; unsigned int i;
if (attribute_list_has_duplicates(attributes)) check_attribute_list_for_duplicates(ctx, attributes);
hlsl_error(ctx, &@1, VKD3D_SHADER_ERROR_HLSL_INVALID_SYNTAX, "Found duplicate attribute.");
for (i = 0; i < attributes->count; ++i) for (i = 0; i < attributes->count; ++i)
{ {

4
tests/hlsl/attributes.shader_test
View File

@ -77,12 +77,12 @@ float4 main() : sv_target { return 0; }
[one][two] [one][two]
float4 main() : sv_target { return 0; } float4 main() : sv_target { return 0; }
[pixel shader fail(sm<6) todo] [pixel shader fail(sm<6)]
[one][one] [one][one]
float4 main() : sv_target { return 0; } float4 main() : sv_target { return 0; }
[pixel shader fail(sm<6) todo] [pixel shader fail(sm<6)]
[one][one(1)] [one][one(1)]
float4 main() : sv_target { return 0; } float4 main() : sv_target { return 0; }