[PATCH 0/1] MR56: vkd3d-shader/hlsl: Fix typo (Coverity)
I assume this is a typo, right now it doesn't make sense. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> -- https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/56
From: Fabian Maurer <dark.shadow4(a)web.de> I assume this is a typo, right now it doesn't make sense. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- libs/vkd3d-shader/hlsl.y | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index eedc85bd..674a047c 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2922,7 +2922,7 @@ static bool add_method_call(struct hlsl_ctx *ctx, struct list *instrs, struct hl if (!strcmp(name, "Gather") || !offset_dim) { - if (params->args_count < 2 && params->args_count > 3 + !!offset_dim) + if (params->args_count < 2 || params->args_count > 3 + !!offset_dim) { hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, "Wrong number of arguments to method '%s': expected from 2 to %u, but got %u.", -- GitLab https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/56
Thanks for pointing this out! -- https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/56#note_19413
This merge request was approved by Francisco Casas. -- https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/56
This merge request was approved by Giovanni Mascellani. -- https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/56
This merge request was approved by Zebediah Figura. -- https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/56
I'll approve this, but I think the commit message is really unhelpful; except for the "vkd3d-shader/hlsl" part, it tells a reader nothing about which code it's touching or what change it's making. In the future, please try to briefly describe what the commit actually does in the commit message. -- https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/56#note_20614
This merge request was approved by Henri Verbeet. -- https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/56
participants (6)
-
Fabian Maurer -
Fabian Maurer (@DarkShadow44) -
Francisco Casas (@fcasas) -
Giovanni Mascellani (@giomasce) -
Henri Verbeet (@hverbeet) -
Zebediah Figura (@zfigura)