Francisco Casas : vkd3d-shader/hlsl: Rename HLSL_STORAGE_VOLATILE to HLSL_MODIFIER_VOLATILE.

[Alexandre Julliard]

Module: vkd3d
Branch: master
Commit: 23bd2d9ad8f296ab6002117ec5ac836a47775983
URL:    https://gitlab.winehq.org/wine/vkd3d/-/commit/23bd2d9ad8f296ab6002117ec5ac83...

Author: Francisco Casas 
Date:   Mon Dec 12 20:17:53 2022 -0300

vkd3d-shader/hlsl: Rename HLSL_STORAGE_VOLATILE to HLSL_MODIFIER_VOLATILE.

---

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

diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c
index 8aa289ac..b6773876 100644
--- a/libs/vkd3d-shader/hlsl.c
+++ b/libs/vkd3d-shader/hlsl.c
@@ -1491,7 +1491,7 @@ struct vkd3d_string_buffer *hlsl_modifiers_to_string(struct hlsl_ctx *ctx, unsig
         vkd3d_string_buffer_printf(string, "static ");
     if (modifiers & HLSL_STORAGE_UNIFORM)
         vkd3d_string_buffer_printf(string, "uniform ");
-    if (modifiers & HLSL_STORAGE_VOLATILE)
+    if (modifiers & HLSL_MODIFIER_VOLATILE)
         vkd3d_string_buffer_printf(string, "volatile ");
     if (modifiers & HLSL_MODIFIER_CONST)
         vkd3d_string_buffer_printf(string, "const ");
diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h
index b6a593ca..cab3d6e5 100644
--- a/libs/vkd3d-shader/hlsl.h
+++ b/libs/vkd3d-shader/hlsl.h
@@ -228,14 +228,14 @@ struct hlsl_attribute
 #define HLSL_STORAGE_GROUPSHARED     0x00000010
 #define HLSL_STORAGE_STATIC          0x00000020
 #define HLSL_STORAGE_UNIFORM         0x00000040
-#define HLSL_STORAGE_VOLATILE        0x00000080
+#define HLSL_MODIFIER_VOLATILE       0x00000080
 #define HLSL_MODIFIER_CONST          0x00000100
 #define HLSL_MODIFIER_ROW_MAJOR      0x00000200
 #define HLSL_MODIFIER_COLUMN_MAJOR   0x00000400
 #define HLSL_STORAGE_IN              0x00000800
 #define HLSL_STORAGE_OUT             0x00001000

-#define HLSL_TYPE_MODIFIERS_MASK     (HLSL_MODIFIER_PRECISE | HLSL_STORAGE_VOLATILE | \
+#define HLSL_TYPE_MODIFIERS_MASK     (HLSL_MODIFIER_PRECISE | HLSL_MODIFIER_VOLATILE | \
                                       HLSL_MODIFIER_CONST | HLSL_MODIFIER_ROW_MAJOR | \
                                       HLSL_MODIFIER_COLUMN_MAJOR)

diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y
index bd26228f..dfa90297 100644
--- a/libs/vkd3d-shader/hlsl.y
+++ b/libs/vkd3d-shader/hlsl.y
@@ -4353,7 +4353,7 @@ var_modifiers:
         }
     | KW_VOLATILE var_modifiers
         {
-            $$ = add_modifiers(ctx, $2, HLSL_STORAGE_VOLATILE, @1);
+            $$ = add_modifiers(ctx, $2, HLSL_MODIFIER_VOLATILE, @1);
         }
     | KW_CONST var_modifiers
         {