Zebediah Figura : vkd3d-shader: Implement multiplication and division in #if directives.

[Alexandre Julliard]

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

Author: Zebediah Figura <zfigura(a)codeweavers.com>
Date:   Tue Jan 19 11:18:19 2021 -0600

vkd3d-shader: Implement multiplication and division in #if directives.

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

---

 libs/vkd3d-shader/preproc.l              |  2 +-
 libs/vkd3d-shader/preproc.y              | 29 +++++++++++++++++++++++++++--
 libs/vkd3d-shader/vkd3d_shader_private.h |  1 +
 3 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/libs/vkd3d-shader/preproc.l b/libs/vkd3d-shader/preproc.l
index 011f8db..a522b7c 100644
--- a/libs/vkd3d-shader/preproc.l
+++ b/libs/vkd3d-shader/preproc.l
@@ -157,7 +157,7 @@ IDENTIFIER      [A-Za-z_][A-Za-z0-9_]*
     }
 
 <INITIAL>{WS}+                      {}
-<INITIAL>[-()\[\]{},+!]             {return yytext[0];}
+<INITIAL>[-()\[\]{},+!*/]           {return yytext[0];}
 <INITIAL>.                          {return T_TEXT;}
 
 %%
diff --git a/libs/vkd3d-shader/preproc.y b/libs/vkd3d-shader/preproc.y
index 51df5d4..eb2036c 100644
--- a/libs/vkd3d-shader/preproc.y
+++ b/libs/vkd3d-shader/preproc.y
@@ -335,6 +335,7 @@ static void free_parse_arg_names(struct parse_arg_names *args)
 
 %type <integer> primary_expr
 %type <integer> unary_expr
+%type <integer> mul_expr
 %type <string> body_token
 %type <const_string> body_token_const
 %type <string_buffer> body_text
@@ -439,6 +440,14 @@ body_token_const
         {
             $$ = "!";
         }
+    | '*'
+        {
+            $$ = "*";
+        }
+    | '/'
+        {
+            $$ = "/";
+        }
     | T_CONCAT
         {
             $$ = "##";
@@ -480,7 +489,7 @@ directive
             }
             vkd3d_free($2);
         }
-    | T_IF unary_expr T_NEWLINE
+    | T_IF mul_expr T_NEWLINE
         {
             if (!preproc_push_if(ctx, !!$2))
                 YYABORT;
@@ -495,7 +504,7 @@ directive
             preproc_push_if(ctx, !preproc_find_macro(ctx, $2));
             vkd3d_free($2);
         }
-    | T_ELIF unary_expr T_NEWLINE
+    | T_ELIF mul_expr T_NEWLINE
         {
             const struct preproc_file *file = preproc_get_top_file(ctx);
 
@@ -631,3 +640,19 @@ unary_expr
         {
             $$ = !$2;
         }
+
+mul_expr
+    : unary_expr
+    | mul_expr '*' unary_expr
+        {
+            $$ = $1 * $3;
+        }
+    | mul_expr '/' unary_expr
+        {
+            if (!$3)
+            {
+                preproc_warning(ctx, &@3, VKD3D_SHADER_WARNING_PP_DIV_BY_ZERO, "Division by zero.");
+                $3 = 1;
+            }
+            $$ = $1 / $3;
+        }
diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h
index 8d9821d..12edfae 100644
--- a/libs/vkd3d-shader/vkd3d_shader_private.h
+++ b/libs/vkd3d-shader/vkd3d_shader_private.h
@@ -90,6 +90,7 @@ enum vkd3d_shader_error
     VKD3D_SHADER_WARNING_PP_UNKNOWN_DIRECTIVE           = 4303,
     VKD3D_SHADER_WARNING_PP_UNTERMINATED_MACRO          = 4304,
     VKD3D_SHADER_WARNING_PP_UNTERMINATED_IF             = 4305,
+    VKD3D_SHADER_WARNING_PP_DIV_BY_ZERO                 = 4306,
 };
 
 enum VKD3D_SHADER_INSTRUCTION_HANDLER