Module: wine Branch: master Commit: a82ec54862fb092df32acd1d9690af4784c31624 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a82ec54862fb092df32acd1d9...
Author: Zebediah Figura z.figura12@gmail.com Date: Sun Mar 15 16:25:09 2020 -0500
d3dcompiler: Rename HLSL_MODIFIER_{IN, OUT} to HLSL_STORAGE_{IN, OUT}.
Signed-off-by: Zebediah Figura zfigura@codeweavers.com Signed-off-by: Matteo Bruni mbruni@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/d3dcompiler_43/d3dcompiler_private.h | 4 ++-- dlls/d3dcompiler_43/hlsl.y | 8 ++++---- dlls/d3dcompiler_43/utils.c | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 830434c9ff..957fc24e20 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -734,8 +734,8 @@ struct hlsl_ir_node #define HLSL_MODIFIER_CONST 0x00000100 #define HLSL_MODIFIER_ROW_MAJOR 0x00000200 #define HLSL_MODIFIER_COLUMN_MAJOR 0x00000400 -#define HLSL_MODIFIER_IN 0x00000800 -#define HLSL_MODIFIER_OUT 0x00001000 +#define HLSL_STORAGE_IN 0x00000800 +#define HLSL_STORAGE_OUT 0x00001000
#define HLSL_TYPE_MODIFIERS_MASK (HLSL_MODIFIER_PRECISE | HLSL_STORAGE_VOLATILE | \ HLSL_MODIFIER_CONST | HLSL_MODIFIER_ROW_MAJOR | \ diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 6a5dddf5d4..fca4ebc529 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -1489,7 +1489,7 @@ parameter: input_mods var_modifiers type any_identifier colon_att if (!(type = apply_type_modifiers($3, &modifiers, get_location(&@2)))) YYABORT;
- $$.modifiers = $1 ? $1 : HLSL_MODIFIER_IN; + $$.modifiers = $1 ? $1 : HLSL_STORAGE_IN; $$.modifiers |= modifiers; $$.type = type; $$.name = $4; @@ -1514,15 +1514,15 @@ input_mods: /* Empty */
input_mod: KW_IN { - $$ = HLSL_MODIFIER_IN; + $$ = HLSL_STORAGE_IN; } | KW_OUT { - $$ = HLSL_MODIFIER_OUT; + $$ = HLSL_STORAGE_OUT; } | KW_INOUT { - $$ = HLSL_MODIFIER_IN | HLSL_MODIFIER_OUT; + $$ = HLSL_STORAGE_IN | HLSL_STORAGE_OUT; }
type: base_type diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 29b35c3d7e..3e8e229c8c 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -1808,11 +1808,11 @@ const char *debug_modifiers(DWORD modifiers) strcat(string, " row_major"); /* 10 */ if (modifiers & HLSL_MODIFIER_COLUMN_MAJOR) strcat(string, " column_major"); /* 13 */ - if ((modifiers & (HLSL_MODIFIER_IN | HLSL_MODIFIER_OUT)) == (HLSL_MODIFIER_IN | HLSL_MODIFIER_OUT)) + if ((modifiers & (HLSL_STORAGE_IN | HLSL_STORAGE_OUT)) == (HLSL_STORAGE_IN | HLSL_STORAGE_OUT)) strcat(string, " inout"); /* 6 */ - else if (modifiers & HLSL_MODIFIER_IN) + else if (modifiers & HLSL_STORAGE_IN) strcat(string, " in"); /* 3 */ - else if (modifiers & HLSL_MODIFIER_OUT) + else if (modifiers & HLSL_STORAGE_OUT) strcat(string, " out"); /* 4 */
return wine_dbg_sprintf("%s", string[0] ? string + 1 : "");