[gtk+/wip/otte/shader: 128/151] gsksltype: Write decorations for struct and block members

[Benjamin Otte <otte src gnome org>]

commit debf23561600c6b71e1c0a3fcfaf7d79e9d70810
Author: Benjamin Otte <otte redhat com>
Date:   Mon Oct 16 22:30:22 2017 +0200

    gsksltype: Write decorations for struct and block members

 gsk/gsksltype.c |   34 +++++++++++++++++++++++++++++++++-
 1 files changed, 33 insertions(+), 1 deletions(-)
---
diff --git a/gsk/gsksltype.c b/gsk/gsksltype.c
index 2ffba83..e513c05 100644
--- a/gsk/gsksltype.c
+++ b/gsk/gsksltype.c
@@ -1155,6 +1155,31 @@ gsk_sl_type_struct_has_name (const GskSlTypeStruct *struc)
   return !g_str_has_prefix (struc->name, "struct { ");
 }
 
+static void
+gsk_sl_type_write_member_decoration (GskSpvWriter *writer,
+                                     guint32       type_id,
+                                     gsize         index,
+                                     GskSlType    *member_type,
+                                     const char   *member_name,
+                                     gsize         member_offset)
+{
+  gsk_spv_writer_member_name (writer, type_id, index, member_name);
+
+  gsk_spv_writer_member_decorate (writer, type_id, index,
+                                  GSK_SPV_DECORATION_OFFSET,
+                                  (guint32[1]) { member_offset }, 1);
+
+  if (gsk_sl_type_is_matrix (member_type))
+    {
+      gsk_spv_writer_member_decorate (writer, type_id, index,
+                                      GSK_SPV_DECORATION_COL_MAJOR,
+                                      NULL, 0);
+      gsk_spv_writer_member_decorate (writer, type_id, index,
+                                      GSK_SPV_DECORATION_MATRIX_STRIDE,
+                                      (guint32[1]) { gsk_sl_type_get_size (gsk_sl_type_get_index_type 
(member_type)) }, 1);
+    }
+}
+
 static guint32
 gsk_sl_type_struct_write_spv (GskSlType    *type,
                               GskSpvWriter *writer)
@@ -1181,7 +1206,8 @@ gsk_sl_type_struct_write_spv (GskSlType    *type,
 
   for (i = 0; i < struc->n_members; i++)
     {
-      gsk_spv_writer_member_name (writer, result_id, i, struc->members[i].name);
+      gsk_sl_type_write_member_decoration (writer, result_id, i, struc->members[i].type,
+          struc->members[i].name, struc->members[i].offset);
     }
 
   return result_id;
@@ -1397,6 +1423,12 @@ gsk_sl_type_block_write_spv (GskSlType    *type,
   
   gsk_spv_writer_decorate (writer, result_id, GSK_SPV_DECORATION_BLOCK, NULL, 0);
 
+  for (i = 0; i < block->n_members; i++)
+    {
+      gsk_sl_type_write_member_decoration (writer, result_id, i, block->members[i].type,
+          block->members[i].name, block->members[i].offset);
+    }
+
   return result_id;
 }