wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2024-11-21 16:46:41 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/hlsl: Tokenize 'String' the same as 'string'.

Browse Source 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
This commit is contained in:
Nikolay Sivov 2024-08-13 21:20:03 +02:00 committed by Henri Verbeet
parent 412f91a14c
commit 1ce68cee2c
Notes: Henri Verbeet 2024-08-14 22:15:51 +02:00 
Approved-by: Elizabeth Figura (@zfigura)
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/995
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libs/vkd3d-shader/hlsl.l
View File

@ -145,6 +145,7 @@ stateblock {return KW_STATEBLOCK; }
stateblock_state {return KW_STATEBLOCK_STATE; } stateblock_state {return KW_STATEBLOCK_STATE; }
static {return KW_STATIC; } static {return KW_STATIC; }
string {return KW_STRING; } string {return KW_STRING; }
String {return KW_STRING; }
struct {return KW_STRUCT; } struct {return KW_STRUCT; }
switch {return KW_SWITCH; } switch {return KW_SWITCH; }
tbuffer {return KW_TBUFFER; } tbuffer {return KW_TBUFFER; }

6
tests/hlsl/strings.shader_test
View File

@ -17,7 +17,7 @@ float4 main() : sv_target
return 0; return 0;
} }
[pixel shader todo fail(sm>=6)] [pixel shader fail(sm>=6)]
// Uninitialized strings are allowed for non-fx profiles // Uninitialized strings are allowed for non-fx profiles
String s; String s;
@ -34,7 +34,7 @@ float4 main() : sv_target
return 0; return 0;
} }
[pixel shader fail(sm<6) todo] [pixel shader fail(sm<6)]
typedef float4 String; typedef float4 String;
float4 main() : sv_target float4 main() : sv_target
@ -42,7 +42,7 @@ float4 main() : sv_target
return 0; return 0;
} }
[pixel shader fail(sm<6) todo] [pixel shader fail(sm<6)]
float4 String; float4 String;
float4 main() : sv_target float4 main() : sv_target