[arch-commits] Commit in lib32-mesa/trunk (2 files)
Laurent Carlier
lcarlier at archlinux.org
Fri Feb 26 12:19:17 UTC 2021
Date: Friday, February 26, 2021 @ 12:19:16
Author: lcarlier
Revision: 874386
upgpkg: lib32-mesa 20.3.4-3: fix FS#69744
Added:
lib32-mesa/trunk/0001-vulkan-device_select-Stop-using-device-properties-2.patch
Modified:
lib32-mesa/trunk/PKGBUILD
----------------------------------------------------------------+
0001-vulkan-device_select-Stop-using-device-properties-2.patch | 109 ++++++++++
PKGBUILD | 12 -
2 files changed, 118 insertions(+), 3 deletions(-)
Added: 0001-vulkan-device_select-Stop-using-device-properties-2.patch
===================================================================
--- 0001-vulkan-device_select-Stop-using-device-properties-2.patch (rev 0)
+++ 0001-vulkan-device_select-Stop-using-device-properties-2.patch 2021-02-26 12:19:16 UTC (rev 874386)
@@ -0,0 +1,109 @@
+From ccacfc317e4fac62052a22e2d092d15541e2877e Mon Sep 17 00:00:00 2001
+From: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
+Date: Mon, 11 Jan 2021 15:20:40 +0100
+Subject: [PATCH] vulkan/device_select: Stop using device properties 2.
+
+We have to choose between:
+1) Stop handling two identical GPUs
+2) Stop having crashes with other layers active.
+3) Fix the Vulkan Loader.
+
+Since nobody seems to want to spend enough effort to do 3 the
+effective choice is between 1 and 2. This is choosing 2, as
+two identical GPUs is pretty uncommon since crossfire doesn't
+work on Linux anyway.
+
+(And it would only work sporadically as the game needs to enable the
+ extension)
+
+CC: mesa-stable
+Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/3801
+Reviewed-by: Dave Airlie <airlied at redhat.com>
+Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8414>
+(cherry picked from commit 38ce8d4d00c2b0e567b6dd36876cf171acb1dbc7)
+Signed-off-by: Laurent Carlier <lordheavym at gmail.com>
+---
+ .../device-select-layer/device_select_layer.c | 30 +++++++++++--------
+ 1 file changed, 18 insertions(+), 12 deletions(-)
+
+diff --git a/src/vulkan/device-select-layer/device_select_layer.c b/src/vulkan/device-select-layer/device_select_layer.c
+index c381ac33fd1..134a3bd22dd 100644
+--- a/src/vulkan/device-select-layer/device_select_layer.c
++++ b/src/vulkan/device-select-layer/device_select_layer.c
+@@ -51,8 +51,8 @@ struct instance_info {
+ PFN_GetPhysicalDeviceProcAddr GetPhysicalDeviceProcAddr;
+ PFN_vkEnumerateDeviceExtensionProperties EnumerateDeviceExtensionProperties;
+ PFN_vkGetPhysicalDeviceProperties GetPhysicalDeviceProperties;
+- PFN_vkGetPhysicalDeviceProperties2KHR GetPhysicalDeviceProperties2KHR;
+- bool has_props2, has_pci_bus;
++ PFN_vkGetPhysicalDeviceProperties2 GetPhysicalDeviceProperties2;
++ bool has_pci_bus, has_vulkan11;
+ bool has_wayland, has_xcb;
+ };
+
+@@ -150,8 +150,6 @@ static VkResult device_select_CreateInstance(const VkInstanceCreateInfo *pCreate
+ }
+
+ for (unsigned i = 0; i < pCreateInfo->enabledExtensionCount; i++) {
+- if (!strcmp(pCreateInfo->ppEnabledExtensionNames[i], VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME))
+- info->has_props2 = true;
+ #ifdef VK_USE_PLATFORM_WAYLAND_KHR
+ if (!strcmp(pCreateInfo->ppEnabledExtensionNames[i], VK_KHR_WAYLAND_SURFACE_EXTENSION_NAME))
+ info->has_wayland = true;
+@@ -162,6 +160,14 @@ static VkResult device_select_CreateInstance(const VkInstanceCreateInfo *pCreate
+ #endif
+ }
+
++ /*
++ * The loader is currently not able to handle GetPhysicalDeviceProperties2KHR calls in
++ * EnumeratePhysicalDevices when there are other layers present. To avoid mysterious crashes
++ * for users just use only the vulkan version for now.
++ */
++ info->has_vulkan11 = pCreateInfo->pApplicationInfo &&
++ pCreateInfo->pApplicationInfo->apiVersion >= VK_MAKE_VERSION(1, 1, 0);
++
+ info->GetPhysicalDeviceProcAddr = (PFN_GetPhysicalDeviceProcAddr)info->GetInstanceProcAddr(*pInstance, "vk_layerGetPhysicalDeviceProcAddr");
+ #define DEVSEL_GET_CB(func) info->func = (PFN_vk##func)info->GetInstanceProcAddr(*pInstance, "vk" #func)
+ DEVSEL_GET_CB(DestroyInstance);
+@@ -169,8 +175,8 @@ static VkResult device_select_CreateInstance(const VkInstanceCreateInfo *pCreate
+ DEVSEL_GET_CB(EnumeratePhysicalDeviceGroups);
+ DEVSEL_GET_CB(GetPhysicalDeviceProperties);
+ DEVSEL_GET_CB(EnumerateDeviceExtensionProperties);
+- if (info->has_props2)
+- DEVSEL_GET_CB(GetPhysicalDeviceProperties2KHR);
++ if (info->has_vulkan11)
++ DEVSEL_GET_CB(GetPhysicalDeviceProperties2);
+ #undef DEVSEL_GET_CB
+
+ device_select_layer_add_instance(*pInstance, info);
+@@ -197,10 +203,10 @@ static void print_gpu(const struct instance_info *info, unsigned index, VkPhysic
+ VkPhysicalDeviceProperties2KHR properties = (VkPhysicalDeviceProperties2KHR){
+ .sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2_KHR
+ };
+- if (info->has_props2 && info->has_pci_bus)
++ if (info->has_vulkan11 && info->has_pci_bus)
+ properties.pNext = &ext_pci_properties;
+- if (info->GetPhysicalDeviceProperties2KHR)
+- info->GetPhysicalDeviceProperties2KHR(device, &properties);
++ if (info->GetPhysicalDeviceProperties2)
++ info->GetPhysicalDeviceProperties2(device, &properties);
+ else
+ info->GetPhysicalDeviceProperties(device, &properties.properties);
+
+@@ -243,10 +249,10 @@ static bool fill_drm_device_info(const struct instance_info *info,
+ .sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2_KHR
+ };
+
+- if (info->has_props2 && info->has_pci_bus)
++ if (info->has_vulkan11 && info->has_pci_bus)
+ properties.pNext = &ext_pci_properties;
+- if (info->GetPhysicalDeviceProperties2KHR)
+- info->GetPhysicalDeviceProperties2KHR(device, &properties);
++ if (info->GetPhysicalDeviceProperties2)
++ info->GetPhysicalDeviceProperties2(device, &properties);
+ else
+ info->GetPhysicalDeviceProperties(device, &properties.properties);
+
+--
+2.30.1
+
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2021-02-26 11:26:22 UTC (rev 874385)
+++ PKGBUILD 2021-02-26 12:19:16 UTC (rev 874386)
@@ -7,7 +7,7 @@
pkgname=('lib32-vulkan-mesa-layers' 'lib32-opencl-mesa' 'lib32-vulkan-intel' 'lib32-vulkan-radeon' 'lib32-libva-mesa-driver' 'lib32-mesa-vdpau' 'lib32-mesa')
pkgdesc="An open-source implementation of the OpenGL specification (32-bit)"
pkgver=20.3.4
-pkgrel=2
+pkgrel=3
arch=('x86_64')
makedepends=('python-mako' 'lib32-libxml2' 'lib32-expat' 'lib32-libx11' 'xorgproto' 'lib32-libdrm'
'lib32-libxshmfence' 'lib32-libxxf86vm' 'lib32-libxdamage' 'lib32-libvdpau'
@@ -17,10 +17,12 @@
url="https://www.mesa3d.org/"
license=('custom')
source=(https://mesa.freedesktop.org/archive/mesa-${pkgver}.tar.xz{,.sig}
- LICENSE)
+ LICENSE
+ 0001-vulkan-device_select-Stop-using-device-properties-2.patch)
sha512sums=('81c4d032213b4aef842f1594e0e89bc0045f7ca7ce5f267b62a0f8236eb12ab09c1f780d8b3776b3072f37cd0bd8829f8a1330a749ccf462471b262ef8097477'
'SKIP'
- 'f9f0d0ccf166fe6cb684478b6f1e1ab1f2850431c06aa041738563eb1808a004e52cdec823c103c9e180f03ffc083e95974d291353f0220fe52ae6d4897fecc7')
+ 'f9f0d0ccf166fe6cb684478b6f1e1ab1f2850431c06aa041738563eb1808a004e52cdec823c103c9e180f03ffc083e95974d291353f0220fe52ae6d4897fecc7'
+ '73a923dac10616ab46b825cd45f73ca849ddad69432dbf680c1129cc9a92004218affa33bd1a6ee185fa0143ccd3d3622ba40512ec049a160a61cc13fe92da0a')
validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D' # Emil Velikov <emil.l.velikov at gmail.com>
'946D09B5E4C9845E63075FF1D961C596A7203456' # Andres Gomez <tanty at igalia.com>
'E3E8F480C52ADD73B278EE78E1ECBE07D7D70895' # Juan Antonio Suárez Romero (Igalia, S.L.) <jasuarez at igalia.com>
@@ -30,6 +32,9 @@
prepare() {
cd mesa-$pkgver
+
+ # FS#69744
+ patch -Np1 -i ../0001-vulkan-device_select-Stop-using-device-properties-2.patch
}
build() {
@@ -177,6 +182,7 @@
depends=('lib32-libdrm' 'lib32-wayland' 'lib32-libxxf86vm' 'lib32-libxdamage' 'lib32-libxshmfence'
'lib32-libelf' 'lib32-libunwind' 'lib32-llvm-libs' 'lib32-lm_sensors' 'lib32-libglvnd'
'lib32-zstd' 'mesa')
+ depends+=('libsensors.so')
optdepends=('opengl-man-pages: for the OpenGL API man pages'
'lib32-mesa-vdpau: for accelerated video playback'
'lib32-libva-mesa-driver: for accelerated video playback')
More information about the arch-commits
mailing list