[PATCH v2 4/6] vkd3d-shader/hlsl: Add variables for techniques.

[Nikolay Sivov]

From: Nikolay Sivov

Signed-off-by: Nikolay Sivov 
---
 libs/vkd3d-shader/hlsl.c              |  3 +++
 libs/vkd3d-shader/hlsl.h              |  3 +++
 libs/vkd3d-shader/hlsl.y              | 36 ++++++++++++++++++++++++---
 tests/hlsl/technique-fx_2.shader_test |  6 ++---
 tests/hlsl/technique-fx_4.shader_test |  4 +--
 tests/hlsl/technique-fx_5.shader_test |  4 +--
 6 files changed, 46 insertions(+), 10 deletions(-)

diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c
index c8677f41..bf93ac13 100644
--- a/libs/vkd3d-shader/hlsl.c
+++ b/libs/vkd3d-shader/hlsl.c
@@ -3388,6 +3388,9 @@ static void declare_predefined_types(struct hlsl_ctx *ctx)
         {"float",           HLSL_CLASS_SCALAR, HLSL_TYPE_FLOAT,         1, 1},
         {"vector",          HLSL_CLASS_VECTOR, HLSL_TYPE_FLOAT,         4, 1},
         {"matrix",          HLSL_CLASS_MATRIX, HLSL_TYPE_FLOAT,         4, 4},
+        {"technique",       HLSL_CLASS_OBJECT, HLSL_TYPE_TECHNIQUE,     1, 1},
+        {"technique10",     HLSL_CLASS_OBJECT, HLSL_TYPE_TECHNIQUE10,   1, 1},
+        {"technique11",     HLSL_CLASS_OBJECT, HLSL_TYPE_TECHNIQUE11,   1, 1},
         {"STRING",          HLSL_CLASS_OBJECT, HLSL_TYPE_STRING,        1, 1},
         {"TEXTURE",         HLSL_CLASS_OBJECT, HLSL_TYPE_TEXTURE,       1, 1},
         {"PIXELSHADER",     HLSL_CLASS_OBJECT, HLSL_TYPE_PIXELSHADER,   1, 1},
diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h
index 309d7080..8fd1429b 100644
--- a/libs/vkd3d-shader/hlsl.h
+++ b/libs/vkd3d-shader/hlsl.h
@@ -95,6 +95,9 @@ enum hlsl_base_type
     HLSL_TYPE_UAV,
     HLSL_TYPE_PIXELSHADER,
     HLSL_TYPE_VERTEXSHADER,
+    HLSL_TYPE_TECHNIQUE,
+    HLSL_TYPE_TECHNIQUE10,
+    HLSL_TYPE_TECHNIQUE11,
     HLSL_TYPE_STRING,
     HLSL_TYPE_VOID,
 };
diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y
index 80feffa2..ff406cd6 100644
--- a/libs/vkd3d-shader/hlsl.y
+++ b/libs/vkd3d-shader/hlsl.y
@@ -1096,6 +1096,33 @@ static bool add_func_parameter(struct hlsl_ctx *ctx, struct hlsl_func_parameters
     return true;
 }

+static bool add_technique(struct hlsl_ctx *ctx, const char *name, const char *typename,
+        const struct vkd3d_shader_location *loc)
+{
+    struct hlsl_ir_var *var;
+    struct hlsl_type *type;
+
+    if (!name)
+        name = hlsl_sprintf_alloc(ctx, "<technique-%u>", ctx->internal_name_counter++);
+    type = hlsl_get_type(ctx->globals, typename, false, false);
+
+    if (!(var = hlsl_new_var(ctx, name, type, loc, NULL, 0, NULL)))
+        return false;
+
+    if (!hlsl_add_var(ctx, var, false))
+    {
+        struct hlsl_ir_var *old = hlsl_get_var(ctx->cur_scope, var->name);
+
+        hlsl_error(ctx, &var->loc, VKD3D_SHADER_ERROR_HLSL_REDEFINED,
+                "Variable "%s" was already declared in this scope.", var->name);
+        hlsl_note(ctx, &old->loc, VKD3D_SHADER_LOG_ERROR, ""%s" was previously declared here.", old->name);
+        hlsl_free_var(var);
+        return false;
+    }
+
+    return true;
+}
+
 static struct hlsl_reg_reservation parse_reg_reservation(const char *reg_string)
 {
     struct hlsl_reg_reservation reservation = {0};
@@ -5014,7 +5041,8 @@ pass_list:
 technique9:
       KW_TECHNIQUE technique_name '{' pass_list '}'
         {
-            hlsl_fixme(ctx, &@$, "Unsupported 'technique' declaration.");
+            if (!add_technique(ctx, $2, "technique", &@1))
+                YYABORT;
         }

technique10:
@@ -5024,7 +5052,8 @@ technique10:
                 hlsl_error(ctx, &@1, VKD3D_SHADER_ERROR_HLSL_INVALID_SYNTAX,
                         "The 'technique10' keyword is invalid for this profile.");

-            hlsl_fixme(ctx, &@$, "Unsupported 'technique10' declaration.");
+            if (!add_technique(ctx, $2, "technique10", &@1))
+                YYABORT;
         }

technique11:
@@ -5034,7 +5063,8 @@ technique11:
                 hlsl_error(ctx, &@1, VKD3D_SHADER_ERROR_HLSL_INVALID_SYNTAX,
                         "The 'technique11' keyword is invalid for this profile.");

-            hlsl_fixme(ctx, &@$, "Unsupported 'technique11' declaration.");
+            if (!add_technique(ctx, $2, "technique11", &@1))
+                YYABORT;
         }

global_technique:
diff --git a/tests/hlsl/technique-fx_2.shader_test b/tests/hlsl/technique-fx_2.shader_test
index f86cc005..e0ac1901 100644
--- a/tests/hlsl/technique-fx_2.shader_test
+++ b/tests/hlsl/technique-fx_2.shader_test
@@ -90,7 +90,7 @@ technique10
 float4 f;

% fx_5_0 keyword fails with fx_2_0 profile
-[effect fail todo]
+[effect fail]
 technique
 {
 }
@@ -99,7 +99,7 @@ technique11
 {
 }

-[effect fail todo]
+[effect fail]
 technique
 {
 }
@@ -108,7 +108,7 @@ tEchnique10
 {
 }

-[effect fail todo]
+[effect fail]
 technique
 {
 }
diff --git a/tests/hlsl/technique-fx_4.shader_test b/tests/hlsl/technique-fx_4.shader_test
index 7968cb9d..02317483 100644
--- a/tests/hlsl/technique-fx_4.shader_test
+++ b/tests/hlsl/technique-fx_4.shader_test
@@ -60,7 +60,7 @@ technique11
 {
 }

-[effect fail todo]
+[effect fail]
 technique
 {
 }
@@ -69,7 +69,7 @@ tEchnique10
 {
 }

-[effect fail todo]
+[effect fail]
 technique
 {
 }
diff --git a/tests/hlsl/technique-fx_5.shader_test b/tests/hlsl/technique-fx_5.shader_test
index 29aa616f..fd1cf4cf 100644
--- a/tests/hlsl/technique-fx_5.shader_test
+++ b/tests/hlsl/technique-fx_5.shader_test
@@ -60,7 +60,7 @@ technique11
 {
 }

-[effect fail todo]
+[effect fail]
 technique
 {
 }
@@ -69,7 +69,7 @@ tEchnique10
 {
 }

-[effect fail todo]
+[effect fail]
 technique
 {
 }