wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-09-13 09:17:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Updated vkd3d-latest patchset

Browse Source
This commit is contained in:
Alistair Leslie-Hughes 2023-11-24 19:14:11 +11:00
parent 8717caf994
commit d1eba8eddd
6 changed files with 3205 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
patches/vkd3d-latest/0001-Updated-vkd3d-to-6a942581db3093a2e5b5a76334601868e21.patch
View File

@ -1,7 +1,8 @@
From 86400edb0fa8a02a7b111afb8180bd78ad09dfd6 Mon Sep 17 00:00:00 2001
From dc80a737929cdd76ae970115432e983221842b26 Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Wed, 17 May 2023 08:35:40 +1000
Subject: [PATCH] Updated vkd3d to 6a942581db3093a2e5b5a76334601868e217a60d.
Subject: [PATCH 1/6] Updated vkd3d to
6a942581db3093a2e5b5a76334601868e217a60d.
---
libs/vkd3d/include/list.h | 270 ++++
@ -983,7 +984,7 @@ index 00000000000..b5d38bca54c
+
+#endif /* __WINE_WINE_RBTREE_H */
diff --git a/libs/vkd3d/include/private/vkd3d_common.h b/libs/vkd3d/include/private/vkd3d_common.h
index ee733ee0d76..f7d98f327f1 100644
index 6b5cdf8cf2c..181dd2c1217 100644
--- a/libs/vkd3d/include/private/vkd3d_common.h
+++ b/libs/vkd3d/include/private/vkd3d_common.h
@@ -86,7 +86,7 @@ static inline unsigned int vkd3d_popcount(unsigned int v)

7
patches/vkd3d-latest/0002-Updated-vkd3d-to-f75bdd6e217863840cc5fb3251a171ca0ab.patch
View File

@ -1,7 +1,8 @@
From 05cfafa2f32ee22e6f455d5e646a26ef7c4f9fbd Mon Sep 17 00:00:00 2001
From bca4503bf46112899187b5ea724e98d3bb29638c Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Mon, 30 Oct 2023 06:37:46 +1100
Subject: [PATCH] Updated vkd3d to f75bdd6e217863840cc5fb3251a171ca0abe729b.
Subject: [PATCH 2/6] Updated vkd3d to
f75bdd6e217863840cc5fb3251a171ca0abe729b.
---
libs/vkd3d/include/private/vkd3d_common.h | 21 +
@ -27,7 +28,7 @@ Subject: [PATCH] Updated vkd3d to f75bdd6e217863840cc5fb3251a171ca0abe729b.
20 files changed, 1746 insertions(+), 164 deletions(-)
diff --git a/libs/vkd3d/include/private/vkd3d_common.h b/libs/vkd3d/include/private/vkd3d_common.h
index f7d98f327f1..44045b436dd 100644
index 181dd2c1217..157ddfa338c 100644
--- a/libs/vkd3d/include/private/vkd3d_common.h
+++ b/libs/vkd3d/include/private/vkd3d_common.h
@@ -49,6 +49,27 @@

5
patches/vkd3d-latest/0003-Updated-vkd3d-to-a03e78bf6285d4344f5d7774729b4b64175.patch
View File

@ -1,7 +1,8 @@
From 288f77dac789c2ac0b2c85d4c57bca7ecc5f2164 Mon Sep 17 00:00:00 2001
From 2bd6a35525c2fed26228df51e87ab2a3334d40b9 Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Tue, 7 Nov 2023 12:20:58 +1100
Subject: [PATCH] Updated vkd3d to a03e78bf6285d4344f5d7774729b4b64175422a7.
Subject: [PATCH 3/6] Updated vkd3d to
a03e78bf6285d4344f5d7774729b4b64175422a7.
---
libs/vkd3d/include/vkd3d_d3dcompiler.h | 23 +-

5
patches/vkd3d-latest/0004-Updated-vkd3d-to-22960753e94967888bada0d7e7731295b38.patch
View File

@ -1,7 +1,8 @@
From 1672d57bb241d2db0267a0edb411017c2bcbf60f Mon Sep 17 00:00:00 2001
From 9a84cb57686eaa52349ae79cd7f7526d01f6579f Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Sat, 11 Nov 2023 09:51:47 +1100
Subject: [PATCH] Updated vkd3d to 22960753e94967888bada0d7e7731295b3823acd.
Subject: [PATCH 4/6] Updated vkd3d to
22960753e94967888bada0d7e7731295b3823acd.
---
libs/vkd3d/include/vkd3d_shader.h | 25 +

3150
patches/vkd3d-latest/0005-Updated-vkd3d-to-f0a16d84ce939716defe41268340757da39.patch Normal file
View File

File diff suppressed because it is too large Load Diff

41
patches/vkd3d-latest/0006-include-D3D12_RT_FORMAT_ARRAY-remove-typedef-to-make.patch Normal file
View File

@ -0,0 +1,41 @@
From a75bf284ad20091fb161f994f642cb8bfb50853f Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Fri, 24 Nov 2023 19:06:32 +1100
Subject: [PATCH 6/6] include: D3D12_RT_FORMAT_ARRAY remove typedef to make
header compatible with windows
windows d3d12.idl doesn't have this as a typedef.
---
libs/vkd3d/libs/vkd3d/state.c | 2 +-
libs/vkd3d/libs/vkd3d/vkd3d_private.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/libs/vkd3d/libs/vkd3d/state.c b/libs/vkd3d/libs/vkd3d/state.c
index de0e04ea1e6..6665a1fd6cb 100644
--- a/libs/vkd3d/libs/vkd3d/state.c
+++ b/libs/vkd3d/libs/vkd3d/state.c
@@ -1839,7 +1839,7 @@ static HRESULT pipeline_state_desc_from_d3d12_stream_desc(struct d3d12_pipeline_
[D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_INPUT_LAYOUT] = DCL_SUBOBJECT_INFO(D3D12_INPUT_LAYOUT_DESC, input_layout),
[D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_IB_STRIP_CUT_VALUE] = DCL_SUBOBJECT_INFO(D3D12_INDEX_BUFFER_STRIP_CUT_VALUE, strip_cut_value),
[D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_PRIMITIVE_TOPOLOGY] = DCL_SUBOBJECT_INFO(D3D12_PRIMITIVE_TOPOLOGY_TYPE, primitive_topology_type),
- [D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_RENDER_TARGET_FORMATS] = DCL_SUBOBJECT_INFO(D3D12_RT_FORMAT_ARRAY, rtv_formats),
+ [D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_RENDER_TARGET_FORMATS] = DCL_SUBOBJECT_INFO(struct D3D12_RT_FORMAT_ARRAY, rtv_formats),
[D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_DEPTH_STENCIL_FORMAT] = DCL_SUBOBJECT_INFO(DXGI_FORMAT, dsv_format),
[D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_SAMPLE_DESC] = DCL_SUBOBJECT_INFO(DXGI_SAMPLE_DESC, sample_desc),
[D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_NODE_MASK] = DCL_SUBOBJECT_INFO(UINT, node_mask),
diff --git a/libs/vkd3d/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/libs/vkd3d/vkd3d_private.h
index 231bc615e5c..b2dec06aaed 100644
--- a/libs/vkd3d/libs/vkd3d/vkd3d_private.h
+++ b/libs/vkd3d/libs/vkd3d/vkd3d_private.h
@@ -1336,7 +1336,7 @@ struct d3d12_pipeline_state_desc
D3D12_INPUT_LAYOUT_DESC input_layout;
D3D12_INDEX_BUFFER_STRIP_CUT_VALUE strip_cut_value;
D3D12_PRIMITIVE_TOPOLOGY_TYPE primitive_topology_type;
- D3D12_RT_FORMAT_ARRAY rtv_formats;
+ struct D3D12_RT_FORMAT_ARRAY rtv_formats;
DXGI_FORMAT dsv_format;
DXGI_SAMPLE_DESC sample_desc;
D3D12_VIEW_INSTANCING_DESC view_instancing_desc;
--
2.42.0