wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-01-28 13:05:02 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/hlsl: Simplify type_has_object_components().

Browse Source 
The extra argument is not very easy to intuit. Since all we're trying to do here is check whether the type is a struct with object components in it, write that out explicitly.
This commit is contained in:
Zebediah Figura 2024-01-26 16:09:16 -06:00 committed by Alexandre Julliard
parent 1e7d82798c
commit 54f2dfe403
Notes: Alexandre Julliard 2024-04-03 00:21:18 +02:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Henri Verbeet (@hverbeet)
Approved-by: Alexandre Julliard (@julliard)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/745
1 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2091,12 +2091,12 @@ static void initialize_var_components(struct hlsl_ctx *ctx, struct hlsl_block *i
} }
} }
static bool type_has_object_components(struct hlsl_type *type, bool must_be_in_struct) static bool type_has_object_components(const struct hlsl_type *type)
{ {
if (type->class == HLSL_CLASS_OBJECT) if (type->class == HLSL_CLASS_OBJECT)
return !must_be_in_struct; return true;
if (type->class == HLSL_CLASS_ARRAY) if (type->class == HLSL_CLASS_ARRAY)
return type_has_object_components(type->e.array.type, must_be_in_struct); return type_has_object_components(type->e.array.type);
if (type->class == HLSL_CLASS_STRUCT) if (type->class == HLSL_CLASS_STRUCT)
{ {
@ -2104,7 +2104,7 @@ static bool type_has_object_components(struct hlsl_type *type, bool must_be_in_s
for (i = 0; i < type->e.record.field_count; ++i) for (i = 0; i < type->e.record.field_count; ++i)
{ {
if (type_has_object_components(type->e.record.fields[i].type, false)) if (type_has_object_components(type->e.record.fields[i].type))
return true; return true;
} }
} }
@ -2146,6 +2146,18 @@ static void check_invalid_in_out_modifiers(struct hlsl_ctx *ctx, unsigned int mo
} }
} }
static void check_invalid_object_fields(struct hlsl_ctx *ctx, const struct hlsl_ir_var *var)
{
const struct hlsl_type *type = var->data_type;
while (type->class == HLSL_CLASS_ARRAY)
type = type->e.array.type;
if (type->class == HLSL_CLASS_STRUCT && type_has_object_components(type))
hlsl_error(ctx, &var->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE,
"Target profile doesn't support objects as struct members in uniform variables.");
}
static void declare_var(struct hlsl_ctx *ctx, struct parse_variable_def *v) static void declare_var(struct hlsl_ctx *ctx, struct parse_variable_def *v)
{ {
struct hlsl_type *basic_type = v->basic_type; struct hlsl_type *basic_type = v->basic_type;
@ -2271,12 +2283,8 @@ static void declare_var(struct hlsl_ctx *ctx, struct parse_variable_def *v)
if (!(modifiers & HLSL_STORAGE_STATIC)) if (!(modifiers & HLSL_STORAGE_STATIC))
var->storage_modifiers |= HLSL_STORAGE_UNIFORM; var->storage_modifiers |= HLSL_STORAGE_UNIFORM;
if (ctx->profile->major_version < 5 && (var->storage_modifiers & HLSL_STORAGE_UNIFORM) && if (ctx->profile->major_version < 5 && (var->storage_modifiers & HLSL_STORAGE_UNIFORM))
type_has_object_components(var->data_type, true)) check_invalid_object_fields(ctx, var);
{
hlsl_error(ctx, &var->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE,
"Target profile doesn't support objects as struct members in uniform variables.");
}
if ((func = hlsl_get_first_func_decl(ctx, var->name))) if ((func = hlsl_get_first_func_decl(ctx, var->name)))
{ {
@ -2312,7 +2320,7 @@ static void declare_var(struct hlsl_ctx *ctx, struct parse_variable_def *v)
} }
if ((var->storage_modifiers & HLSL_STORAGE_STATIC) && type_has_numeric_components(var->data_type) if ((var->storage_modifiers & HLSL_STORAGE_STATIC) && type_has_numeric_components(var->data_type)
&& type_has_object_components(var->data_type, false)) && type_has_object_components(var->data_type))
{ {
hlsl_error(ctx, &var->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, hlsl_error(ctx, &var->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE,
"Static variables cannot have both numeric and resource components."); "Static variables cannot have both numeric and resource components.");
@ -2400,7 +2408,7 @@ static struct hlsl_block *initialize_vars(struct hlsl_ctx *ctx, struct list *var
/* Initialize statics to zero by default. */ /* Initialize statics to zero by default. */
if (type_has_object_components(var->data_type, false)) if (type_has_object_components(var->data_type))
{ {
free_parse_variable_def(v); free_parse_variable_def(v);
continue; continue;