From 008360865953bb681450e98afd966ab1a56572c8abe6ad42296782c05fd1f87f Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 24 Oct 2022 19:57:38 +0000 Subject: [PATCH] - Update to release 1.3.231.0 OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/vulkan-tools?expand=0&rev=93 --- 0001-cubepp-Fix-presentKHR-assert.patch | 41 +++++++++++++++++++++++++ sdk-1.3.224.0.tar.gz | 3 -- v1.3.231.tar.gz | 3 ++ vulkan-tools.changes | 7 +++++ vulkan-tools.spec | 9 +++--- 5 files changed, 56 insertions(+), 7 deletions(-) create mode 100644 0001-cubepp-Fix-presentKHR-assert.patch delete mode 100644 sdk-1.3.224.0.tar.gz create mode 100644 v1.3.231.tar.gz diff --git a/0001-cubepp-Fix-presentKHR-assert.patch b/0001-cubepp-Fix-presentKHR-assert.patch new file mode 100644 index 0000000..c6c4b02 --- /dev/null +++ b/0001-cubepp-Fix-presentKHR-assert.patch @@ -0,0 +1,41 @@ +From 8d2d3e22d684540fdc5a76c15e456fc2fd11e4b7 Mon Sep 17 00:00:00 2001 +From: Juan Ramos +Date: Wed, 19 Oct 2022 16:51:58 -0600 +Subject: [PATCH] cubepp: Fix presentKHR assert + +Currently cubepp fails on Debug builds and triggers an assert. + +This avoids the assert by calling the appropriate presentKHR. +--- + cube/cube.cpp | 13 +++++++------ + 1 file changed, 7 insertions(+), 6 deletions(-) + +diff --git a/cube/cube.cpp b/cube/cube.cpp +index aa3d7b20..90000789 100644 +--- a/cube/cube.cpp ++++ b/cube/cube.cpp +@@ -706,14 +706,15 @@ void Demo::draw() { + VERIFY(change_owner_result == vk::Result::eSuccess); + } + ++ const auto presentInfo = vk::PresentInfoKHR() ++ .setWaitSemaphores(separate_present_queue ? image_ownership_semaphores[frame_index] ++ : draw_complete_semaphores[frame_index]) ++ .setSwapchains(swapchain) ++ .setImageIndices(current_buffer); ++ + // If we are using separate queues we have to wait for image ownership, + // otherwise wait for draw complete +- auto present_result = +- present_queue.presentKHR(vk::PresentInfoKHR() +- .setWaitSemaphores(separate_present_queue ? image_ownership_semaphores[frame_index] +- : draw_complete_semaphores[frame_index]) +- .setSwapchains(swapchain) +- .setImageIndices(current_buffer)); ++ auto present_result = present_queue.presentKHR(&presentInfo); + frame_index += 1; + frame_index %= FRAME_LAG; + if (present_result == vk::Result::eErrorOutOfDateKHR) { +-- +2.38.0 + diff --git a/sdk-1.3.224.0.tar.gz b/sdk-1.3.224.0.tar.gz deleted file mode 100644 index 4813c0b..0000000 --- a/sdk-1.3.224.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:939d623504cba0b8de2d117eef70dc45f3c21fa05103554d6565e0e23a7f5e04 -size 868481 diff --git a/v1.3.231.tar.gz b/v1.3.231.tar.gz new file mode 100644 index 0000000..1f03607 --- /dev/null +++ b/v1.3.231.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:379547b11eb65638cf5d83b260827a7b2dbfa7f31ef4002f8bfdca7bf3c89a8f +size 876522 diff --git a/vulkan-tools.changes b/vulkan-tools.changes index 7599456..eeab213 100644 --- a/vulkan-tools.changes +++ b/vulkan-tools.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Oct 24 19:54:24 UTC 2022 - Jan Engelhardt + +- Update to release 1.3.231.0 + * Adapt to Vulkan 231 API, but otherwise no interesting changes +- Add 0001-cubepp-Fix-presentKHR-assert.patch + ------------------------------------------------------------------- Mon Aug 22 22:42:50 UTC 2022 - Jan Engelhardt diff --git a/vulkan-tools.spec b/vulkan-tools.spec index 5273471..baf4028 100644 --- a/vulkan-tools.spec +++ b/vulkan-tools.spec @@ -17,20 +17,21 @@ Name: vulkan-tools -Version: 1.3.224.0 +Version: 1.3.231 Release: 0 Summary: Diagnostic utilities for Vulkan License: Apache-2.0 Group: Development/Tools/Other URL: https://github.com/KhronosGroup/Vulkan-Tools -Source: https://github.com/KhronosGroup/Vulkan-Tools/archive/refs/tags/sdk-%version.tar.gz +Source: https://github.com/KhronosGroup/Vulkan-Tools/archive/refs/tags/v%version.tar.gz +Patch1: 0001-cubepp-Fix-presentKHR-assert.patch BuildRequires: cmake >= 3.4 BuildRequires: gcc-c++ >= 4.8 BuildRequires: glslang-devel >= 8.13.3743 BuildRequires: pkg-config BuildRequires: python3-base -BuildRequires: pkgconfig(vulkan) >= 1.3.211 +BuildRequires: pkgconfig(vulkan) >= 1.3.231 BuildRequires: pkgconfig(wayland-protocols) BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xcb) @@ -45,7 +46,7 @@ graphics applications such as games and interactive media. This package contains the Khronos official Vulkan tools and utilities. %prep -%autosetup -p1 -n Vulkan-Tools-sdk-%version +%autosetup -p1 -n Vulkan-Tools-%version %build mkdir -p glslang/bin