Date: Friday, March 12, 2021 @ 09:32:28 Author: lcarlier Revision: 409664
upgpkg: mesa 21.0.0-1: upstream update 21.0.0 Modified: mesa/trunk/PKGBUILD Deleted: mesa/trunk/0001-vulkan-device_select-Stop-using-device-properties-2.patch ----------------------------------------------------------------+ 0001-vulkan-device_select-Stop-using-device-properties-2.patch | 109 ---------- PKGBUILD | 24 -- 2 files changed, 8 insertions(+), 125 deletions(-) Deleted: 0001-vulkan-device_select-Stop-using-device-properties-2.patch =================================================================== --- 0001-vulkan-device_select-Stop-using-device-properties-2.patch 2021-03-12 09:23:13 UTC (rev 409663) +++ 0001-vulkan-device_select-Stop-using-device-properties-2.patch 2021-03-12 09:32:28 UTC (rev 409664) @@ -1,109 +0,0 @@ -From ccacfc317e4fac62052a22e2d092d15541e2877e Mon Sep 17 00:00:00 2001 -From: Bas Nieuwenhuizen <[email protected]> -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 <[email protected]> -Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8414> -(cherry picked from commit 38ce8d4d00c2b0e567b6dd36876cf171acb1dbc7) -Signed-off-by: Laurent Carlier <[email protected]> ---- - .../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-03-12 09:23:13 UTC (rev 409663) +++ PKGBUILD 2021-03-12 09:32:28 UTC (rev 409664) @@ -6,22 +6,20 @@ pkgbase=mesa pkgname=('vulkan-mesa-layers' 'opencl-mesa' 'vulkan-intel' 'vulkan-radeon' 'vulkan-swrast' 'libva-mesa-driver' 'mesa-vdpau' 'mesa') pkgdesc="An open-source implementation of the OpenGL specification" -pkgver=20.3.4 -pkgrel=3 +pkgver=21.0.0 +pkgrel=1 arch=('x86_64') makedepends=('python-mako' 'libxml2' 'libx11' 'xorgproto' 'libdrm' 'libxshmfence' 'libxxf86vm' 'libxdamage' 'libvdpau' 'libva' 'wayland' 'wayland-protocols' 'zstd' 'elfutils' 'llvm' 'libomxil-bellagio' 'libclc' 'clang' 'libglvnd' 'libunwind' 'lm_sensors' 'libxrandr' - 'valgrind' 'glslang' 'vulkan-icd-loader' 'meson') + 'valgrind' 'glslang' 'vulkan-icd-loader' 'cmake' 'meson') url="https://www.mesa3d.org/"; license=('custom') source=(https://mesa.freedesktop.org/archive/mesa-${pkgver}.tar.xz{,.sig} - LICENSE - 0001-vulkan-device_select-Stop-using-device-properties-2.patch) -sha512sums=('81c4d032213b4aef842f1594e0e89bc0045f7ca7ce5f267b62a0f8236eb12ab09c1f780d8b3776b3072f37cd0bd8829f8a1330a749ccf462471b262ef8097477' + LICENSE) +sha512sums=('32f4a74fbc1456dac478fdc3a85e37cedb9ac1e1b7c5434706dc24930a70bc9e857ba6b5bf1e7e05798e259f8ff0b05bad5252c07253cb5d6a9707c7c2e147ad' 'SKIP' - 'f9f0d0ccf166fe6cb684478b6f1e1ab1f2850431c06aa041738563eb1808a004e52cdec823c103c9e180f03ffc083e95974d291353f0220fe52ae6d4897fecc7' - '73a923dac10616ab46b825cd45f73ca849ddad69432dbf680c1129cc9a92004218affa33bd1a6ee185fa0143ccd3d3622ba40512ec049a160a61cc13fe92da0a') + 'f9f0d0ccf166fe6cb684478b6f1e1ab1f2850431c06aa041738563eb1808a004e52cdec823c103c9e180f03ffc083e95974d291353f0220fe52ae6d4897fecc7') validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D' # Emil Velikov <[email protected]> '946D09B5E4C9845E63075FF1D961C596A7203456' # Andres Gomez <[email protected]> 'E3E8F480C52ADD73B278EE78E1ECBE07D7D70895' # Juan Antonio Suárez Romero (Igalia, S.L.) <[email protected]> @@ -29,13 +27,6 @@ '71C4B75620BC75708B4BDB254C95FAAB3EB073EC' # Dylan Baker <[email protected]> '57551DE15B968F6341C248F68D8E31AFC32428A6') # Eric Engestrom <[email protected]> -prepare() { - cd mesa-$pkgver - - # FS#69744 - patch -Np1 -i ../0001-vulkan-device_select-Stop-using-device-properties-2.patch -} - build() { arch-meson mesa-$pkgver build \ -D b_lto=true \ @@ -65,8 +56,9 @@ -D libunwind=enabled \ -D llvm=enabled \ -D lmsensors=enabled \ - -D osmesa=gallium \ + -D osmesa=true \ -D shared-glapi=enabled \ + -D microsoft-clc=disabled \ -D valgrind=enabled # Print config
