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: Handle error expressions in initializers.

Browse Source
This commit is contained in:
Elizabeth Figura 2024-08-29 12:48:23 -05:00 committed by Henri Verbeet
parent dfe79cb6a9
commit d95962068a
Notes: Henri Verbeet 2024-10-17 17:39:41 +02:00 
Approved-by: Francisco Casas (@fcasas)
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1185
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2512,6 +2512,14 @@ static void initialize_var(struct hlsl_ctx *ctx, struct hlsl_ir_var *dst,
{ {
unsigned int store_index = 0; unsigned int store_index = 0;
/* If any of the elements has an error type, then initializer_size() is not
* meaningful. */
for (unsigned int i = 0; i < initializer->args_count; ++i)
{
if (initializer->args[i]->data_type->class == HLSL_CLASS_ERROR)
return;
}
if (initializer_size(initializer) != hlsl_type_component_count(dst->data_type)) if (initializer_size(initializer) != hlsl_type_component_count(dst->data_type))
{ {
hlsl_error(ctx, &initializer->loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, hlsl_error(ctx, &initializer->loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT,