wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-09-12 18:50:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/hlsl: Validate stream output object declarations.

Browse Source 
Valid stream output objects must be single-element containing a
PointStream/LineStream/TriangleStream object.

Moreover, stream output objects cannot be declared globally.
This commit is contained in:
Shaun Ren
2025-03-06 11:17:29 -05:00
committed by Henri Verbeet
parent 870c68dd27
commit b650e7a503
Notes: Henri Verbeet 2025-03-12 22:20:50 +01:00 
Approved-by: Elizabeth Figura (@zfigura)
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1405
4 changed files with 51 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -234,6 +234,33 @@ unsigned int hlsl_get_multiarray_size(const struct hlsl_type *type)
return 1;
}
const struct hlsl_type *hlsl_get_stream_output_type(const struct hlsl_type *type)
{
unsigned int i;
switch (type->class)
{
case HLSL_CLASS_ARRAY:
return hlsl_get_stream_output_type(type->e.array.type);
case HLSL_CLASS_STRUCT:
for (i = 0; i < type->e.record.field_count; ++i)
{
const struct hlsl_type *field_type = hlsl_get_stream_output_type(type->e.record.fields[i].type);
if (field_type)
return field_type;
}
return NULL;
case HLSL_CLASS_STREAM_OUTPUT:
return type;
default:
return NULL;
}
}
bool hlsl_type_is_resource(const struct hlsl_type *type)
{
switch (type->class)
@@ -1138,6 +1165,7 @@ unsigned int hlsl_type_component_count(const struct hlsl_type *type)
case HLSL_CLASS_HULL_SHADER:
case HLSL_CLASS_GEOMETRY_SHADER:
case HLSL_CLASS_BLEND_STATE:
case HLSL_CLASS_STREAM_OUTPUT:
case HLSL_CLASS_NULL:
return 1;
@@ -1145,7 +1173,6 @@ unsigned int hlsl_type_component_count(const struct hlsl_type *type)
case HLSL_CLASS_PASS:
case HLSL_CLASS_TECHNIQUE:
case HLSL_CLASS_VOID:
case HLSL_CLASS_STREAM_OUTPUT:
break;
}