From d7bbcc7ad92a75b0338a1ebbc8f914ffc0317e20 Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Wed, 7 Jun 2023 08:13:06 +1000
Subject: [PATCH] Updated vkd3d-latest

---
 ...ys-check-for-debug-symbols-in-BINDIR.patch | 12 +++---
 ...82ddc6b417b79919f3e730ef3f2e167ab846.patch | 39 +++++++++++++++++++
 2 files changed, 45 insertions(+), 6 deletions(-)
 create mode 100644 patches/vkd3d-latest/0004-Update-vkd3d-to-82ddc6b417b79919f3e730ef3f2e167ab846.patch

diff --git a/patches/dbghelp-Debug_Symbols/0001-dbghelp-Always-check-for-debug-symbols-in-BINDIR.patch b/patches/dbghelp-Debug_Symbols/0001-dbghelp-Always-check-for-debug-symbols-in-BINDIR.patch
index 70825a10..cb5127b4 100644
--- a/patches/dbghelp-Debug_Symbols/0001-dbghelp-Always-check-for-debug-symbols-in-BINDIR.patch
+++ b/patches/dbghelp-Debug_Symbols/0001-dbghelp-Always-check-for-debug-symbols-in-BINDIR.patch
@@ -1,4 +1,4 @@
-From f78fc333748a6c4f664bb10ee2115c86690b3b16 Mon Sep 17 00:00:00 2001
+From e9f5c886b6b40ca77eb1dd7f0d21bbdc483b7a95 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Mon, 6 Oct 2014 05:06:06 +0200
 Subject: [PATCH] dbghelp: Always check for debug symbols in BINDIR.
@@ -9,12 +9,12 @@ Subject: [PATCH] dbghelp: Always check for debug symbols in BINDIR.
  2 files changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/dbghelp/Makefile.in b/dlls/dbghelp/Makefile.in
-index 22be2612eeb..2e11bb2b62d 100644
+index 74647820126..9f0aad2fc4f 100644
 --- a/dlls/dbghelp/Makefile.in
 +++ b/dlls/dbghelp/Makefile.in
 @@ -2,7 +2,7 @@ MODULE    = dbghelp.dll
  IMPORTLIB = dbghelp
- IMPORTS   = $(ZLIB_PE_LIBS)
+ IMPORTS   = kernelbase $(ZLIB_PE_LIBS)
  EXTRAINCL = $(ZLIB_PE_CFLAGS)
 -EXTRADEFS = -D_IMAGEHLP_SOURCE_
 +EXTRADEFS = -D_IMAGEHLP_SOURCE_ -DBINDIR="L\"${bindir}\""
@@ -22,10 +22,10 @@ index 22be2612eeb..2e11bb2b62d 100644
  
  C_SRCS = \
 diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c
-index 3c1e225e195..4468f7fa4ed 100644
+index a2a60752a68..a2bca11048f 100644
 --- a/dlls/dbghelp/elf_module.c
 +++ b/dlls/dbghelp/elf_module.c
-@@ -1445,6 +1445,7 @@ static BOOL elf_search_and_load_file(struct process* pcs, const WCHAR* filename,
+@@ -1457,6 +1457,7 @@ static BOOL elf_search_and_load_file(struct process* pcs, const WCHAR* filename,
          load_elf.elf_info    = elf_info;
  
          ret = search_unix_path(filename, process_getenv(pcs, L"LD_LIBRARY_PATH"), elf_load_file_cb, &load_elf)
@@ -34,5 +34,5 @@ index 3c1e225e195..4468f7fa4ed 100644
      }
  
 -- 
-2.39.1
+2.40.1
 
diff --git a/patches/vkd3d-latest/0004-Update-vkd3d-to-82ddc6b417b79919f3e730ef3f2e167ab846.patch b/patches/vkd3d-latest/0004-Update-vkd3d-to-82ddc6b417b79919f3e730ef3f2e167ab846.patch
new file mode 100644
index 00000000..fb4599c2
--- /dev/null
+++ b/patches/vkd3d-latest/0004-Update-vkd3d-to-82ddc6b417b79919f3e730ef3f2e167ab846.patch
@@ -0,0 +1,39 @@
+From 0c66ff2fbfc263e55ebd008772f56e4f432e32a9 Mon Sep 17 00:00:00 2001
+From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
+Date: Wed, 7 Jun 2023 08:12:13 +1000
+Subject: [PATCH] Update vkd3d to 82ddc6b417b79919f3e730ef3f2e167ab8462010
+
+---
+ libs/vkd3d/libs/vkd3d-shader/d3d_asm.c | 2 +-
+ libs/vkd3d/libs/vkd3d-shader/hlsl.y    | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/libs/vkd3d/libs/vkd3d-shader/d3d_asm.c b/libs/vkd3d/libs/vkd3d-shader/d3d_asm.c
+index 3357b4505c0..0a821b5c878 100644
+--- a/libs/vkd3d/libs/vkd3d-shader/d3d_asm.c
++++ b/libs/vkd3d/libs/vkd3d-shader/d3d_asm.c
+@@ -646,7 +646,7 @@ static void shader_dump_decl_usage(struct vkd3d_d3d_asm_compiler *compiler,
+                 break;
+ 
+             case VKD3D_SHADER_RESOURCE_TEXTURE_3D:
+-                shader_addline(buffer, "_3d");
++                shader_addline(buffer, "_volume");
+                 break;
+ 
+             case VKD3D_SHADER_RESOURCE_TEXTURE_CUBE:
+diff --git a/libs/vkd3d/libs/vkd3d-shader/hlsl.y b/libs/vkd3d/libs/vkd3d-shader/hlsl.y
+index cf483d82c65..30d0975102f 100644
+--- a/libs/vkd3d/libs/vkd3d-shader/hlsl.y
++++ b/libs/vkd3d/libs/vkd3d-shader/hlsl.y
+@@ -5242,7 +5242,7 @@ type_no_void:
+         }
+     | KW_SAMPLERCUBE
+         {
+-            $$ = ctx->builtin_types.sampler[HLSL_SAMPLER_DIM_3D];
++            $$ = ctx->builtin_types.sampler[HLSL_SAMPLER_DIM_CUBE];
+         }
+     | KW_TEXTURE
+         {
+-- 
+2.40.1
+