system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-14 23:02:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

d3dcompiler: Rename HLSL_MODIFIER_{IN, OUT} to HLSL_STORAGE_{IN, OUT}.

Browse source 
Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura 2020-03-15 16:25:09 -05:00 committed by Alexandre Julliard
parent cf2148e17c
commit a82ec54862
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
dlls/d3dcompiler_43/d3dcompiler_private.h
View file

@ -734,8 +734,8 @@ struct hlsl_ir_node
#define HLSL_MODIFIER_CONST 0x00000100 #define HLSL_MODIFIER_CONST 0x00000100
#define HLSL_MODIFIER_ROW_MAJOR 0x00000200 #define HLSL_MODIFIER_ROW_MAJOR 0x00000200
#define HLSL_MODIFIER_COLUMN_MAJOR 0x00000400 #define HLSL_MODIFIER_COLUMN_MAJOR 0x00000400
#define HLSL_MODIFIER_IN 0x00000800 #define HLSL_STORAGE_IN 0x00000800
#define HLSL_MODIFIER_OUT 0x00001000 #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_STORAGE_VOLATILE | \
HLSL_MODIFIER_CONST | HLSL_MODIFIER_ROW_MAJOR | \ HLSL_MODIFIER_CONST | HLSL_MODIFIER_ROW_MAJOR | \

8
dlls/d3dcompiler_43/hlsl.y
View file

@ -1489,7 +1489,7 @@ parameter: input_mods var_modifiers type any_identifier colon_att
if (!(type = apply_type_modifiers($3, &modifiers, get_location(&@2)))) if (!(type = apply_type_modifiers($3, &modifiers, get_location(&@2))))
YYABORT; YYABORT;
$$.modifiers = $1 ? $1 : HLSL_MODIFIER_IN; $$.modifiers = $1 ? $1 : HLSL_STORAGE_IN;
$$.modifiers |= modifiers; $$.modifiers |= modifiers;
$$.type = type; $$.type = type;
$$.name = $4; $$.name = $4;
@ -1514,15 +1514,15 @@ input_mods: /* Empty */
input_mod: KW_IN input_mod: KW_IN
{ {
$$ = HLSL_MODIFIER_IN; $$ = HLSL_STORAGE_IN;
} }
| KW_OUT | KW_OUT
{ {
$$ = HLSL_MODIFIER_OUT; $$ = HLSL_STORAGE_OUT;
} }
| KW_INOUT | KW_INOUT
{ {
$$ = HLSL_MODIFIER_IN | HLSL_MODIFIER_OUT; $$ = HLSL_STORAGE_IN | HLSL_STORAGE_OUT;
} }
type: base_type type: base_type

6
dlls/d3dcompiler_43/utils.c
View file

@ -1808,11 +1808,11 @@ const char *debug_modifiers(DWORD modifiers)
strcat(string, " row_major"); /* 10 */ strcat(string, " row_major"); /* 10 */
if (modifiers & HLSL_MODIFIER_COLUMN_MAJOR) if (modifiers & HLSL_MODIFIER_COLUMN_MAJOR)
strcat(string, " column_major"); /* 13 */ 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 */ strcat(string, " inout"); /* 6 */
else if (modifiers & HLSL_MODIFIER_IN) else if (modifiers & HLSL_STORAGE_IN)
strcat(string, " in"); /* 3 */ strcat(string, " in"); /* 3 */
else if (modifiers & HLSL_MODIFIER_OUT) else if (modifiers & HLSL_STORAGE_OUT)
strcat(string, " out"); /* 4 */ strcat(string, " out"); /* 4 */
return wine_dbg_sprintf("%s", string[0] ? string + 1 : ""); return wine_dbg_sprintf("%s", string[0] ? string + 1 : "");