[PATCH 3/8] vkd3d-shader/hlsl: Skip object components when creating input/output copies.

[Francisco Casas]

From: Francisco Casas

---
 libs/vkd3d-shader/hlsl_codegen.c         | 16 ++++++++++++++++
 libs/vkd3d-shader/vkd3d_shader_private.h |  1 +
 2 files changed, 17 insertions(+)

diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c
index 40565273..8173355c 100644
--- a/libs/vkd3d-shader/hlsl_codegen.c
+++ b/libs/vkd3d-shader/hlsl_codegen.c
@@ -263,6 +263,12 @@ static void prepend_input_copy(struct hlsl_ctx *ctx, struct list *instrs, struct
     struct hlsl_ir_var *var = lhs->src.var;
     unsigned int i;

+    if (hlsl_type_is_resource(type))
+    {
+        hlsl_fixme(ctx, &lhs->node.loc, "Objects as input parameters.");
+        return;
+    }
+
     vector_type = hlsl_get_vector_type(ctx, type->base_type, hlsl_type_minor_size(type));

for (i = 0; i < hlsl_type_major_size(type); ++i)
@@ -315,6 +321,9 @@ static void prepend_input_struct_copy(struct hlsl_ctx *ctx, struct list *instrs,
         struct hlsl_ir_load *field_load;
         struct hlsl_ir_constant *c;

+        if (hlsl_type_is_resource(field->type))
+            continue;
+
         if (!(c = hlsl_new_uint_constant(ctx, i, &var->loc)))
             return;
         list_add_after(&lhs->node.entry, &c->node.entry);
@@ -358,6 +367,13 @@ static void append_output_copy(struct hlsl_ctx *ctx, struct list *instrs, struct
     struct hlsl_ir_var *var = rhs->src.var;
     unsigned int i;

+    if (hlsl_type_is_resource(type))
+    {
+        hlsl_error(ctx, &rhs->node.loc, VKD3D_SHADER_ERROR_HLSL_INVALID_PARAMETER,
+                "Objects cannot be output parameters.");
+        return;
+    }
+
     vector_type = hlsl_get_vector_type(ctx, type->base_type, hlsl_type_minor_size(type));

for (i = 0; i < hlsl_type_major_size(type); ++i)
diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h
index e635a70b..18105342 100644
--- a/libs/vkd3d-shader/vkd3d_shader_private.h
+++ b/libs/vkd3d-shader/vkd3d_shader_private.h
@@ -125,6 +125,7 @@ enum vkd3d_shader_error
     VKD3D_SHADER_ERROR_HLSL_INVALID_THREAD_COUNT        = 5023,
     VKD3D_SHADER_ERROR_HLSL_MISSING_ATTRIBUTE           = 5024,
     VKD3D_SHADER_ERROR_HLSL_RECURSIVE_CALL              = 5025,
+    VKD3D_SHADER_ERROR_HLSL_INVALID_PARAMETER           = 5026,

VKD3D_SHADER_WARNING_HLSL_IMPLICIT_TRUNCATION       = 5300,
     VKD3D_SHADER_WARNING_HLSL_DIVISION_BY_ZERO          = 5301,