[arch-commits] Commit in vulkan-icd-loader/trunk (2 files)

[Laurent Carlier]

    Date: Sunday, September 20, 2020 @ 14:06:38
  Author: lcarlier
Revision: 396347

upgpkg: vulkan-icd-loader 1.2.153-2: fix initialization failure of Vulkan for both native and Proton with Steam

Added:
  vulkan-icd-loader/trunk/0001-Revert-loader-Return-error-if-layer-loading-failed.patch
Modified:
  vulkan-icd-loader/trunk/PKGBUILD

---------------------------------------------------------------+
 0001-Revert-loader-Return-error-if-layer-loading-failed.patch |   30 ++++++++++
 PKGBUILD                                                      |   15 ++++-
 2 files changed, 42 insertions(+), 3 deletions(-)

Added: 0001-Revert-loader-Return-error-if-layer-loading-failed.patch
===================================================================
--- 0001-Revert-loader-Return-error-if-layer-loading-failed.patch	                        (rev 0)
+++ 0001-Revert-loader-Return-error-if-layer-loading-failed.patch	2020-09-20 14:06:38 UTC (rev 396347)
@@ -0,0 +1,30 @@
+From 8fdc320b442c45f25044826715058ce3569f3ae1 Mon Sep 17 00:00:00 2001
+From: Charles Giessen <charles at lunarg.com>
+Date: Thu, 17 Sep 2020 16:31:16 -0600
+Subject: [PATCH] Revert "loader: Return error if layer loading failed"
+
+This reverts commit 49648d8fb398ac7d3d8e159939de060b8e759ecf.
+Many layers were relying on silently failing to allow 32/64 bit versions
+to work on linux. A later commit will properly check for failing layers.
+
+Signed-off-by: Laurent Carlier <lordheavym at gmail.com>
+---
+ loader/loader.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/loader/loader.c b/loader/loader.c
+index dd7f7d5b7..4d8865e13 100644
+--- a/loader/loader.c
++++ b/loader/loader.c
+@@ -5942,7 +5942,7 @@ VkResult loader_create_instance_chain(const VkInstanceCreateInfo *pCreateInfo, c
+ 
+             lib_handle = loaderOpenLayerFile(inst, "instance", layer_prop);
+             if (!lib_handle) {
+-                return VK_ERROR_LAYER_NOT_PRESENT;
++                continue;
+             }
+ 
+             if (NULL == layer_prop->functions.negotiate_layer_interface) {
+-- 
+2.28.0
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-09-20 13:32:56 UTC (rev 396346)
+++ PKGBUILD	2020-09-20 14:06:38 UTC (rev 396347)
@@ -2,7 +2,7 @@
 
 pkgname=vulkan-icd-loader
 pkgver=1.2.153
-pkgrel=1
+pkgrel=2
 arch=(x86_64)
 pkgdesc="Vulkan Installable Client Driver (ICD) Loader"
 url="https://www.khronos.org/vulkan/"
@@ -10,9 +10,11 @@
 makedepends=(cmake python-lxml libx11 libxrandr wayland vulkan-headers git)
 depends=(glibc)
 optdepends=('vulkan-driver: packaged vulkan driver') # vulkan-driver: vulkan-intel/vulkan-radeon/nvidia-utils/....
-source=("https://github.com/KhronosGroup/Vulkan-Loader/archive/v${pkgver}.tar.gz")
+source=("https://github.com/KhronosGroup/Vulkan-Loader/archive/v${pkgver}.tar.gz"
+        0001-Revert-loader-Return-error-if-layer-loading-failed.patch)
 #source=("git+https://github.com/KhronosGroup/Vulkan-Loader.git#commit=8df99b31f01ef1ef7fb17082dd577e77f20cb050")
-sha256sums=('5fb906b2dc968f2256f2d09b093ec8cc7f19812d656c649de8ed709a6da63d4a')
+sha256sums=('5fb906b2dc968f2256f2d09b093ec8cc7f19812d656c649de8ed709a6da63d4a'
+            '0450033ffcd8970ee1d69cf97c989b48e9b675b0fb71197f5e7b39c816b9c4aa')
 
 #pkgver() {
 #  cd "${srcdir}"/Vulkan-Loader*
@@ -20,6 +22,13 @@
 #  echo 1.1.106+$(git rev-list --count HEAD)+$(git rev-parse --short HEAD)
 #}
 
+prepare() {
+  cd "${srcdir}"/Vulkan-Loader*
+
+  # https://github.com/ValveSoftware/steam-for-linux/issues/7368
+  patch -Np1 -i ../0001-Revert-loader-Return-error-if-layer-loading-failed.patch
+}
+
 build() {
   cd "${srcdir}"/Vulkan-Loader*