summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Kescher2020-05-17 10:37:32 +0200
committerJeremy Kescher2020-05-17 10:40:21 +0200
commitfc33131c3608a8a63a2f0f1639323a7d5977d36b (patch)
treee556c700ba230a0ca9b3046199400ab93105307b
parent3c441cc24185746163f7f45f39c7035e28159cd8 (diff)
downloadaur-vkd3d-valve-git.tar.gz
Update .SRCINFO
Signed-off-by: Jeremy Kescher <jeremy@kescher.at>
-rw-r--r--.SRCINFO2
-rw-r--r--.gitignore1
-rw-r--r--8e7bf8a5c3e004763a62822ff2d79cf76907b712.patch36
3 files changed, 39 insertions, 0 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 2dfcd0805fc..c7e620bb0e7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -17,7 +17,9 @@ pkgbase = vkd3d-valve-git
conflicts = vkd3d
conflicts = vkd3d-git
source = git+https://github.com/ValveSoftware/vkd3d.git#branch=proton_5.0
+ source = 8e7bf8a5c3e004763a62822ff2d79cf76907b712.patch
sha256sums = SKIP
+ sha256sums = 053084b7fddc4ea0e8bb8d23cec41ea701276cac30fee64e9147177daaf6f2ae
pkgname = vkd3d-valve-git
diff --git a/.gitignore b/.gitignore
index 05c6d4d4c97..42dc793069c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
!.gitignore
!.SRCINFO
!PKGBUILD
+!8e7bf8a5c3e004763a62822ff2d79cf76907b712.patch
diff --git a/8e7bf8a5c3e004763a62822ff2d79cf76907b712.patch b/8e7bf8a5c3e004763a62822ff2d79cf76907b712.patch
new file mode 100644
index 00000000000..4824954add2
--- /dev/null
+++ b/8e7bf8a5c3e004763a62822ff2d79cf76907b712.patch
@@ -0,0 +1,36 @@
+From 8e7bf8a5c3e004763a62822ff2d79cf76907b712 Mon Sep 17 00:00:00 2001
+From: Philip Rebohle <philip.rebohle@tu-dortmund.de>
+Date: Mon, 4 May 2020 22:39:19 +0200
+Subject: [PATCH] vkd3d: Do not use VK_PIPELINE_BIND_POINT_RANGE_SIZE.
+
+These constants were removed in Vulkan 1.2.140 headers.
+
+Signed-off-by: Philip Rebohle <philip.rebohle@tu-dortmund.de>
+---
+ libs/vkd3d/vkd3d_private.h | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h
+index 6598ed7..36a89d7 100644
+--- a/libs/vkd3d/vkd3d_private.h
++++ b/libs/vkd3d/vkd3d_private.h
+@@ -61,6 +61,8 @@
+ #define VKD3D_MAX_DESCRIPTOR_SETS 8u
+ #define VKD3D_MAX_BINDLESS_DESCRIPTOR_SETS 6u
+
++#define VKD3D_PIPELINE_BIND_POINT_COUNT 2u
++
+ struct d3d12_command_list;
+ struct d3d12_device;
+ struct d3d12_resource;
+@@ -1163,8 +1165,8 @@ struct d3d12_command_list
+ VkRenderPass current_render_pass;
+ VkBuffer uav_counter_address_buffer;
+ struct vkd3d_dynamic_state dynamic_state;
+- struct vkd3d_pipeline_bindings pipeline_bindings[VK_PIPELINE_BIND_POINT_RANGE_SIZE];
+- struct vkd3d_descriptor_updates packed_descriptors[VK_PIPELINE_BIND_POINT_RANGE_SIZE];
++ struct vkd3d_pipeline_bindings pipeline_bindings[VKD3D_PIPELINE_BIND_POINT_COUNT];
++ struct vkd3d_descriptor_updates packed_descriptors[VKD3D_PIPELINE_BIND_POINT_COUNT];
+
+ VkDescriptorSet descriptor_heaps[VKD3D_MAX_BINDLESS_DESCRIPTOR_SETS];
+