diff options
author | Jeremy Kescher | 2020-06-06 01:45:32 +0200 |
---|---|---|
committer | Jeremy Kescher | 2020-06-06 01:45:32 +0200 |
commit | 2a7da73a38465c85f0b05430a53ae20331d94b67 (patch) | |
tree | 22d2b223e089a49f970a384cbf750b1ef8c29193 | |
parent | 3b5ac13e76db598fa7ce11a2118eda5bd002d079 (diff) | |
download | aur-lib32-vkd3d-valve-git.tar.gz |
Remove temporary patch
Signed-off-by: Jeremy Kescher <jeremy@kescher.at>
-rw-r--r-- | .SRCINFO | 4 | ||||
-rw-r--r-- | 8e7bf8a5c3e004763a62822ff2d79cf76907b712.patch | 36 | ||||
-rw-r--r-- | PKGBUILD | 8 |
3 files changed, 4 insertions, 44 deletions
@@ -1,6 +1,6 @@ pkgbase = lib32-vkd3d-valve-git pkgdesc = D3D12 to Vulkan translation library. 32-bit (Valve version) - pkgver = 1.1.r1050.ge6bd3cb + pkgver = 1.1.r1120.ge685793 pkgrel = 1 url = https://github.com/ValveSoftware/vkd3d arch = x86_64 @@ -18,9 +18,7 @@ pkgbase = lib32-vkd3d-valve-git conflicts = lib32-vkd3d conflicts = lib32-vkd3d-git source = git+https://github.com/ValveSoftware/vkd3d.git#branch=proton_5.0 - source = 8e7bf8a5c3e004763a62822ff2d79cf76907b712.patch sha256sums = SKIP - sha256sums = 053084b7fddc4ea0e8bb8d23cec41ea701276cac30fee64e9147177daaf6f2ae pkgname = lib32-vkd3d-valve-git diff --git a/8e7bf8a5c3e004763a62822ff2d79cf76907b712.patch b/8e7bf8a5c3e004763a62822ff2d79cf76907b712.patch deleted file mode 100644 index 4824954add2a..000000000000 --- a/8e7bf8a5c3e004763a62822ff2d79cf76907b712.patch +++ /dev/null @@ -1,36 +0,0 @@ -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]; - @@ -4,7 +4,7 @@ # Contributor: Rebin Silva <rebinsilva@gmail.com> pkgname=lib32-vkd3d-valve-git -pkgver=1.1.r1050.ge6bd3cb +pkgver=1.1.r1120.ge685793 pkgrel=1 pkgdesc="D3D12 to Vulkan translation library. 32-bit (Valve version)" arch=('x86_64') @@ -24,8 +24,8 @@ makedepends=( # Prevent out-of-date SPIRV headers error ) conflicts=('lib32-vkd3d' 'lib32-vkd3d-git') provides=('lib32-vkd3d') -source=('git+https://github.com/ValveSoftware/vkd3d.git#branch=proton_5.0' '8e7bf8a5c3e004763a62822ff2d79cf76907b712.patch') -sha256sums=('SKIP' '053084b7fddc4ea0e8bb8d23cec41ea701276cac30fee64e9147177daaf6f2ae') +source=('git+https://github.com/ValveSoftware/vkd3d.git#branch=proton_5.0') +sha256sums=('SKIP') pkgver() { cd vkd3d @@ -36,8 +36,6 @@ prepare() { mkdir -p build cd vkd3d - # If this isn't needed anymore, leave a comment on the AUR! - patch --forward --strip=1 --input="${srcdir}/8e7bf8a5c3e004763a62822ff2d79cf76907b712.patch" ./autogen.sh } |