[crux-commits] ports/compat-32 (3.5): vkd3d-32: patch for vulkan headers update

crux at crux.nu crux at crux.nu
Tue Aug 18 11:01:12 UTC 2020


commit a400c565d2ae61fcff9e12488257080472a65d11
Author: Danny Rawlins <monster.romster at gmail.com>
Date:   Tue Aug 18 21:00:25 2020 +1000

    vkd3d-32: patch for vulkan headers update

diff --git a/vkd3d-32/.signature b/vkd3d-32/.signature
index 0ad1c27..e656c88 100644
--- a/vkd3d-32/.signature
+++ b/vkd3d-32/.signature
@@ -1,5 +1,6 @@
 untrusted comment: verify with /etc/ports/compat-32.pub
-RWSwxGo/zH7eXYaUrPRjjCgiBVMCpSZxZdPSu2ASRy2Oc1+JiaVkPwINk9GzYwKDycLC2VTumoOfCrgJrc1NGNJAvT8fnIxIzAE=
-SHA256 (Pkgfile) = 540fe2bf4aeec821d7dfec5108e3ed6a7bb71f4182a4c3204117534d099acd35
+RWSwxGo/zH7eXf8gTH9ffX9jvvLY/C1aDLe+M36HBKatn8NclJ39ba7+76Bp+kDNYIIKM0sphm5awl4rB7XSLr5xsyfkSXSl0gQ=
+SHA256 (Pkgfile) = e1139bc8cab8f44f417861c34fc6fad8723ccb362030d292ddbe121f7acc7362
 SHA256 (.footprint) = 8c628551c06c4ff245a14859b593bea6c6dfe31244d26318df7966aaa73ffc17
 SHA256 (vkd3d-1.1.tar.xz) = 495adc61cc80c65d54b2f5b52092ea05d3797cc2c17a610f0fc98457d2f56ab6
+SHA256 (vulkan-headers.patch) = d79ddf19adbe598693916a5e74d22a53aaa560937d5c099b0c6c96b4eaf90313
diff --git a/vkd3d-32/Pkgfile b/vkd3d-32/Pkgfile
index b062ff7..1e6d808 100644
--- a/vkd3d-32/Pkgfile
+++ b/vkd3d-32/Pkgfile
@@ -5,12 +5,15 @@
 
 name=vkd3d-32
 version=1.1
-release=2
-source=(https://dl.winehq.org/vkd3d/source/${name%-*}-$version.tar.xz)
+release=3
+source=(https://dl.winehq.org/vkd3d/source/${name%-*}-$version.tar.xz
+	vulkan-headers.patch)
 
 build() {
 	cd ${name%-*}-$version
 
+	patch -p1 -i $SRC/vulkan-headers.patch
+
 	./configure \
 		--prefix=/usr \
 		--libdir=/usr/lib32
diff --git a/vkd3d-32/vulkan-headers.patch b/vkd3d-32/vulkan-headers.patch
new file mode 100644
index 0000000..207e90d
--- /dev/null
+++ b/vkd3d-32/vulkan-headers.patch
@@ -0,0 +1,24 @@
+https://github.com/d3d12/vkd3d/commit/8e7bf8a5c3e004763a62822ff2d79cf76907b712
+vkd3d: Do not use VK_PIPELINE_BIND_POINT_RANGE_SIZE.
+These constants were removed in Vulkan 1.2.140 headers.
+diff -pruN vkd3d-1.1.orig/libs/vkd3d/vkd3d_private.h vkd3d-1.1/libs/vkd3d/vkd3d_private.h
+--- vkd3d-1.1.orig/libs/vkd3d/vkd3d_private.h	2020-08-18 17:10:16.429411508 +1000
++++ vkd3d-1.1/libs/vkd3d/vkd3d_private.h	2020-08-18 17:17:39.520672309 +1000
+@@ -49,6 +49,8 @@
+ 
+ #define VKD3D_MAX_SHADER_STAGES     5u
+ 
++#define VKD3D_PIPELINE_BIND_POINT_COUNT 2u
++
+ struct d3d12_command_list;
+ struct d3d12_device;
+ 
+@@ -677,7 +679,7 @@ struct d3d12_command_list
+     VkFramebuffer current_framebuffer;
+     VkPipeline current_pipeline;
+     VkRenderPass current_render_pass;
+-    struct vkd3d_pipeline_bindings pipeline_bindings[VK_PIPELINE_BIND_POINT_RANGE_SIZE];
++    struct vkd3d_pipeline_bindings pipeline_bindings[VKD3D_PIPELINE_BIND_POINT_COUNT];
+ 
+     struct d3d12_pipeline_state *state;
+ 


More information about the crux-commits mailing list