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: Rename hlsl_struct_field.modifiers to "storage_modifiers".

Browse Source
This commit is contained in:
Francisco Casas 2022-11-29 16:31:54 -03:00 committed by Alexandre Julliard
parent 4dbbb8beb4
commit cc811dc3c2
Notes: Alexandre Julliard 2023-01-11 22:39:24 +01:00 
Approved-by: Giovanni Mascellani (@giomasce)
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/50
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/vkd3d-shader/hlsl.h
View File

@ -156,7 +156,7 @@ struct hlsl_struct_field
struct hlsl_type *type; struct hlsl_type *type;
const char *name; const char *name;
struct hlsl_semantic semantic; struct hlsl_semantic semantic;
unsigned int modifiers; unsigned int storage_modifiers;
unsigned int reg_offset; unsigned int reg_offset;
size_t name_bytecode_offset; size_t name_bytecode_offset;

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

@ -983,7 +983,7 @@ static bool gen_struct_fields(struct hlsl_ctx *ctx, struct parse_fields *fields,
field->loc = v->loc; field->loc = v->loc;
field->name = v->name; field->name = v->name;
field->semantic = v->semantic; field->semantic = v->semantic;
field->modifiers = modifiers; field->storage_modifiers = modifiers;
if (v->initializer.args_count) if (v->initializer.args_count)
{ {
hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_SYNTAX, "Illegal initializer on a struct field."); hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_SYNTAX, "Illegal initializer on a struct field.");

4
libs/vkd3d-shader/hlsl_codegen.c
View File

@ -313,7 +313,7 @@ static void prepend_input_struct_copy(struct hlsl_ctx *ctx, struct list *instrs,
if (field->type->type == HLSL_CLASS_STRUCT) if (field->type->type == HLSL_CLASS_STRUCT)
prepend_input_struct_copy(ctx, instrs, field_load); prepend_input_struct_copy(ctx, instrs, field_load);
else if (field->semantic.name) else if (field->semantic.name)
prepend_input_copy(ctx, instrs, field_load, field->modifiers, &field->semantic); prepend_input_copy(ctx, instrs, field_load, field->storage_modifiers, &field->semantic);
else else
hlsl_error(ctx, &field->loc, VKD3D_SHADER_ERROR_HLSL_MISSING_SEMANTIC, hlsl_error(ctx, &field->loc, VKD3D_SHADER_ERROR_HLSL_MISSING_SEMANTIC,
"Field '%s' is missing a semantic.", field->name); "Field '%s' is missing a semantic.", field->name);
@ -408,7 +408,7 @@ static void append_output_struct_copy(struct hlsl_ctx *ctx, struct list *instrs,
if (field->type->type == HLSL_CLASS_STRUCT) if (field->type->type == HLSL_CLASS_STRUCT)
append_output_struct_copy(ctx, instrs, field_load); append_output_struct_copy(ctx, instrs, field_load);
else if (field->semantic.name) else if (field->semantic.name)
append_output_copy(ctx, instrs, field_load, field->modifiers, &field->semantic); append_output_copy(ctx, instrs, field_load, field->storage_modifiers, &field->semantic);
else else
hlsl_error(ctx, &field->loc, VKD3D_SHADER_ERROR_HLSL_MISSING_SEMANTIC, hlsl_error(ctx, &field->loc, VKD3D_SHADER_ERROR_HLSL_MISSING_SEMANTIC,
"Field '%s' is missing a semantic.", field->name); "Field '%s' is missing a semantic.", field->name);