From 74a39ff5397ced96a5708f038dba4e7a542eca0b Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Fri, 8 Dec 2023 14:19:25 +1100
Subject: [PATCH] Updated vkd3d-latest patchset

Fixed header path for list/rbtree/.h
---
 ...-45679a966c73669bdb7fa371569dcc34a44.patch | 74 ++-----------------
 1 file changed, 6 insertions(+), 68 deletions(-)

diff --git a/patches/vkd3d-latest/0001-Updated-vkd3d-to-45679a966c73669bdb7fa371569dcc34a44.patch b/patches/vkd3d-latest/0001-Updated-vkd3d-to-45679a966c73669bdb7fa371569dcc34a44.patch
index 2dd4c639..9ce03e13 100644
--- a/patches/vkd3d-latest/0001-Updated-vkd3d-to-45679a966c73669bdb7fa371569dcc34a44.patch
+++ b/patches/vkd3d-latest/0001-Updated-vkd3d-to-45679a966c73669bdb7fa371569dcc34a44.patch
@@ -1,4 +1,4 @@
-From 87d00abec6d4ea8946e1a9dcf79640a3bdac6ea2 Mon Sep 17 00:00:00 2001
+From d28e399844f151103e79af3a30112a4daf130649 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Fri, 8 Dec 2023 13:21:19 +1100
 Subject: [PATCH] Updated vkd3d to 45679a966c73669bdb7fa371569dcc34a448d8d4.
@@ -8,17 +8,14 @@ Subject: [PATCH] Updated vkd3d to 45679a966c73669bdb7fa371569dcc34a448d8d4.
  libs/vkd3d/libs/vkd3d-common/blob.c           |   1 +
  libs/vkd3d/libs/vkd3d-shader/d3dbc.c          |   4 +-
  libs/vkd3d/libs/vkd3d-shader/dxil.c           | 423 +++++++++++++++++-
- libs/vkd3d/libs/vkd3d-shader/hlsl.h           |   2 +-
  libs/vkd3d/libs/vkd3d-shader/hlsl.y           |  20 +-
  libs/vkd3d/libs/vkd3d-shader/hlsl_codegen.c   |  12 +-
  libs/vkd3d/libs/vkd3d-shader/ir.c             |   5 +-
- libs/vkd3d/libs/vkd3d-shader/preproc.h        |   2 +-
- libs/vkd3d/libs/vkd3d-shader/spirv.c          | 129 ++++--
+ libs/vkd3d/libs/vkd3d-shader/spirv.c          | 127 ++++--
  libs/vkd3d/libs/vkd3d-shader/tpf.c            |  11 +
  .../libs/vkd3d-shader/vkd3d_shader_main.c     |  45 +-
- .../libs/vkd3d-shader/vkd3d_shader_private.h  |   5 +-
- libs/vkd3d/libs/vkd3d/vkd3d_private.h         |   4 +-
- 14 files changed, 570 insertions(+), 97 deletions(-)
+ .../libs/vkd3d-shader/vkd3d_shader_private.h  |   3 +
+ 11 files changed, 564 insertions(+), 91 deletions(-)
 
 diff --git a/libs/vkd3d/include/private/vkd3d_common.h b/libs/vkd3d/include/private/vkd3d_common.h
 index 34fde1a2aa0..e9bff2fbba3 100644
@@ -694,19 +691,6 @@ index beb9ae574dc..a1065c8bc45 100644
      switch (block->id)
      {
          case CONSTANTS_BLOCK:
-diff --git a/libs/vkd3d/libs/vkd3d-shader/hlsl.h b/libs/vkd3d/libs/vkd3d-shader/hlsl.h
-index ca75a1936f1..bd6682be6ac 100644
---- a/libs/vkd3d/libs/vkd3d-shader/hlsl.h
-+++ b/libs/vkd3d/libs/vkd3d-shader/hlsl.h
-@@ -21,7 +21,7 @@
- #define __VKD3D_SHADER_HLSL_H
- 
- #include "vkd3d_shader_private.h"
--#include "wine/rbtree.h"
-+#include "rbtree.h"
- #include "d3dcommon.h"
- #include "d3dx9shader.h"
- 
 diff --git a/libs/vkd3d/libs/vkd3d-shader/hlsl.y b/libs/vkd3d/libs/vkd3d-shader/hlsl.y
 index 0dde4c18587..ed053f16312 100644
 --- a/libs/vkd3d/libs/vkd3d-shader/hlsl.y
@@ -836,32 +820,10 @@ index 710811c6761..a35ef862096 100644
                  *src_instructions = normaliser.instructions;
                  return ret;
              default:
-diff --git a/libs/vkd3d/libs/vkd3d-shader/preproc.h b/libs/vkd3d/libs/vkd3d-shader/preproc.h
-index 4860cf5f90e..e1cb75e177c 100644
---- a/libs/vkd3d/libs/vkd3d-shader/preproc.h
-+++ b/libs/vkd3d/libs/vkd3d-shader/preproc.h
-@@ -22,7 +22,7 @@
- #define __VKD3D_SHADER_PREPROC_H
- 
- #include "vkd3d_shader_private.h"
--#include "wine/rbtree.h"
-+#include "rbtree.h"
- 
- struct preproc_if_state
- {
 diff --git a/libs/vkd3d/libs/vkd3d-shader/spirv.c b/libs/vkd3d/libs/vkd3d-shader/spirv.c
-index c8a43adbe03..dc3d9631302 100644
+index c8a43adbe03..a22c59577ac 100644
 --- a/libs/vkd3d/libs/vkd3d-shader/spirv.c
 +++ b/libs/vkd3d/libs/vkd3d-shader/spirv.c
-@@ -18,7 +18,7 @@
-  */
- 
- #include "vkd3d_shader_private.h"
--#include "wine/rbtree.h"
-+#include "rbtree.h"
- 
- #include <stdarg.h>
- #include <stdio.h>
 @@ -1194,6 +1194,16 @@ static uint32_t vkd3d_spirv_get_op_constant64(struct vkd3d_spirv_builder *builde
              (const uint32_t *)&value, 2, vkd3d_spirv_build_op_constant64);
  }
@@ -1174,18 +1136,9 @@ index 8fd8945151f..d4a9d391477 100644
  
      for (i = 0; i < info->combined_sampler_count; ++i)
 diff --git a/libs/vkd3d/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d/libs/vkd3d-shader/vkd3d_shader_private.h
-index a93fa7160f7..102d49a38e0 100644
+index a93fa7160f7..4944b8a1c53 100644
 --- a/libs/vkd3d/libs/vkd3d-shader/vkd3d_shader_private.h
 +++ b/libs/vkd3d/libs/vkd3d-shader/vkd3d_shader_private.h
-@@ -49,7 +49,7 @@
- #include "vkd3d_common.h"
- #include "vkd3d_memory.h"
- #include "vkd3d_shader.h"
--#include "wine/list.h"
-+#include "list.h"
- 
- #include <assert.h>
- #include <inttypes.h>
 @@ -196,6 +196,7 @@ enum vkd3d_shader_error
      VKD3D_SHADER_WARNING_DXIL_ENTRY_POINT_MISMATCH      = 8306,
      VKD3D_SHADER_WARNING_DXIL_INVALID_MASK              = 8307,
@@ -1207,21 +1160,6 @@ index a93fa7160f7..102d49a38e0 100644
      uint32_t data[];
  };
  
-diff --git a/libs/vkd3d/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/libs/vkd3d/vkd3d_private.h
-index f06f564d6ea..e0eb9f3d3fe 100644
---- a/libs/vkd3d/libs/vkd3d/vkd3d_private.h
-+++ b/libs/vkd3d/libs/vkd3d/vkd3d_private.h
-@@ -32,8 +32,8 @@
- #include "vkd3d_blob.h"
- #include "vkd3d_memory.h"
- #include "vkd3d_utf8.h"
--#include "wine/list.h"
--#include "wine/rbtree.h"
-+#include "list.h"
-+#include "rbtree.h"
- 
- #include "vkd3d.h"
- #include "vkd3d_shader.h"
 -- 
 2.43.0