diff --git a/0001-cubepp-Fix-presentKHR-assert.patch b/0001-cubepp-Fix-presentKHR-assert.patch deleted file mode 100644 index c6c4b02..0000000 --- a/0001-cubepp-Fix-presentKHR-assert.patch +++ /dev/null @@ -1,41 +0,0 @@ -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.236.0.tar.gz b/sdk-1.3.236.0.tar.gz new file mode 100644 index 0000000..05e6e99 --- /dev/null +++ b/sdk-1.3.236.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5b0d96acce7d7354a6bc055cafeca9191cda860975390780b3146b8ab1f8a8d3 +size 880927 diff --git a/v1.3.231.tar.gz b/v1.3.231.tar.gz deleted file mode 100644 index 1f03607..0000000 --- a/v1.3.231.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:379547b11eb65638cf5d83b260827a7b2dbfa7f31ef4002f8bfdca7bf3c89a8f -size 876522 diff --git a/vulkan-tools.changes b/vulkan-tools.changes index eeab213..487a86d 100644 --- a/vulkan-tools.changes +++ b/vulkan-tools.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Dec 15 14:00:33 UTC 2022 - Jan Engelhardt + +- Update to release SDK-1.3.236.0 + * vulkaninfo: Add Driver Version handling +- Delete 0001-cubepp-Fix-presentKHR-assert.patch (merged) + ------------------------------------------------------------------- Mon Oct 24 19:54:24 UTC 2022 - Jan Engelhardt diff --git a/vulkan-tools.spec b/vulkan-tools.spec index baf4028..7470144 100644 --- a/vulkan-tools.spec +++ b/vulkan-tools.spec @@ -17,21 +17,19 @@ Name: vulkan-tools -Version: 1.3.231 +Version: 1.3.236.0 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/v%version.tar.gz -Patch1: 0001-cubepp-Fix-presentKHR-assert.patch +Source: https://github.com/KhronosGroup/Vulkan-Tools/archive/refs/tags/sdk-%version.tar.gz 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.231 +BuildRequires: pkgconfig(vulkan) >= 1.3.236 BuildRequires: pkgconfig(wayland-protocols) BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xcb) @@ -46,7 +44,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-%version +%autosetup -p1 -n Vulkan-Tools-sdk-%version %build mkdir -p glslang/bin