Francisco Casas : vkd3d-shader/hlsl: Rename hlsl_struct_field.modifiers to "storage_modifiers".

[Alexandre Julliard]

Module: vkd3d
Branch: master
Commit: cc811dc3c210f5830cc928c9cd9444741c245e43
URL:    https://gitlab.winehq.org/wine/vkd3d/-/commit/cc811dc3c210f5830cc928c9cd9444...

Author: Francisco Casas 
Date:   Tue Nov 29 16:31:54 2022 -0300

vkd3d-shader/hlsl: Rename hlsl_struct_field.modifiers to "storage_modifiers".

---

libs/vkd3d-shader/hlsl.h         | 2 +-
 libs/vkd3d-shader/hlsl.y         | 2 +-
 libs/vkd3d-shader/hlsl_codegen.c | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h
index 74f62ad5..e80e315a 100644
--- a/libs/vkd3d-shader/hlsl.h
+++ b/libs/vkd3d-shader/hlsl.h
@@ -156,7 +156,7 @@ struct hlsl_struct_field
     struct hlsl_type *type;
     const char *name;
     struct hlsl_semantic semantic;
-    unsigned int modifiers;
+    unsigned int storage_modifiers;
     unsigned int reg_offset;

size_t name_bytecode_offset;
diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y
index d457ab97..eee487ef 100644
--- a/libs/vkd3d-shader/hlsl.y
+++ b/libs/vkd3d-shader/hlsl.y
@@ -983,7 +983,7 @@ static bool gen_struct_fields(struct hlsl_ctx *ctx, struct parse_fields *fields,
         field->loc = v->loc;
         field->name = v->name;
         field->semantic = v->semantic;
-        field->modifiers = modifiers;
+        field->storage_modifiers = modifiers;
         if (v->initializer.args_count)
         {
             hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_SYNTAX, "Illegal initializer on a struct field.");
diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c
index 45b6e1d0..d21e31be 100644
--- a/libs/vkd3d-shader/hlsl_codegen.c
+++ b/libs/vkd3d-shader/hlsl_codegen.c
@@ -313,7 +313,7 @@ static void prepend_input_struct_copy(struct hlsl_ctx *ctx, struct list *instrs,
         if (field->type->type == HLSL_CLASS_STRUCT)
             prepend_input_struct_copy(ctx, instrs, field_load);
         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
             hlsl_error(ctx, &field->loc, VKD3D_SHADER_ERROR_HLSL_MISSING_SEMANTIC,
                     "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)
             append_output_struct_copy(ctx, instrs, field_load);
         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
             hlsl_error(ctx, &field->loc, VKD3D_SHADER_ERROR_HLSL_MISSING_SEMANTIC,
                     "Field '%s' is missing a semantic.", field->name);