wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-04-13 05:43:18 -07:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/hlsl: Set component count for objects to 1.

Browse Source 
Signed-off-by: Francisco Casas <fcasas@codeweavers.com>
This commit is contained in:
Francisco Casas
2022-07-22 12:42:17 -04:00
committed by Alexandre Julliard
parent e9829fdc65
commit 732f1737f4
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/7
2 changed files with 26 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
libs/vkd3d-shader/hlsl.c
View File

@ -548,25 +548,32 @@ struct hlsl_ir_function_decl *hlsl_get_func_decl(struct hlsl_ctx *ctx, const cha
unsigned int hlsl_type_component_count(const struct hlsl_type *type) unsigned int hlsl_type_component_count(const struct hlsl_type *type)
{ {
unsigned int count = 0, i; switch (type->type)
{
case HLSL_CLASS_SCALAR:
case HLSL_CLASS_VECTOR:
case HLSL_CLASS_MATRIX:
return type->dimx * type->dimy;
if (type->type <= HLSL_CLASS_LAST_NUMERIC) case HLSL_CLASS_STRUCT:
{ {
return type->dimx * type->dimy; unsigned int count = 0, i;
}
if (type->type == HLSL_CLASS_ARRAY)
{
return hlsl_type_component_count(type->e.array.type) * type->e.array.elements_count;
}
if (type->type != HLSL_CLASS_STRUCT)
{
ERR("Unexpected data type %#x.\n", type->type);
return 0;
}
for (i = 0; i < type->e.record.field_count; ++i) for (i = 0; i < type->e.record.field_count; ++i)
count += hlsl_type_component_count(type->e.record.fields[i].type); count += hlsl_type_component_count(type->e.record.fields[i].type);
return count; return count;
}
case HLSL_CLASS_ARRAY:
return hlsl_type_component_count(type->e.array.type) * type->e.array.elements_count;
case HLSL_CLASS_OBJECT:
return 1;
default:
assert(0);
return 0;
}
} }
bool hlsl_types_are_equal(const struct hlsl_type *t1, const struct hlsl_type *t2) bool hlsl_types_are_equal(const struct hlsl_type *t1, const struct hlsl_type *t2)

4
tests/hlsl-initializer-objects.shader_test
View File

@ -71,7 +71,7 @@ float4 main() : sv_target
} }
[pixel shader fail todo] [pixel shader fail]
Texture2D tex; Texture2D tex;
struct foo struct foo
@ -90,7 +90,7 @@ float4 main() : sv_target
} }
[pixel shader fail todo] [pixel shader fail]
Texture2D tex; Texture2D tex;
struct foo struct foo