wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2024-11-21 16:46:41 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/hlsl: Properly check argument count in gather methods.

Browse Source
This commit is contained in:
Francisco Casas 2022-04-27 18:03:22 -04:00 committed by Alexandre Julliard
parent 32e6f594f2
commit 609632279f
Notes: Alexandre Julliard 2022-10-18 00:13:00 +02:00 
Approved-by: Zebediah Figura (@zfigura)
Approved-by: Henri Verbeet (@hverbeet)
Approved-by: Alexandre Julliard (@julliard)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/9
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2671,12 +2671,13 @@ static bool add_method_call(struct hlsl_ctx *ctx, struct list *instrs, struct hl
read_channel = 0; read_channel = 0;
} }
if (!strcmp(name, "Gather")) if (!strcmp(name, "Gather") || !offset_dim)
{ {
if (params->args_count != 2 && params->args_count != 3) if (params->args_count < 2 && params->args_count > 3 + !!offset_dim)
{ {
hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT,
"Wrong number of arguments to method 'Gather': expected 2 or 3, but got %u.", params->args_count); "Wrong number of arguments to method '%s': expected from 2 to %u, but got %u.",
name, 3 + !!offset_dim, params->args_count);
return false; return false;
} }
} }
@ -2688,13 +2689,14 @@ static bool add_method_call(struct hlsl_ctx *ctx, struct list *instrs, struct hl
return false; return false;
} }
if (params->args_count == 4 || params->args_count == 7) if (params->args_count == 3 + !!offset_dim || params->args_count == 7)
hlsl_fixme(ctx, loc, "Tiled resource status argument."); hlsl_fixme(ctx, loc, "Tiled resource status argument.");
if (params->args_count == 6 || params->args_count == 7) if (params->args_count == 6 || params->args_count == 7)
hlsl_fixme(ctx, loc, "Multiple Gather() offset parameters."); {
hlsl_fixme(ctx, loc, "Multiple %s() offset parameters.", name);
if (params->args_count == 3 || params->args_count == 4) }
else if (offset_dim && params->args_count > 2)
{ {
if (!(offset = add_implicit_conversion(ctx, instrs, params->args[2], if (!(offset = add_implicit_conversion(ctx, instrs, params->args[2],
hlsl_get_vector_type(ctx, HLSL_TYPE_INT, offset_dim), loc))) hlsl_get_vector_type(ctx, HLSL_TYPE_INT, offset_dim), loc)))