From 6dcce8259df19b4f53cf9b3718c0b9f2487615481530b2f9a39777dc2442eb43 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt <jengelh@inai.de> Date: Fri, 12 Jul 2019 02:56:48 +0000 Subject: [PATCH] - Add 0001-layers-Use-correct-apiversion-for-properties-check.patch [boo#1140976] OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/vulkan-validationlayers?expand=0&rev=20 --- ...rect-apiversion-for-properties-check.patch | 30 +++++++++++++++++++ vulkan-validationlayers.changes | 6 ++++ vulkan-validationlayers.spec | 3 +- 3 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 0001-layers-Use-correct-apiversion-for-properties-check.patch diff --git a/0001-layers-Use-correct-apiversion-for-properties-check.patch b/0001-layers-Use-correct-apiversion-for-properties-check.patch new file mode 100644 index 0000000..8de62d8 --- /dev/null +++ b/0001-layers-Use-correct-apiversion-for-properties-check.patch @@ -0,0 +1,30 @@ +From 5e3bf3d651e08cb7464f6c7270a9637239fc13bb Mon Sep 17 00:00:00 2001 +From: John Zulauf <jzulauf@lunarg.com> +Date: Sat, 29 Jun 2019 07:55:57 -0600 +Subject: [PATCH] layers: Use correct apiversion for properties check + +Change layers property check from physical device apiVersion to the +effective apiVersion (the lesser of the device and CreateInstance +apiVersion values) to avoid invalid downchain call. + +Change-Id: I282950f0f8927df280c97098e775a6940db809f1 +--- + layers/core_validation.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/layers/core_validation.cpp b/layers/core_validation.cpp +index 03149c08..75e473af 100644 +--- a/layers/core_validation.cpp ++++ b/layers/core_validation.cpp +@@ -2412,7 +2412,7 @@ void CoreChecks::PostCallRecordCreateDevice(VkPhysicalDevice gpu, const VkDevice + instance_dispatch_table.GetPhysicalDeviceCooperativeMatrixPropertiesNV(gpu, &numCooperativeMatrixProperties, + core_checks->cooperative_matrix_properties.data()); + } +- if (core_checks->phys_dev_props.apiVersion >= VK_API_VERSION_1_1) { ++ if (core_checks->api_version >= VK_API_VERSION_1_1) { + // Get the needed subgroup limits + auto subgroup_prop = lvl_init_struct<VkPhysicalDeviceSubgroupProperties>(); + auto prop2 = lvl_init_struct<VkPhysicalDeviceProperties2KHR>(&subgroup_prop); +-- +2.22.0 + diff --git a/vulkan-validationlayers.changes b/vulkan-validationlayers.changes index 799294f..df8acdc 100644 --- a/vulkan-validationlayers.changes +++ b/vulkan-validationlayers.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Jul 12 02:56:05 UTC 2019 - Jan Engelhardt <jengelh@inai.de> + +- Add 0001-layers-Use-correct-apiversion-for-properties-check.patch + [boo#1140976] + ------------------------------------------------------------------- Fri Jun 28 08:07:45 UTC 2019 - Jan Engelhardt <jengelh@inai.de> diff --git a/vulkan-validationlayers.spec b/vulkan-validationlayers.spec index a9de5ef..8f75d5d 100644 --- a/vulkan-validationlayers.spec +++ b/vulkan-validationlayers.spec @@ -26,6 +26,7 @@ License: Apache-2.0 Group: Development/Libraries/C and C++ URL: https://github.com/KhronosGroup/Vulkan-ValidationLayers Source: Vulkan-ValidationLayers-%version.tar.xz +Patch1: 0001-layers-Use-correct-apiversion-for-properties-check.patch BuildRequires: cmake >= 3.4 BuildRequires: gcc-c++ >= 4.8 BuildRequires: glslang-devel >= 7.11.3188 @@ -44,7 +45,7 @@ graphics applications such as games and interactive media. This package contains the Khronos official Vulkan validation layers. %prep -%setup -qn Vulkan-ValidationLayers-%version +%autosetup -n Vulkan-ValidationLayers-%version %build %cmake -DGLSLANG_INSTALL_DIR="%_bindir"