From acfbb642620d3aea983447d6e7be5c7c639f6325 Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Thu, 29 Aug 2024 08:00:18 +1000
Subject: [PATCH] Updated vkd3d-latest patchset

---
 ...-f318e565f295d9f439e0e9ec52ba28835b3.patch |  2 +-
 ...-eb71a1722a95894c0546a597b70469d7962.patch | 80 +++++++++++++++++++
 2 files changed, 81 insertions(+), 1 deletion(-)
 create mode 100644 patches/vkd3d-latest/0002-Updated-vkd3d-to-eb71a1722a95894c0546a597b70469d7962.patch

diff --git a/patches/vkd3d-latest/0001-Updated-vkd3d-to-f318e565f295d9f439e0e9ec52ba28835b3.patch b/patches/vkd3d-latest/0001-Updated-vkd3d-to-f318e565f295d9f439e0e9ec52ba28835b3.patch
index 4d5fffb5..ea08de5c 100644
--- a/patches/vkd3d-latest/0001-Updated-vkd3d-to-f318e565f295d9f439e0e9ec52ba28835b3.patch
+++ b/patches/vkd3d-latest/0001-Updated-vkd3d-to-f318e565f295d9f439e0e9ec52ba28835b3.patch
@@ -1,4 +1,4 @@
-From 6a483e26d5143a3faaa3365f7cf728eec9b231d9 Mon Sep 17 00:00:00 2001
+From 4e98af49c317d0f0c54120036059749ad053e84d Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Thu, 7 Mar 2024 10:40:41 +1100
 Subject: [PATCH] Updated vkd3d to f318e565f295d9f439e0e9ec52ba28835b33a9ce.
diff --git a/patches/vkd3d-latest/0002-Updated-vkd3d-to-eb71a1722a95894c0546a597b70469d7962.patch b/patches/vkd3d-latest/0002-Updated-vkd3d-to-eb71a1722a95894c0546a597b70469d7962.patch
new file mode 100644
index 00000000..294e3fd1
--- /dev/null
+++ b/patches/vkd3d-latest/0002-Updated-vkd3d-to-eb71a1722a95894c0546a597b70469d7962.patch
@@ -0,0 +1,80 @@
+From d3bcd5849cdbc5a2f6139ab7acf840f9d1b41898 Mon Sep 17 00:00:00 2001
+From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
+Date: Thu, 29 Aug 2024 07:59:15 +1000
+Subject: [PATCH] Updated vkd3d to eb71a1722a95894c0546a597b70469d7962ba77a.
+
+---
+ libs/vkd3d/include/vkd3d_shader.h | 29 +++++++++++++++++++++++++++--
+ libs/vkd3d/libs/vkd3d-shader/ir.c |  2 +-
+ 2 files changed, 28 insertions(+), 3 deletions(-)
+
+diff --git a/libs/vkd3d/include/vkd3d_shader.h b/libs/vkd3d/include/vkd3d_shader.h
+index d37d8ebad9e..fc583b542ee 100644
+--- a/libs/vkd3d/include/vkd3d_shader.h
++++ b/libs/vkd3d/include/vkd3d_shader.h
+@@ -583,7 +583,7 @@ enum vkd3d_shader_parameter_name
+ 
+ /**
+  * The value of an immediate constant parameter, used in
+- * struct vkd3d_shader_parameter and struct vkd3d_shader_parameter1.
++ * struct vkd3d_shader_parameter.
+  */
+ struct vkd3d_shader_parameter_immediate_constant
+ {
+@@ -604,6 +604,31 @@ struct vkd3d_shader_parameter_immediate_constant
+     } u;
+ };
+ 
++/**
++ * The value of an immediate constant parameter, used in
++ * struct vkd3d_shader_parameter1.
++ *
++ * \since 1.13
++ */
++struct vkd3d_shader_parameter_immediate_constant1
++{
++    union
++    {
++        /**
++         * The value if the parameter's data type is
++         * VKD3D_SHADER_PARAMETER_DATA_TYPE_UINT32.
++         */
++        uint32_t u32;
++        /**
++         * The value if the parameter's data type is
++         * VKD3D_SHADER_PARAMETER_DATA_TYPE_FLOAT32.
++         */
++        float f32;
++        void *_pointer_pad;
++        uint32_t _pad[4];
++    } u;
++};
++
+ /**
+  * The linkage of a specialization constant parameter, used in
+  * struct vkd3d_shader_parameter and struct vkd3d_shader_parameter1.
+@@ -689,7 +714,7 @@ struct vkd3d_shader_parameter1
+          * Additional information if \a type is
+          * VKD3D_SHADER_PARAMETER_TYPE_IMMEDIATE_CONSTANT.
+          */
+-        struct vkd3d_shader_parameter_immediate_constant immediate_constant;
++        struct vkd3d_shader_parameter_immediate_constant1 immediate_constant;
+         /**
+          * Additional information if \a type is
+          * VKD3D_SHADER_PARAMETER_TYPE_SPECIALIZATION_CONSTANT.
+diff --git a/libs/vkd3d/libs/vkd3d-shader/ir.c b/libs/vkd3d/libs/vkd3d-shader/ir.c
+index 6dbe30b1553..747238e2fee 100644
+--- a/libs/vkd3d/libs/vkd3d-shader/ir.c
++++ b/libs/vkd3d/libs/vkd3d-shader/ir.c
+@@ -45,7 +45,7 @@ static int convert_parameter_info(const struct vkd3d_shader_compile_info *compil
+ 
+         if (src->type == VKD3D_SHADER_PARAMETER_TYPE_IMMEDIATE_CONSTANT)
+         {
+-            dst->u.immediate_constant = src->u.immediate_constant;
++            dst->u.immediate_constant.u.u32 = src->u.immediate_constant.u.u32;
+         }
+         else if (src->type == VKD3D_SHADER_PARAMETER_TYPE_SPECIALIZATION_CONSTANT)
+         {
+-- 
+2.45.2
+