From: Alexander Kanavin Date: Thu, 17 Feb 2022 16:09:21 +0000 (+0100) Subject: vulkan-samples: update to latest revision X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=ea18d074a89f22460fb4e943df652e668a03a792;p=openembedded-core.git vulkan-samples: update to latest revision Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- diff --git a/meta/recipes-graphics/vulkan/vulkan-samples/0001-framework-core-Add-explicit-static_cast-from-vk-Buff.patch b/meta/recipes-graphics/vulkan/vulkan-samples/0001-framework-core-Add-explicit-static_cast-from-vk-Buff.patch deleted file mode 100644 index b0e7cdabe4..0000000000 --- a/meta/recipes-graphics/vulkan/vulkan-samples/0001-framework-core-Add-explicit-static_cast-from-vk-Buff.patch +++ /dev/null @@ -1,35 +0,0 @@ -From f88fd472e57b59013570f08949dbbc0875c1bae4 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 13 Nov 2021 18:37:13 -0800 -Subject: [PATCH] framework/core: Add explicit static_cast from vk::Buffer to - VkBuffer - -This fixes errors like -framework/core/hpp_buffer.cpp:149:3: error: no matching function for call to 'vmaDestroyBuffer' -| vmaDestroyBuffer(vmaAllocator, handle, vmaAllocation); -| ^~~~~~~~~~~~~~~~ -| /mnt/b/yoe/master/build/tmp/work/riscv32-yoe-linux-musl/vulkan-samples/git-r0/git/third_party/vma/src/vk_mem_alloc.h:3803:33: note: candidate function not viable: no known conversion from 'vk::Buffer' to 'V -kBuffer' (aka 'unsigned long long') for 2nd argument - -Upstream-Status: Submitted [https://github.com/KhronosGroup/Vulkan-Samples/pull/395] -Signed-off-by: Khem Raj ---- - framework/core/hpp_buffer.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/framework/core/hpp_buffer.cpp b/framework/core/hpp_buffer.cpp -index c1f5649..2609e4e 100644 ---- a/framework/core/hpp_buffer.cpp -+++ b/framework/core/hpp_buffer.cpp -@@ -146,7 +146,7 @@ void HPPBuffer::destroy() - { - assert(vmaAllocation != VK_NULL_HANDLE); - unmap(); -- vmaDestroyBuffer(vmaAllocator, handle, vmaAllocation); -+ vmaDestroyBuffer(vmaAllocator, static_cast(handle), vmaAllocation); - } - } - --- -2.33.1 - diff --git a/meta/recipes-graphics/vulkan/vulkan-samples/0001-framework-do-not-mix-plain-and-keyword-target_link_l.patch b/meta/recipes-graphics/vulkan/vulkan-samples/0001-framework-do-not-mix-plain-and-keyword-target_link_l.patch deleted file mode 100644 index 66ed8bb47d..0000000000 --- a/meta/recipes-graphics/vulkan/vulkan-samples/0001-framework-do-not-mix-plain-and-keyword-target_link_l.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 64b806ab702a6f445fd84aca5f03bb85b86a66e3 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Thu, 11 Nov 2021 18:37:09 -0800 -Subject: [PATCH] framework: do not mix plain and keyword - target_link_libraries() signatures - -Fixes -| CMake Error at framework/CMakeLists.txt:461 (target_link_libraries): -| The plain signature for target_link_libraries has already been used with -| the target "framework". All uses of target_link_libraries with a target | must be either all-keyword or all-plain. -| -| The uses of the plain signature are here: -| | * framework/CMakeLists.txt:453 (target_link_libraries) -| - -Upstream-Status: Submitted [https://github.com/KhronosGroup/Vulkan-Samples/pull/395] - -Signed-off-by: Khem Raj ---- - framework/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/framework/CMakeLists.txt b/framework/CMakeLists.txt -index 948c796..13d3324 100644 ---- a/framework/CMakeLists.txt -+++ b/framework/CMakeLists.txt -@@ -450,7 +450,7 @@ target_link_libraries(${PROJECT_NAME} PUBLIC - plugins) - - if(${NEED_LINK_ATOMIC}) -- target_link_libraries(${PROJECT_NAME} atomic) -+ target_link_libraries(${PROJECT_NAME} PUBLIC atomic) - endif() - - # Link platform specific libraries --- -2.33.1 - diff --git a/meta/recipes-graphics/vulkan/vulkan-samples_git.bb b/meta/recipes-graphics/vulkan/vulkan-samples_git.bb index 1e45e9f04b..53c7254ce7 100644 --- a/meta/recipes-graphics/vulkan/vulkan-samples_git.bb +++ b/meta/recipes-graphics/vulkan/vulkan-samples_git.bb @@ -7,13 +7,11 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=48aa35cefb768436223a6e7f18dc2a2a" SRC_URI = "gitsm://github.com/KhronosGroup/Vulkan-Samples.git;branch=master;protocol=https \ file://0001-CMakeLists.txt-do-not-hardcode-lib-as-installation-t.patch \ - file://0001-framework-do-not-mix-plain-and-keyword-target_link_l.patch \ - file://0001-framework-core-Add-explicit-static_cast-from-vk-Buff.patch \ file://debugfix.patch \ " UPSTREAM_CHECK_COMMITS = "1" -SRCREV = "ae6e4a3712cebde49a29e5996a3bd2f403566890" +SRCREV = "28ca2dad83ceb157386e0708f5151ae89c177ad4" UPSTREAM_CHECK_GITTAGREGEX = "These are not the releases you're looking for" S = "${WORKDIR}/git"