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

wine-tkg-git: Update proton-winevulkan patchsets for 7b1622d and move previous versions to legacy

parent 3ec721dc
......@@ -373,7 +373,9 @@ source=("$_winesrcdir"::"${_winesrctarget}${_plain_commit}"
'proton-steam-bits.patch' # Proton's steam-centric patches
'dxvk_config_dxgi_support-591068c.patch' # Add support for dxvk_config library to Wine's dxgi (<591068c)
'dxvk_config_dxgi_support.patch' # Add support for dxvk_config library to Wine's dxgi
'proton-winevulkan-7b1622d.patch' # Winevulkan-specific patches (<7b1622d)
'proton-winevulkan.patch' # Winevulkan-specific patches
'proton-winevulkan-nofshack-7b1622d.patch' # Winevulkan-specific patches - for FS hack disabled (<7b1622d)
'proton-winevulkan-nofshack.patch' # Winevulkan-specific patches - for FS hack disabled
)
......@@ -575,7 +577,9 @@ md5sums=('SKIP'
'16eeb21745eca0044c765d4d9e1e5cfa'
'87eb77f746f8c29bc8cff1d4dfce4bdc'
'ce595b50367e0a11e54587b204da69e3'
'dfda79f2fc402d976c35c979aa3da221')
'9e1256bea5a24059dbd62d41c386d6cd'
'dfda79f2fc402d976c35c979aa3da221'
'b3b4a54457186f85b9471dbb44f0628d')
if [ "$_EXTERNAL_INSTALL" == "true" ]; then
provides=(
......
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -1023,8 +1023,8 @@ index fecf9ab502b..8953a0f0bdb 100644
convert_VkMemoryRequirements_host_to_win(&in->memoryRequirements, &out->memoryRequirements);
}
-static inline void convert_VkBufferDeviceAddressInfoKHR_win_to_host(const VkBufferDeviceAddressInfoKHR *in, VkBufferDeviceAddressInfoKHR_host *out)
+static WINEVULKAN_FORCEINLINE void convert_VkBufferDeviceAddressInfoKHR_win_to_host(const VkBufferDeviceAddressInfoKHR *in, VkBufferDeviceAddressInfoKHR_host *out)
-static inline void convert_VkBufferDeviceAddressInfo_win_to_host(const VkBufferDeviceAddressInfo *in, VkBufferDeviceAddressInfo_host *out)
+static WINEVULKAN_FORCEINLINE void convert_VkBufferDeviceAddressInfo_win_to_host(const VkBufferDeviceAddressInfo *in, VkBufferDeviceAddressInfo_host *out)
{
if (!in) return;
......@@ -1059,8 +1059,8 @@ index fecf9ab502b..8953a0f0bdb 100644
convert_VkMemoryRequirements_host_to_win(&in->memoryRequirements, &out->memoryRequirements);
}
-static inline void convert_VkDeviceMemoryOpaqueCaptureAddressInfoKHR_win_to_host(const VkDeviceMemoryOpaqueCaptureAddressInfoKHR *in, VkDeviceMemoryOpaqueCaptureAddressInfoKHR_host *out)
+static WINEVULKAN_FORCEINLINE void convert_VkDeviceMemoryOpaqueCaptureAddressInfoKHR_win_to_host(const VkDeviceMemoryOpaqueCaptureAddressInfoKHR *in, VkDeviceMemoryOpaqueCaptureAddressInfoKHR_host *out)
-static inline void convert_VkDeviceMemoryOpaqueCaptureAddressInfo_win_to_host(const VkDeviceMemoryOpaqueCaptureAddressInfo *in, VkDeviceMemoryOpaqueCaptureAddressInfo_host *out)
+static WINEVULKAN_FORCEINLINE void convert_VkDeviceMemoryOpaqueCaptureAddressInfo_win_to_host(const VkDeviceMemoryOpaqueCaptureAddressInfo *in, VkDeviceMemoryOpaqueCaptureAddressInfo_host *out)
{
if (!in) return;
......@@ -1382,8 +1382,8 @@ index fecf9ab502b..8953a0f0bdb 100644
- heap_free(in);
-}
-
-static inline void convert_VkSemaphoreSignalInfoKHR_win_to_host(const VkSemaphoreSignalInfoKHR *in, VkSemaphoreSignalInfoKHR_host *out)
+static WINEVULKAN_FORCEINLINE void convert_VkSemaphoreSignalInfoKHR_win_to_host(const VkSemaphoreSignalInfoKHR *in, VkSemaphoreSignalInfoKHR_host *out)
-static inline void convert_VkSemaphoreSignalInfo_win_to_host(const VkSemaphoreSignalInfo *in, VkSemaphoreSignalInfo_host *out)
+static WINEVULKAN_FORCEINLINE void convert_VkSemaphoreSignalInfo_win_to_host(const VkSemaphoreSignalInfo *in, VkSemaphoreSignalInfo_host *out)
{
if (!in) return;
......@@ -2352,9 +2352,9 @@ index 7bf6a0a07f8..0f8de3d21c2 100644
typedef enum VkResult
{
+ VK_ERROR_FULL_SCREEN_EXCLUSIVE_MODE_LOST_EXT = -1000255000,
VK_ERROR_INVALID_OPAQUE_CAPTURE_ADDRESS_KHR = -1000244000,
VK_ERROR_INVALID_OPAQUE_CAPTURE_ADDRESS = -1000257000,
VK_ERROR_NOT_PERMITTED_EXT = -1000174001,
VK_ERROR_FRAGMENTATION_EXT = -1000161000,
VK_ERROR_FRAGMENTATION = -1000161000,
@@ -2276,6 +2290,9 @@ typedef enum VkStructureType
VK_STRUCTURE_TYPE_RENDER_PASS_INPUT_ATTACHMENT_ASPECT_CREATE_INFO = 1000117001,
VK_STRUCTURE_TYPE_IMAGE_VIEW_USAGE_CREATE_INFO = 1000117002,
......@@ -2368,14 +2368,42 @@ index 7bf6a0a07f8..0f8de3d21c2 100644
@@ -2411,6 +2428,9 @@ typedef enum VkStructureType
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_SHADER_INTERLOCK_FEATURES_EXT = 1000251000,
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_YCBCR_IMAGE_ARRAYS_FEATURES_EXT = 1000252000,
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_UNIFORM_BUFFER_STANDARD_LAYOUT_FEATURES_KHR = 1000253000,
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_UNIFORM_BUFFER_STANDARD_LAYOUT_FEATURES = 1000253000,
+ VK_STRUCTURE_TYPE_SURFACE_FULL_SCREEN_EXCLUSIVE_INFO_EXT = 1000255000,
+ VK_STRUCTURE_TYPE_SURFACE_FULL_SCREEN_EXCLUSIVE_WIN32_INFO_EXT = 1000255001,
+ VK_STRUCTURE_TYPE_SURFACE_CAPABILITIES_FULL_SCREEN_EXCLUSIVE_EXT = 1000255002,
VK_STRUCTURE_TYPE_HEADLESS_SURFACE_CREATE_INFO_EXT = 1000256000,
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LINE_RASTERIZATION_FEATURES_EXT = 1000259000,
VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_LINE_STATE_CREATE_INFO_EXT = 1000259001,
@@ -3806,6 +3833,26 @@ typedef struct VkSubresourceLayout
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_BUFFER_DEVICE_ADDRESS_FEATURES = 1000257000,
VK_STRUCTURE_TYPE_BUFFER_OPAQUE_CAPTURE_ADDRESS_CREATE_INFO = 1000257002,
@@ -4477,6 +4497,13 @@ typedef struct VkPhysicalDeviceSubgroupSizeControlFeaturesEXT
VkBool32 computeFullSubgroups;
} VkPhysicalDeviceSubgroupSizeControlFeaturesEXT;
+typedef struct VkPhysicalDeviceSurfaceInfo2KHR
+{
+ VkStructureType sType;
+ const void *pNext;
+ VkSurfaceKHR WINE_VK_ALIGN(8) surface;
+} VkPhysicalDeviceSurfaceInfo2KHR;
+
typedef struct VkPhysicalDeviceTexelBufferAlignmentPropertiesEXT
{
VkStructureType sType;
@@ -4546,6 +4543,13 @@ typedef struct VkVertexInputAttributeDescription
uint32_t offset;
} VkVertexInputAttributeDescription;
+typedef struct VkSurfaceFullScreenExclusiveInfoEXT
+{
+ VkStructureType sType;
+ void *pNext;
+ VkFullScreenExclusiveEXT fullScreenExclusive;
+} VkSurfaceFullScreenExclusiveInfoEXT;
+
typedef struct VkVertexInputBindingDivisorDescriptionEXT
{
uint32_t binding;
@@ -5106,6 +5133,26 @@ typedef struct VkSubresourceLayout
VkDeviceSize WINE_VK_ALIGN(8) depthPitch;
} VkSubresourceLayout;
......@@ -2402,28 +2430,11 @@ index 7bf6a0a07f8..0f8de3d21c2 100644
typedef struct VkSurfaceCapabilitiesKHR
{
uint32_t minImageCount;
@@ -4147,11 +5194,12 @@ typedef struct VkSubpassDescription
VkBool32 fullScreenExclusiveSupported;
} VkSurfaceCapabilitiesFullScreenExclusiveEXT;
-typedef struct VkSurfaceFormatKHR
+typedef struct VkSurfaceFormat2KHR
{
- VkFormat format;
- VkColorSpaceKHR colorSpace;
-} VkSurfaceFormatKHR;
+ VkStructureType sType;
+ void *pNext;
+ VkSurfaceFormatKHR surfaceFormat;
+} VkSurfaceFormat2KHR;
typedef struct VkSurfaceFullScreenExclusiveWin32InfoEXT
{
@@ -5028,15 +5028,12 @@ typedef struct VkSwapchainCreateInfoKHR
@@ -5228,15 +5228,12 @@ typedef struct VkSwapchainCreateInfoKHR
VkSwapchainKHR WINE_VK_ALIGN(8) oldSwapchain;
} VkSwapchainCreateInfoKHR;
-typedef struct VkTimelineSemaphoreSubmitInfoKHR
-typedef struct VkTimelineSemaphoreSubmitInfo
+typedef struct VkSurfaceCapabilities2KHR
{
VkStructureType sType;
......@@ -2432,33 +2443,36 @@ index 7bf6a0a07f8..0f8de3d21c2 100644
- const uint64_t *pWaitSemaphoreValues;
- uint32_t signalSemaphoreValueCount;
- const uint64_t *pSignalSemaphoreValues;
-} VkTimelineSemaphoreSubmitInfoKHR;
-} VkTimelineSemaphoreSubmitInfo;
+ void *pNext;
+ VkSurfaceCapabilitiesKHR surfaceCapabilities;
+} VkSurfaceCapabilities2KHR;
typedef struct VkVertexInputAttributeDescription
typedef struct VkWriteDescriptorSetInlineUniformBlockEXT
{
@@ -5046,6 +5043,13 @@ typedef struct VkVertexInputAttributeDescription
uint32_t offset;
} VkVertexInputAttributeDescription;
@@ -5447,11 +6194,12 @@ typedef struct VkSubpassDescription
VkBool32 fullScreenExclusiveSupported;
} VkSurfaceCapabilitiesFullScreenExclusiveEXT;
+typedef struct VkSurfaceFullScreenExclusiveInfoEXT
+{
-typedef struct VkSurfaceFormatKHR
+typedef struct VkSurfaceFormat2KHR
{
- VkFormat format;
- VkColorSpaceKHR colorSpace;
-} VkSurfaceFormatKHR;
+ VkStructureType sType;
+ void *pNext;
+ VkFullScreenExclusiveEXT fullScreenExclusive;
+} VkSurfaceFullScreenExclusiveInfoEXT;
+
typedef struct VkViewport
+ VkSurfaceFormatKHR surfaceFormat;
+} VkSurfaceFormat2KHR;
typedef struct VkSurfaceFullScreenExclusiveWin32InfoEXT
{
float x;
@@ -5056,19 +5060,15 @@ typedef struct VkViewport
@@ -6056,19 +6060,15 @@ typedef struct VkViewport
float maxDepth;
} VkViewport;
-typedef struct VkWriteDescriptorSet
+typedef struct VkTimelineSemaphoreSubmitInfoKHR
+typedef struct VkTimelineSemaphoreSubmitInfo
{
VkStructureType sType;
const void *pNext;
......@@ -2475,24 +2489,10 @@ index 7bf6a0a07f8..0f8de3d21c2 100644
+ const uint64_t *pWaitSemaphoreValues;
+ uint32_t signalSemaphoreValueCount;
+ const uint64_t *pSignalSemaphoreValues;
+} VkTimelineSemaphoreSubmitInfoKHR;
+} VkTimelineSemaphoreSubmitInfo;
typedef struct VkAllocationCallbacks
{
@@ -5477,6 +5497,13 @@ typedef struct VkPhysicalDeviceSubgroupSizeControlFeaturesEXT
VkBool32 computeFullSubgroups;
} VkPhysicalDeviceSubgroupSizeControlFeaturesEXT;
+typedef struct VkPhysicalDeviceSurfaceInfo2KHR
+{
+ VkStructureType sType;
+ const void *pNext;
+ VkSurfaceKHR WINE_VK_ALIGN(8) surface;
+} VkPhysicalDeviceSurfaceInfo2KHR;
+
typedef struct VkPhysicalDeviceTexelBufferAlignmentPropertiesEXT
{
VkStructureType sType;
@@ -6966,6 +7014,20 @@ typedef struct VkRenderPassCreateInfo2KHR
const uint32_t *pCorrelatedViewMasks;
} VkRenderPassCreateInfo2KHR;
......
......@@ -1138,8 +1138,8 @@ index ea9e8262d83..ae68cdeccc8 100644
convert_VkMemoryRequirements_host_to_win(&in->memoryRequirements, &out->memoryRequirements);
}
-static inline void convert_VkBufferDeviceAddressInfoKHR_win_to_host(const VkBufferDeviceAddressInfoKHR *in, VkBufferDeviceAddressInfoKHR_host *out)
+static WINEVULKAN_FORCEINLINE void convert_VkBufferDeviceAddressInfoKHR_win_to_host(const VkBufferDeviceAddressInfoKHR *in, VkBufferDeviceAddressInfoKHR_host *out)
-static inline void convert_VkBufferDeviceAddressInfo_win_to_host(const VkBufferDeviceAddressInfo *in, VkBufferDeviceAddressInfo_host *out)
+static WINEVULKAN_FORCEINLINE void convert_VkBufferDeviceAddressInfo_win_to_host(const VkBufferDeviceAddressInfo *in, VkBufferDeviceAddressInfo_host *out)
{
if (!in) return;
......@@ -1488,8 +1488,8 @@ index ea9e8262d83..ae68cdeccc8 100644
- heap_free(in);
-}
-
-static inline void convert_VkSemaphoreSignalInfoKHR_win_to_host(const VkSemaphoreSignalInfoKHR *in, VkSemaphoreSignalInfoKHR_host *out)
+static WINEVULKAN_FORCEINLINE void convert_VkSemaphoreSignalInfoKHR_win_to_host(const VkSemaphoreSignalInfoKHR *in, VkSemaphoreSignalInfoKHR_host *out)
-static inline void convert_VkSemaphoreSignalInfo_win_to_host(const VkSemaphoreSignalInfo *in, VkSemaphoreSignalInfo_host *out)
+static WINEVULKAN_FORCEINLINE void convert_VkSemaphoreSignalInfo_win_to_host(const VkSemaphoreSignalInfo *in, VkSemaphoreSignalInfo_host *out)
{
if (!in) return;
......@@ -2807,9 +2807,9 @@ index 7bf6a0a07f8..0f8de3d21c2 100644
typedef enum VkResult
{
+ VK_ERROR_FULL_SCREEN_EXCLUSIVE_MODE_LOST_EXT = -1000255000,
VK_ERROR_INVALID_OPAQUE_CAPTURE_ADDRESS_KHR = -1000244000,
VK_ERROR_INVALID_OPAQUE_CAPTURE_ADDRESS = -1000257000,
VK_ERROR_NOT_PERMITTED_EXT = -1000174001,
VK_ERROR_FRAGMENTATION_EXT = -1000161000,
VK_ERROR_FRAGMENTATION = -1000161000,
@@ -2276,6 +2290,9 @@ typedef enum VkStructureType
VK_STRUCTURE_TYPE_RENDER_PASS_INPUT_ATTACHMENT_ASPECT_CREATE_INFO = 1000117001,
VK_STRUCTURE_TYPE_IMAGE_VIEW_USAGE_CREATE_INFO = 1000117002,
......@@ -2823,14 +2823,42 @@ index 7bf6a0a07f8..0f8de3d21c2 100644
@@ -2411,6 +2428,9 @@ typedef enum VkStructureType
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_SHADER_INTERLOCK_FEATURES_EXT = 1000251000,
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_YCBCR_IMAGE_ARRAYS_FEATURES_EXT = 1000252000,
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_UNIFORM_BUFFER_STANDARD_LAYOUT_FEATURES_KHR = 1000253000,
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_UNIFORM_BUFFER_STANDARD_LAYOUT_FEATURES = 1000253000,
+ VK_STRUCTURE_TYPE_SURFACE_FULL_SCREEN_EXCLUSIVE_INFO_EXT = 1000255000,
+ VK_STRUCTURE_TYPE_SURFACE_FULL_SCREEN_EXCLUSIVE_WIN32_INFO_EXT = 1000255001,
+ VK_STRUCTURE_TYPE_SURFACE_CAPABILITIES_FULL_SCREEN_EXCLUSIVE_EXT = 1000255002,
VK_STRUCTURE_TYPE_HEADLESS_SURFACE_CREATE_INFO_EXT = 1000256000,
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LINE_RASTERIZATION_FEATURES_EXT = 1000259000,
VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_LINE_STATE_CREATE_INFO_EXT = 1000259001,
@@ -3806,6 +3833,26 @@ typedef struct VkSubresourceLayout
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_BUFFER_DEVICE_ADDRESS_FEATURES = 1000257000,
VK_STRUCTURE_TYPE_BUFFER_OPAQUE_CAPTURE_ADDRESS_CREATE_INFO = 1000257002,
@@ -4477,6 +4497,13 @@ typedef struct VkPhysicalDeviceSubgroupSizeControlFeaturesEXT
VkBool32 computeFullSubgroups;
} VkPhysicalDeviceSubgroupSizeControlFeaturesEXT;
+typedef struct VkPhysicalDeviceSurfaceInfo2KHR
+{
+ VkStructureType sType;
+ const void *pNext;
+ VkSurfaceKHR WINE_VK_ALIGN(8) surface;
+} VkPhysicalDeviceSurfaceInfo2KHR;
+
typedef struct VkPhysicalDeviceTexelBufferAlignmentPropertiesEXT
{
VkStructureType sType;
@@ -4546,6 +4543,13 @@ typedef struct VkVertexInputAttributeDescription
uint32_t offset;
} VkVertexInputAttributeDescription;
+typedef struct VkSurfaceFullScreenExclusiveInfoEXT
+{
+ VkStructureType sType;
+ void *pNext;
+ VkFullScreenExclusiveEXT fullScreenExclusive;
+} VkSurfaceFullScreenExclusiveInfoEXT;
+
typedef struct VkVertexInputBindingDivisorDescriptionEXT
{
uint32_t binding;
@@ -5106,6 +5133,26 @@ typedef struct VkSubresourceLayout
VkDeviceSize WINE_VK_ALIGN(8) depthPitch;
} VkSubresourceLayout;
......@@ -2857,28 +2885,11 @@ index 7bf6a0a07f8..0f8de3d21c2 100644
typedef struct VkSurfaceCapabilitiesKHR
{
uint32_t minImageCount;
@@ -4147,11 +5194,12 @@ typedef struct VkSubpassDescription
VkBool32 fullScreenExclusiveSupported;
} VkSurfaceCapabilitiesFullScreenExclusiveEXT;
-typedef struct VkSurfaceFormatKHR
+typedef struct VkSurfaceFormat2KHR
{
- VkFormat format;
- VkColorSpaceKHR colorSpace;
-} VkSurfaceFormatKHR;
+ VkStructureType sType;
+ void *pNext;
+ VkSurfaceFormatKHR surfaceFormat;
+} VkSurfaceFormat2KHR;
typedef struct VkSurfaceFullScreenExclusiveWin32InfoEXT
{
@@ -5028,15 +5028,12 @@ typedef struct VkSwapchainCreateInfoKHR
@@ -5228,15 +5228,12 @@ typedef struct VkSwapchainCreateInfoKHR
VkSwapchainKHR WINE_VK_ALIGN(8) oldSwapchain;
} VkSwapchainCreateInfoKHR;
-typedef struct VkTimelineSemaphoreSubmitInfoKHR
-typedef struct VkTimelineSemaphoreSubmitInfo
+typedef struct VkSurfaceCapabilities2KHR
{
VkStructureType sType;
......@@ -2887,33 +2898,36 @@ index 7bf6a0a07f8..0f8de3d21c2 100644
- const uint64_t *pWaitSemaphoreValues;
- uint32_t signalSemaphoreValueCount;
- const uint64_t *pSignalSemaphoreValues;
-} VkTimelineSemaphoreSubmitInfoKHR;
-} VkTimelineSemaphoreSubmitInfo;
+ void *pNext;
+ VkSurfaceCapabilitiesKHR surfaceCapabilities;
+} VkSurfaceCapabilities2KHR;
typedef struct VkVertexInputAttributeDescription
typedef struct VkWriteDescriptorSetInlineUniformBlockEXT
{
@@ -5046,6 +5043,13 @@ typedef struct VkVertexInputAttributeDescription
uint32_t offset;
} VkVertexInputAttributeDescription;
@@ -5447,11 +6194,12 @@ typedef struct VkSubpassDescription
VkBool32 fullScreenExclusiveSupported;
} VkSurfaceCapabilitiesFullScreenExclusiveEXT;
+typedef struct VkSurfaceFullScreenExclusiveInfoEXT
+{
-typedef struct VkSurfaceFormatKHR
+typedef struct VkSurfaceFormat2KHR
{
- VkFormat format;
- VkColorSpaceKHR colorSpace;
-} VkSurfaceFormatKHR;
+ VkStructureType sType;
+ void *pNext;
+ VkFullScreenExclusiveEXT fullScreenExclusive;
+} VkSurfaceFullScreenExclusiveInfoEXT;
+
typedef struct VkViewport
+ VkSurfaceFormatKHR surfaceFormat;
+} VkSurfaceFormat2KHR;
typedef struct VkSurfaceFullScreenExclusiveWin32InfoEXT
{
float x;
@@ -5056,19 +5060,15 @@ typedef struct VkViewport
@@ -6056,19 +6060,15 @@ typedef struct VkViewport
float maxDepth;
} VkViewport;
-typedef struct VkWriteDescriptorSet
+typedef struct VkTimelineSemaphoreSubmitInfoKHR
+typedef struct VkTimelineSemaphoreSubmitInfo
{
VkStructureType sType;
const void *pNext;
......@@ -2930,24 +2944,10 @@ index 7bf6a0a07f8..0f8de3d21c2 100644
+ const uint64_t *pWaitSemaphoreValues;
+ uint32_t signalSemaphoreValueCount;
+ const uint64_t *pSignalSemaphoreValues;
+} VkTimelineSemaphoreSubmitInfoKHR;
+} VkTimelineSemaphoreSubmitInfo;
typedef struct VkAllocationCallbacks
{
@@ -5477,6 +5497,13 @@ typedef struct VkPhysicalDeviceSubgroupSizeControlFeaturesEXT
VkBool32 computeFullSubgroups;
} VkPhysicalDeviceSubgroupSizeControlFeaturesEXT;
+typedef struct VkPhysicalDeviceSurfaceInfo2KHR
+{
+ VkStructureType sType;
+ const void *pNext;
+ VkSurfaceKHR WINE_VK_ALIGN(8) surface;
+} VkPhysicalDeviceSurfaceInfo2KHR;
+
typedef struct VkPhysicalDeviceTexelBufferAlignmentPropertiesEXT
{
VkStructureType sType;
@@ -6966,6 +7014,20 @@ typedef struct VkRenderPassCreateInfo2KHR
const uint32_t *pCorrelatedViewMasks;
} VkRenderPassCreateInfo2KHR;
......
......@@ -1391,10 +1391,18 @@ EOM
_patchname='proton_fs_hack_integer_scaling.patch' && _patchmsg="Enable Proton fs hack integer scaling" && nonuser_patcher
fi
if [ "$_EXTERNAL_INSTALL" == "true" ] && [ "$_EXTERNAL_INSTALL_TYPE" == "proton" ] && [ "$_unfrog" != "true" ] || ([ "$_protonify" == "true" ] && git merge-base --is-ancestor 74dc0c5df9c3094352caedda8ebe14ed2dfd615e HEAD); then
if [ "$_proton_fs_hack" == "true" ]; then
_patchname='proton-winevulkan.patch' && _patchmsg="Using Proton winevulkan patches" && nonuser_patcher
if git merge-base --is-ancestor 7b1622d1ab90f01fdb3a2bc24e12ab4990f07f68 HEAD; then
if [ "$_proton_fs_hack" == "true" ]; then
_patchname='proton-winevulkan.patch' && _patchmsg="Using Proton winevulkan patches" && nonuser_patcher
else
_patchname='proton-winevulkan-nofshack.patch' && _patchmsg="Using Proton winevulkan patches (nofshack)" && nonuser_patcher
fi
else
_patchname='proton-winevulkan-nofshack.patch' && _patchmsg="Using Proton winevulkan patches (nofshack)" && nonuser_patcher
if [ "$_proton_fs_hack" == "true" ]; then
_patchname='proton-winevulkan-7b1622d.patch' && _patchmsg="Using Proton winevulkan patches" && nonuser_patcher
else
_patchname='proton-winevulkan-nofshack-7b1622d.patch' && _patchmsg="Using Proton winevulkan patches (nofshack)" && nonuser_patcher
fi
fi
fi
......
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