From cfb98aadfdc76494e4ec4d3d20b0ef0012c861c02ada39414a70b15891c36d9a Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Sat, 3 Oct 2020 16:55:23 +0000 Subject: [PATCH] Updating link to change in openSUSE:Factory/vulkan-loader revision 28.0 OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/vulkan-loader?expand=0&rev=dba7a5506fb7a5792d56522d74946a8e --- ...Return-error-if-layer-loading-failed.patch | 28 +++++++++++++++++++ vulkan-loader.spec | 1 + 2 files changed, 29 insertions(+) create mode 100644 0001-Revert-loader-Return-error-if-layer-loading-failed.patch diff --git a/0001-Revert-loader-Return-error-if-layer-loading-failed.patch b/0001-Revert-loader-Return-error-if-layer-loading-failed.patch new file mode 100644 index 0000000..79b37aa --- /dev/null +++ b/0001-Revert-loader-Return-error-if-layer-loading-failed.patch @@ -0,0 +1,28 @@ +From 8fdc320b442c45f25044826715058ce3569f3ae1 Mon Sep 17 00:00:00 2001 +From: Charles Giessen +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. +--- + 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 + diff --git a/vulkan-loader.spec b/vulkan-loader.spec index dd37f7e..0f58f2f 100644 --- a/vulkan-loader.spec +++ b/vulkan-loader.spec @@ -27,6 +27,7 @@ Group: Development/Libraries/C and C++ URL: https://github.com/KhronosGroup/Vulkan-Loader Source: https://github.com/KhronosGroup/Vulkan-Loader/archive/v%version.tar.gz Source9: baselibs.conf +Patch0: 0001-Revert-loader-Return-error-if-layer-loading-failed.patch BuildRequires: cmake >= 3.4 BuildRequires: gcc-c++ >= 4.8 BuildRequires: pkgconfig