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: Parse integers with the 'u' postfix.

Browse Source
This commit is contained in:
Francisco Casas 2023-11-16 12:06:40 -03:00 committed by Alexandre Julliard
parent 3f09cdcaa1
commit 9a8f6e0edb
Notes: Alexandre Julliard 2023-11-22 22:49:11 +01:00 
Approved-by: Zebediah Figura (@zfigura)
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Henri Verbeet (@hverbeet)
Approved-by: Alexandre Julliard (@julliard)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/478
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -203,15 +203,15 @@ while {return KW_WHILE; }
yylval->floatval = atof(yytext); yylval->floatval = atof(yytext);
return C_FLOAT; return C_FLOAT;
} }
0x[0-9a-fA-F]+ { 0x[0-9a-fA-F]+[uU]? {
yylval->intval = vkd3d_parse_integer(yytext); yylval->intval = vkd3d_parse_integer(yytext);
return C_INTEGER; return C_INTEGER;
} }
0[0-7]+ { 0[0-7]+[uU]? {
yylval->intval = vkd3d_parse_integer(yytext); yylval->intval = vkd3d_parse_integer(yytext);
return C_INTEGER; return C_INTEGER;
} }
[0-9]+ { [0-9]+[uU]? {
yylval->intval = vkd3d_parse_integer(yytext); yylval->intval = vkd3d_parse_integer(yytext);
return C_INTEGER; return C_INTEGER;
} }

8
tests/hlsl/initializer-numeric.shader_test
View File

@ -48,7 +48,7 @@ draw quad
probe all rgba (10.1, 1.1, 1.2, 2.1) 4 probe all rgba (10.1, 1.1, 1.2, 2.1) 4
[pixel shader todo] [pixel shader]
float4 main() : sv_target float4 main() : sv_target
{ {
float4 aa = { 3U, 0xfau, 020u, -1u}; float4 aa = { 3U, 0xfau, 020u, -1u};
@ -56,14 +56,14 @@ float4 main() : sv_target
} }
[test] [test]
todo(sm<6) draw quad draw quad
todo(sm<6) probe all rgba (3.0, 250.0, 16.0, 4.2949673e+009) 4 todo(sm<6) probe all rgba (3.0, 250.0, 16.0, 4.2949673e+009) 4
[require] [require]
shader model < 6.0 shader model < 6.0
[pixel shader todo] [pixel shader]
float4 main() : sv_target float4 main() : sv_target
{ {
// 3000000000 is -1294967296 when it doesn't have the 'u' suffix, except in SM6. // 3000000000 is -1294967296 when it doesn't have the 'u' suffix, except in SM6.
@ -72,5 +72,5 @@ float4 main() : sv_target
} }
[test] [test]
todo draw quad draw quad
todo probe all rgba (-1294967296.0, 3000000000.0, 0.0, 0.0) 4 todo probe all rgba (-1294967296.0, 3000000000.0, 0.0, 0.0) 4