Nikolay Sivov : vkd3d-shader/hlsl: Parse "if" statement attributes.

[Alexandre Julliard]

Module: vkd3d
Branch: master
Commit: 1153f6bb3496ad53df0caa2dd3767e9659a36733
URL:    https://gitlab.winehq.org/wine/vkd3d/-/commit/1153f6bb3496ad53df0caa2dd3767e...

Author: Nikolay Sivov 
Date:   Thu Aug 10 10:03:49 2023 +0200

vkd3d-shader/hlsl: Parse "if" statement attributes.

Signed-off-by: Nikolay Sivov

---

libs/vkd3d-shader/hlsl.y                 | 36 +++++++++++++++++++++++++-------
 libs/vkd3d-shader/vkd3d_shader_private.h |  1 +
 tests/hlsl/conditional.shader_test       | 16 +++++++-------
 3 files changed, 37 insertions(+), 16 deletions(-)

diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y
index 29e0ff0c..048f7232 100644
--- a/libs/vkd3d-shader/hlsl.y
+++ b/libs/vkd3d-shader/hlsl.y
@@ -6108,19 +6108,39 @@ jump_statement:
         }

selection_statement:
-      KW_IF '(' expr ')' if_body
+      attribute_list_optional KW_IF '(' expr ')' if_body
         {
-            struct hlsl_ir_node *condition = node_from_block($3);
+            struct hlsl_ir_node *condition = node_from_block($4);
+            const struct parse_attribute_list *attributes = &$1;
             struct hlsl_ir_node *instr;
+            unsigned int i;
+
+            if (attribute_list_has_duplicates(attributes))
+                hlsl_error(ctx, &@1, VKD3D_SHADER_ERROR_HLSL_INVALID_SYNTAX, "Found duplicate attribute.");

-            if (!(instr = hlsl_new_if(ctx, condition, $5.then_block, $5.else_block, &@1)))
+            for (i = 0; i < attributes->count; ++i)
             {
-                destroy_block($5.then_block);
-                destroy_block($5.else_block);
+                const struct hlsl_attribute *attr = attributes->attrs[i];
+
+                if (!strcmp(attr->name, "branch")
+                        || !strcmp(attr->name, "flatten"))
+                {
+                    hlsl_warning(ctx, &@1, VKD3D_SHADER_WARNING_HLSL_IGNORED_ATTRIBUTE, "Unhandled attribute '%s'.", attr->name);
+                }
+                else
+                {
+                    hlsl_warning(ctx, &@1, VKD3D_SHADER_WARNING_HLSL_UNKNOWN_ATTRIBUTE, "Unrecognized attribute '%s'.", attr->name);
+                }
+            }
+
+            if (!(instr = hlsl_new_if(ctx, condition, $6.then_block, $6.else_block, &@2)))
+            {
+                destroy_block($6.then_block);
+                destroy_block($6.else_block);
                 YYABORT;
             }
-            destroy_block($5.then_block);
-            destroy_block($5.else_block);
+            destroy_block($6.then_block);
+            destroy_block($6.else_block);
             if (condition->data_type->dimx > 1 || condition->data_type->dimy > 1)
             {
                 struct vkd3d_string_buffer *string;
@@ -6130,7 +6150,7 @@ selection_statement:
                             "if condition type %s is not scalar.", string->buffer);
                 hlsl_release_string_buffer(ctx, string);
             }
-            $$ = $3;
+            $$ = $4;
             hlsl_block_add_instr($$, instr);
         }

diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h
index bf925a44..7cfaba56 100644
--- a/libs/vkd3d-shader/vkd3d_shader_private.h
+++ b/libs/vkd3d-shader/vkd3d_shader_private.h
@@ -140,6 +140,7 @@ enum vkd3d_shader_error
     VKD3D_SHADER_WARNING_HLSL_UNKNOWN_ATTRIBUTE         = 5302,
     VKD3D_SHADER_WARNING_HLSL_IMAGINARY_NUMERIC_RESULT  = 5303,
     VKD3D_SHADER_WARNING_HLSL_NON_FINITE_RESULT         = 5304,
+    VKD3D_SHADER_WARNING_HLSL_IGNORED_ATTRIBUTE         = 5305,

VKD3D_SHADER_ERROR_GLSL_INTERNAL                    = 6000,

diff --git a/tests/hlsl/conditional.shader_test b/tests/hlsl/conditional.shader_test
index 2d2ba2e9..b3b18dc1 100644
--- a/tests/hlsl/conditional.shader_test
+++ b/tests/hlsl/conditional.shader_test
@@ -15,7 +15,7 @@ uniform 0 float4 0.1 0.0 0.0 0.0
 draw quad
 probe all rgba (0.1, 0.2, 0.3, 0.4)

-[pixel shader todo]
+[pixel shader]
 float4 main(uniform float4 u) : sv_target
 {
     [attr1]
@@ -25,7 +25,7 @@ float4 main(uniform float4 u) : sv_target
         return float4(0.9, 0.8, 0.7, 0.6);
 }

-[pixel shader todo]
+[pixel shader]
 float4 main(uniform float4 u) : sv_target
 {
     [flatten]
@@ -37,8 +37,8 @@ float4 main(uniform float4 u) : sv_target

[test]
 uniform 0 float4 0.0 0.0 0.0 0.0
-todo draw quad
-todo probe all rgba (0.9, 0.8, 0.7, 0.6)
+draw quad
+probe all rgba (0.9, 0.8, 0.7, 0.6)

[pixel shader fail]
 float4 u;
@@ -52,7 +52,7 @@ float main() : sv_target
         return float4(0.9, 0.8, 0.7, 0.6);
 }

-[pixel shader fail]
+[pixel shader fail todo]
 float4 u;

float main() : sv_target
@@ -68,7 +68,7 @@ float main() : sv_target
 [require]
 shader model >= 3.0

-[pixel shader todo]
+[pixel shader]
 float4 main(uniform float4 u) : sv_target
 {
     [branch]
@@ -80,5 +80,5 @@ float4 main(uniform float4 u) : sv_target

[test]
 uniform 0 float4 0.0 0.0 0.0 0.0
-todo draw quad
-todo probe all rgba (0.9, 0.8, 0.7, 0.6)
+draw quad
+probe all rgba (0.9, 0.8, 0.7, 0.6)