Giovanni Mascellani : vkd3d-shader/hlsl: Parse logical OR.

[Alexandre Julliard]

Module: vkd3d
Branch: master
Commit: 786f95ffcf558fc59c731d99dd93e092c8f209e5
URL:    https://source.winehq.org/git/vkd3d.git/?a=commit;h=786f95ffcf558fc59c731d99...

Author: Giovanni Mascellani <gmascellani(a)codeweavers.com>
Date:   Thu Feb 24 12:45:17 2022 -0600

vkd3d-shader/hlsl: Parse logical OR.

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com>
Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 libs/vkd3d-shader/hlsl.y | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y
index bb24e39..4cdb471 100644
--- a/libs/vkd3d-shader/hlsl.y
+++ b/libs/vkd3d-shader/hlsl.y
@@ -3706,7 +3706,7 @@ logicor_expr:
       logicand_expr
     | logicor_expr OP_OR logicand_expr
         {
-            hlsl_fixme(ctx, &@$, "Logical OR.");
+            $$ = add_binary_logical_expr_merge(ctx, $1, $3, HLSL_OP2_LOGIC_OR, &@2);
         }
 
 conditional_expr: