commit 6752bb99d48bfe50d63eb2b07dc73a3b442e47dc Author: Danny Rawlins <monster.romster@gmail.com> Date: Tue Aug 18 20:57:27 2020 +1000 vkd3d: patch for vulkan headers update diff --git a/vkd3d/.signature b/vkd3d/.signature index ddb9fe6e3..f887b6be2 100644 --- a/vkd3d/.signature +++ b/vkd3d/.signature @@ -1,5 +1,6 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/X3pp8V7tvsSMAjOyCTXb5vC+6AsPXSXCAHZ0LoF8rTDxohImHHBEFXnOS1/HB6xqfg9TG3L1jtEHuS5W2VFfA4= -SHA256 (Pkgfile) = 8dc233351ad47c27774c3005e2ddabde04f40b69c572b32bd39c0c4cb2021466 +RWSE3ohX2g5d/fPHyoXq5/GuDvpF+HQlyQhGQkWBOgiGdkyqauRu/L8U/DN2kJRNQV4g0TPSATaqsAOrsjJJDPl3VFC/SfBcGAQ= +SHA256 (Pkgfile) = 9e7f0f651068d22251dfbe40553472c1e42f3149dbbe9a52c104bfb37e166e32 SHA256 (.footprint) = 83f0606cf8a591cff4886fc9d7f3b07b2de019a08bbc60f978ac3ebb8f40623f SHA256 (vkd3d-1.1.tar.xz) = 495adc61cc80c65d54b2f5b52092ea05d3797cc2c17a610f0fc98457d2f56ab6 +SHA256 (vulkan-headers.patch) = d79ddf19adbe598693916a5e74d22a53aaa560937d5c099b0c6c96b4eaf90313 diff --git a/vkd3d/Pkgfile b/vkd3d/Pkgfile index 43aa3e498..0400c253c 100644 --- a/vkd3d/Pkgfile +++ b/vkd3d/Pkgfile @@ -5,12 +5,15 @@ name=vkd3d 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 make diff --git a/vkd3d/vulkan-headers.patch b/vkd3d/vulkan-headers.patch new file mode 100644 index 000000000..207e90ded --- /dev/null +++ b/vkd3d/vulkan-headers.patch @@ -0,0 +1,24 @@ +https://github.com/d3d12/vkd3d/commit/8e7bf8a5c3e004763a62822ff2d79cf76907b7... +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; +