Commit 20163971 authored by Tk-Glitch's avatar Tk-Glitch

wine-tkg-git: Fix wrong merge

parent b05e472f
# Created by: Tk-Glitch <ti3nou at gmail dot com>
pkgname=proton-tkg-git
pkgver=5.4.r11.g75c7644c
pkgver=5.4.r12.ge5da84dc
pkgrel=1
_frogwhere=$PWD
export BUILDDIR="${_frogwhere}" # Override makepkg BUILDDIR path and use PKGBUILDs dirs instead
......
# Created by: Tk-Glitch <ti3nou at gmail dot com>
pkgname=wine-tkg-git
pkgver=5.4.r11.g75c7644c
pkgver=5.4.r12.ge5da84dc
# workaround for pkgrel overwritten on regen
pkgrel=1
......@@ -577,7 +577,7 @@ md5sums=('SKIP'
'16eeb21745eca0044c765d4d9e1e5cfa'
'87eb77f746f8c29bc8cff1d4dfce4bdc'
'ce595b50367e0a11e54587b204da69e3'
'1455be625bea1fc95bbb9c3bc63fb5ed'
'df97779216e857cda7d6c20fdf05ca9a'
'dfda79f2fc402d976c35c979aa3da221'
'b3b4a54457186f85b9471dbb44f0628d')
......
......@@ -3230,7 +3230,7 @@ index f36315534b9..fdce58c9500 100644
VkSwapchainCreateInfoKHR our_createinfo;
#endif
+ VkDeviceGroupSwapchainCreateInfoKHR our_device_group_swapchain_create_info;
+ VkImageFormatListCreateInfoKHR our_image_format_list_create_info;
+ VkImageFormatListCreateInfo our_image_format_list_create_info;
+
VkExtent2D user_sz;
struct VkSwapchainKHR_T *object;
......@@ -3243,7 +3243,7 @@ index f36315534b9..fdce58c9500 100644
+
+ wine_vk_copy_pnext(&our_createinfo, VkDeviceGroupSwapchainCreateInfoKHR, DEVICE_GROUP_SWAPCHAIN_CREATE_INFO_KHR, our_device_group_swapchain_create_info);
+
+ wine_vk_copy_pnext(&our_createinfo, VkImageFormatListCreateInfoKHR, IMAGE_FORMAT_LIST_CREATE_INFO_KHR, our_image_format_list_create_info);
+ wine_vk_copy_pnext(&our_createinfo, VkImageFormatListCreateInfo, IMAGE_FORMAT_LIST_CREATE_INFO, our_image_format_list_create_info);
+
+ // VkSwapchainCounterCreateInfoEXT is not in our version of WineVulkan
+ // Come back to me when this gets into Proton Wine!
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment