[PATCH vkd3d 5/5] vkd3d-shader: Implement the parenthetical operator in #if directives.
Zebediah Figura
zfigura at codeweavers.com
Thu Jan 21 16:10:47 CST 2021
Signed-off-by: Zebediah Figura <zfigura at codeweavers.com>
---
Makefile.am | 2 --
libs/vkd3d-shader/preproc.y | 4 ++++
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 76a2f31a..27d933c9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -243,8 +243,6 @@ XFAIL_TESTS = \
tests/hlsl-vector-indexing.shader_test \
tests/hlsl-vector-indexing-uniform.shader_test \
tests/math.shader_test \
- tests/preproc-if-expr.shader_test \
- tests/preproc-macro.shader_test \
tests/swizzle-0.shader_test \
tests/swizzle-1.shader_test \
tests/swizzle-2.shader_test \
diff --git a/libs/vkd3d-shader/preproc.y b/libs/vkd3d-shader/preproc.y
index aa381e8a..7a995430 100644
--- a/libs/vkd3d-shader/preproc.y
+++ b/libs/vkd3d-shader/preproc.y
@@ -693,6 +693,10 @@ primary_expr
$$ = !!preproc_find_macro(ctx, $3);
vkd3d_free($3);
}
+ | '(' expr ')'
+ {
+ $$ = $2;
+ }
unary_expr
: primary_expr
--
2.30.0
More information about the wine-devel
mailing list