Module: vkd3d Branch: master Commit: fa5708d3b554d9534c1fcad0d7d1eae3a535cec1 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/fa5708d3b554d9534c1fcad0d7d1ea...
Author: Victor Chiletto vchiletto@codeweavers.com Date: Mon May 20 14:18:04 2024 -0300
vkd3d-shader/hlsl: Fix XOR assign operator lexing.
---
libs/vkd3d-shader/hlsl.l | 2 +- tests/hlsl/bitwise.shader_test | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/libs/vkd3d-shader/hlsl.l b/libs/vkd3d-shader/hlsl.l index 88b917ef..a5923d8b 100644 --- a/libs/vkd3d-shader/hlsl.l +++ b/libs/vkd3d-shader/hlsl.l @@ -191,7 +191,7 @@ while {return KW_WHILE; } %= {return OP_MODASSIGN; } &= {return OP_ANDASSIGN; } |= {return OP_ORASSIGN; } -^= {return OP_XORASSIGN; } +^= {return OP_XORASSIGN; }
{IDENTIFIER} { struct hlsl_ctx *ctx = yyget_extra(yyscanner); diff --git a/tests/hlsl/bitwise.shader_test b/tests/hlsl/bitwise.shader_test index 008ddce3..63971f52 100644 --- a/tests/hlsl/bitwise.shader_test +++ b/tests/hlsl/bitwise.shader_test @@ -96,7 +96,7 @@ float4 main() : SV_TARGET todo(glsl) draw quad probe all rgba (0.0, 1.0, 1.0, 0.0)
-[pixel shader todo(sm<6)] +[pixel shader] float4 main() : SV_TARGET { int a = 0; @@ -113,7 +113,7 @@ float4 main() : SV_TARGET }
[test] -todo(glsl|sm<6) draw quad +todo(glsl) draw quad probe all rgba (0.0, 1.0, 1.0, 0.0)
[pixel shader]