Zebediah Figura : vkd3d-shader: Sort uniforms by name before writing them into the SM1 constant table.

[Alexandre Julliard]

Module: vkd3d
Branch: master
Commit: de6448385077394ecd8582e5c112763be3abf9b9
URL:    https://source.winehq.org/git/vkd3d.git/?a=commit;h=de6448385077394ecd8582e5c112763be3abf9b9

Author: Zebediah Figura <zfigura at codeweavers.com>
Date:   Thu Apr 15 19:03:47 2021 -0500

vkd3d-shader: Sort uniforms by name before writing them into the SM1 constant table.

Signed-off-by: Zebediah Figura <zfigura at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 libs/vkd3d-shader/hlsl_codegen.c | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c
index 73f8bdb..1b5e8a2 100644
--- a/libs/vkd3d-shader/hlsl_codegen.c
+++ b/libs/vkd3d-shader/hlsl_codegen.c
@@ -1073,6 +1073,34 @@ static void write_sm1_type(struct bytecode_buffer *buffer, struct hlsl_type *typ
     put_dword(buffer, fields_offset);
 }
 
+static void sm1_sort_extern(struct list *sorted, struct hlsl_ir_var *to_sort)
+{
+    struct hlsl_ir_var *var;
+
+    list_remove(&to_sort->extern_entry);
+
+    LIST_FOR_EACH_ENTRY(var, sorted, struct hlsl_ir_var, extern_entry)
+    {
+        if (strcmp(to_sort->name, var->name) < 0)
+        {
+            list_add_before(&var->extern_entry, &to_sort->extern_entry);
+            return;
+        }
+    }
+
+    list_add_tail(sorted, &to_sort->extern_entry);
+}
+
+static void sm1_sort_externs(struct hlsl_ctx *ctx)
+{
+    struct list sorted = LIST_INIT(sorted);
+    struct hlsl_ir_var *var, *next;
+
+    LIST_FOR_EACH_ENTRY_SAFE(var, next, &ctx->extern_vars, struct hlsl_ir_var, extern_entry)
+        sm1_sort_extern(&sorted, var);
+    list_move_tail(&ctx->extern_vars, &sorted);
+}
+
 static void write_sm1_uniforms(struct hlsl_ctx *ctx, struct bytecode_buffer *buffer,
         struct hlsl_ir_function_decl *entry_func)
 {
@@ -1103,6 +1131,8 @@ static void write_sm1_uniforms(struct hlsl_ctx *ctx, struct bytecode_buffer *buf
         }
     }
 
+    sm1_sort_externs(ctx);
+
     put_dword(buffer, 0); /* COMMENT tag + size */
     put_dword(buffer, MAKEFOURCC('C','T','A','B'));