[PATCH v6 09/10] vkd3d-shader/hlsl: Support column-major matrix indexing in the lhs.

[Francisco Casas]

From: Francisco Casas

---
 libs/vkd3d-shader/hlsl.y               | 39 ++++++++++++++++++++++++--
 tests/hlsl-matrix-indexing.shader_test |  6 ++--
 2 files changed, 40 insertions(+), 5 deletions(-)

diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y
index 0f8a39c2..44d63ecd 100644
--- a/libs/vkd3d-shader/hlsl.y
+++ b/libs/vkd3d-shader/hlsl.y
@@ -1712,8 +1712,43 @@ static struct hlsl_ir_node *add_assignment(struct hlsl_ctx *ctx, struct list *in
     }
     else if (lhs->type == HLSL_IR_INDEX && hlsl_index_is_noncontiguous(hlsl_ir_index(lhs)))
     {
-        hlsl_fixme(ctx, &lhs->loc, "Column-major matrix index store.");
-        return NULL;
+        struct hlsl_ir_index *row = hlsl_ir_index(lhs);
+        struct hlsl_ir_node *mat = row->val.node;
+        unsigned int i, k = 0;
+
+        for (i = 0; i < mat->data_type->dimx; ++i)
+        {
+            struct hlsl_ir_store *store;
+            struct hlsl_ir_constant *c;
+            struct hlsl_ir_node *cell;
+            struct hlsl_ir_load *load;
+            struct hlsl_deref deref;
+
+            if (!(writemask & (1 << i)))
+                continue;
+
+            if (!(c = hlsl_new_uint_constant(ctx, i, &lhs->loc)))
+                return NULL;
+            list_add_tail(instrs, &c->node.entry);
+
+            if (!(cell = hlsl_new_index(ctx, &row->node, &c->node, &lhs->loc)))
+                return NULL;
+            list_add_tail(instrs, &cell->entry);
+
+            if (!(load = add_load_component(ctx, instrs, rhs, k++, &rhs->loc)))
+                return NULL;
+
+            if (!hlsl_init_deref_from_index_chain(ctx, &deref, cell))
+                return NULL;
+
+            if (!(store = hlsl_new_store_index(ctx, &deref, NULL, &load->node, 0, &rhs->loc)))
+            {
+                hlsl_cleanup_deref(&deref);
+                return NULL;
+            }
+            list_add_tail(instrs, &store->node.entry);
+            hlsl_cleanup_deref(&deref);
+        }
     }
     else
     {
diff --git a/tests/hlsl-matrix-indexing.shader_test b/tests/hlsl-matrix-indexing.shader_test
index e4731639..c3d08296 100644
--- a/tests/hlsl-matrix-indexing.shader_test
+++ b/tests/hlsl-matrix-indexing.shader_test
@@ -78,7 +78,7 @@ draw quad
 probe all rgba (1.0, 5.0, 7.0, 12.0)

-[pixel shader todo]
+[pixel shader]
 float4 main() : SV_TARGET
 {
     float3x2 m = {1, 2, 3, 4, 5, 6};
@@ -89,8 +89,8 @@ float4 main() : SV_TARGET
 }

[test]
-todo draw quad
-todo probe all rgba (30.0, 40.0, 5.0, 6.0)
+draw quad
+probe all rgba (30.0, 40.0, 5.0, 6.0)

[pixel shader]