[PATCH v2 5/8] vkd3d-shader/hlsl: Allow annotations on techniques.

[Nikolay Sivov]

From: Nikolay Sivov

Signed-off-by: Nikolay Sivov 
---
 libs/vkd3d-shader/hlsl.y              | 15 ++++++++-------
 tests/hlsl/technique-fx_4.shader_test |  6 +++---
 tests/hlsl/technique-fx_5.shader_test |  4 ++--
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y
index 1b9714619..e1b84567e 100644
--- a/libs/vkd3d-shader/hlsl.y
+++ b/libs/vkd3d-shader/hlsl.y
@@ -1122,7 +1122,7 @@ static bool add_pass(struct hlsl_ctx *ctx, const char *name, struct hlsl_scope *
 }

static bool add_technique(struct hlsl_ctx *ctx, const char *name, struct hlsl_scope *scope,
-        const char *typename, const struct vkd3d_shader_location *loc)
+        struct hlsl_scope *annotations, const char *typename, const struct vkd3d_shader_location *loc)
 {
     struct hlsl_ir_var *var;
     struct hlsl_type *type;
@@ -1131,6 +1131,7 @@ static bool add_technique(struct hlsl_ctx *ctx, const char *name, struct hlsl_sc
     if (!(var = hlsl_new_var(ctx, name, type, loc, NULL, 0, NULL)))
         return false;
     var->scope = scope;
+    var->annotations = annotations;

if (!hlsl_add_var(ctx, var, false))
     {
@@ -5223,17 +5224,17 @@ passes:
     | scope_start pass_list

technique9:
-      KW_TECHNIQUE name_opt '{' passes '}'
+      KW_TECHNIQUE name_opt annotations_opt '{' passes '}'
         {
             struct hlsl_scope *scope = ctx->cur_scope;
             hlsl_pop_scope(ctx);

-            if (!add_technique(ctx, $2, scope, "technique", &@1))
+            if (!add_technique(ctx, $2, scope, $3, "technique", &@1))
                 YYABORT;
         }

technique10:
-      KW_TECHNIQUE10 name_opt '{' passes '}'
+      KW_TECHNIQUE10 name_opt annotations_opt '{' passes '}'
         {
             struct hlsl_scope *scope = ctx->cur_scope;
             hlsl_pop_scope(ctx);
@@ -5242,12 +5243,12 @@ technique10:
                 hlsl_error(ctx, &@1, VKD3D_SHADER_ERROR_HLSL_INVALID_SYNTAX,
                         "The 'technique10' keyword is invalid for this profile.");

-            if (!add_technique(ctx, $2, scope, "technique10", &@1))
+            if (!add_technique(ctx, $2, scope, $3, "technique10", &@1))
                 YYABORT;
         }

technique11:
-      KW_TECHNIQUE11 name_opt '{' passes '}'
+      KW_TECHNIQUE11 name_opt annotations_opt '{' passes '}'
         {
             struct hlsl_scope *scope = ctx->cur_scope;
             hlsl_pop_scope(ctx);
@@ -5256,7 +5257,7 @@ technique11:
                 hlsl_error(ctx, &@1, VKD3D_SHADER_ERROR_HLSL_INVALID_SYNTAX,
                         "The 'technique11' keyword is invalid for this profile.");

-            if (!add_technique(ctx, $2, scope, "technique11", &@1))
+            if (!add_technique(ctx, $2, scope, $3, "technique11", &@1))
                 YYABORT;
         }

diff --git a/tests/hlsl/technique-fx_4.shader_test b/tests/hlsl/technique-fx_4.shader_test
index fde5e045f..591277dea 100644
--- a/tests/hlsl/technique-fx_4.shader_test
+++ b/tests/hlsl/technique-fx_4.shader_test
@@ -143,19 +143,19 @@ fxgroup group
     technique10 {}
 }

-[effect todo]
+[effect]
 // Annotations on techniques
 technique10 t1 < int a = 1; > {}
 technique10 t2 < int a = 2; int t1 = 3; int t2 = 4; > {}

-[effect todo]
+[effect]
 // Annotations on passes
 technique10 t1 < int a = 1; >
 {
     pass < int t1 = 2; > {}
 }

-[effect todo]
+[effect]
 // Using names from the global scope
 float a;

diff --git a/tests/hlsl/technique-fx_5.shader_test b/tests/hlsl/technique-fx_5.shader_test
index 1485ab84f..5f63b0b4a 100644
--- a/tests/hlsl/technique-fx_5.shader_test
+++ b/tests/hlsl/technique-fx_5.shader_test
@@ -228,7 +228,7 @@ fxgroup group1 < int a = 0; >
     technique11 t2 < int a = 2; int t1 = 3; int t2 = 4; > {}
 }

-[effect todo]
+[effect]
 // Annotations on passes
 fxgroup group1 < int a = 0; >
 {
@@ -238,7 +238,7 @@ fxgroup group1 < int a = 0; >
     }
 }

-[effect todo]
+[effect]
 // Using names from the global scope
 float a;