diff --git a/meta/recipes-graphics/vulkan/vulkan-samples/0001-Deprecate-u8string_view.patch b/meta/recipes-graphics/vulkan/vulkan-samples/0001-Deprecate-u8string_view.patch deleted file mode 100644 index c2304bdd48..0000000000 --- a/meta/recipes-graphics/vulkan/vulkan-samples/0001-Deprecate-u8string_view.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 93987b1ce7d6f91387202495aac61026070597df Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sun, 15 Jan 2023 21:37:52 -0800 -Subject: [PATCH] Deprecate u8string_view - -Use basic_string_view instead - -Upstream-Status: Backport [https://github.com/fmtlib/fmt/commit/dea7fde8b7d649923dd41b0766bdf076033c62a2] -Signed-off-by: Khem Raj ---- - include/spdlog/fmt/bundled/core.h | 3 ++- - include/spdlog/fmt/bundled/format.h | 15 ++------------- - 2 files changed, 4 insertions(+), 14 deletions(-) - -diff --git a/include/spdlog/fmt/bundled/core.h b/include/spdlog/fmt/bundled/core.h -index 50b79351..e8b029ef 100644 ---- a/include/spdlog/fmt/bundled/core.h -+++ b/include/spdlog/fmt/bundled/core.h -@@ -1484,7 +1484,8 @@ FMT_API void vprint(wstring_view format_str, wformat_args args); - - /** - \rst -- Prints formatted data to ``stdout``. -+ Formats ``args`` according to specifications in ``format_str`` and writes the -+ output to ``stdout``. - - **Example**:: - -diff --git a/include/spdlog/fmt/bundled/format.h b/include/spdlog/fmt/bundled/format.h -index 1bb24a52..39426361 100644 ---- a/include/spdlog/fmt/bundled/format.h -+++ b/include/spdlog/fmt/bundled/format.h -@@ -407,21 +407,10 @@ void basic_buffer::append(const U *begin, const U *end) { - enum char8_t: unsigned char {}; - #endif - --// A UTF-8 string view. --class u8string_view : public basic_string_view { -- public: -- typedef char8_t char_type; -- -- u8string_view(const char *s): -- basic_string_view(reinterpret_cast(s)) {} -- u8string_view(const char *s, size_t count) FMT_NOEXCEPT: -- basic_string_view(reinterpret_cast(s), count) {} --}; -- - #if FMT_USE_USER_DEFINED_LITERALS - inline namespace literals { --inline u8string_view operator"" _u(const char *s, std::size_t n) { -- return {s, n}; -+inline basic_string_view operator"" _u(const char* s, std::size_t n) { -+ return {reinterpret_cast(s), n}; - } - } - #endif --- -2.39.0 - diff --git a/meta/recipes-graphics/vulkan/vulkan-samples/0001-Do-not-use-LFS64-functions-on-linux-musl.patch b/meta/recipes-graphics/vulkan/vulkan-samples/0001-Do-not-use-LFS64-functions-on-linux-musl.patch deleted file mode 100644 index f2bd7e510b..0000000000 --- a/meta/recipes-graphics/vulkan/vulkan-samples/0001-Do-not-use-LFS64-functions-on-linux-musl.patch +++ /dev/null @@ -1,37 +0,0 @@ -From ce7a593e74c8e0c2ece15c73e7614d4f13a19a53 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 30 Dec 2022 13:04:08 -0800 -Subject: [PATCH] Do not use LFS64 functions on linux/musl - -On musl, off_t is 64bit always ( even on 32bit platforms ), therefore using -LFS64 funcitons is not needed on such platforms. Moreover, musl has stopped -providing aliases for these functions [1] which means it wont compile on -newer musl systems. Therefore only use it on 32bit glibc/linux platforms -and exclude musl like cygwin or OSX - -[1] https://git.musl-libc.org/cgit/musl/commit/?id=246f1c811448f37a44b41cd8df8d0ef9736d95f4 - -Upstream-Status: Submitted [https://github.com/gabime/spdlog/pull/2589] -Signed-off-by: Khem Raj ---- - include/spdlog/details/os.h | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/include/spdlog/details/os.h b/include/spdlog/details/os.h -index 8e8476f0..be0a67b8 100644 ---- a/include/spdlog/details/os.h -+++ b/include/spdlog/details/os.h -@@ -227,7 +227,9 @@ inline size_t filesize(FILE *f) - #else // unix - int fd = fileno(f); - // 64 bits(but not in osx or cygwin, where fstat64 is deprecated) --#if !defined(__FreeBSD__) && !defined(__APPLE__) && (defined(__x86_64__) || defined(__ppc64__)) && !defined(__CYGWIN__) -+#if !defined(__FreeBSD__) && !defined(__APPLE__) && \ -+ (defined(__linux__) && defined(__GLIBC__)) && \ -+ (defined(__x86_64__) || defined(__ppc64__)) && !defined(__CYGWIN__) - struct stat64 st; - if (::fstat64(fd, &st) == 0) - { --- -2.39.0 - diff --git a/meta/recipes-graphics/vulkan/vulkan-samples/32bit.patch b/meta/recipes-graphics/vulkan/vulkan-samples/32bit.patch deleted file mode 100644 index 644c3b6167..0000000000 --- a/meta/recipes-graphics/vulkan/vulkan-samples/32bit.patch +++ /dev/null @@ -1,101 +0,0 @@ -From 49761ca63797014223d8e3ff6fb2c0235803c19c Mon Sep 17 00:00:00 2001 -From: asuessenbach -Date: Wed, 3 May 2023 09:50:08 +0200 -Subject: [PATCH] Resolve some Vulkan-Hpp-related issues on Win32. - -This patch fixes vulkan-samples compilation on 32-bit hosts. - -Upstream-Status: Backport -Signed-off-by: Ross Burton - ---- - framework/common/hpp_vk_common.h | 4 ++-- - framework/core/hpp_buffer.cpp | 4 ++-- - framework/core/hpp_buffer.h | 2 +- - framework/core/hpp_image.cpp | 2 +- - samples/api/hpp_texture_loading/hpp_texture_loading.cpp | 2 +- - 5 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/framework/common/hpp_vk_common.h b/framework/common/hpp_vk_common.h -index 39ed3dcde..0cbbe479e 100644 ---- a/framework/common/hpp_vk_common.h -+++ b/framework/common/hpp_vk_common.h -@@ -92,7 +92,7 @@ inline bool is_dynamic_buffer_descriptor_type(vk::DescriptorType descriptor_type - - inline vk::ShaderModule load_shader(const std::string &filename, vk::Device device, vk::ShaderStageFlagBits stage) - { -- return vkb::load_shader(filename, device, static_cast(stage)); -+ return static_cast(vkb::load_shader(filename, device, static_cast(stage))); - } - - inline void set_image_layout(vk::CommandBuffer command_buffer, -@@ -104,7 +104,7 @@ inline void set_image_layout(vk::CommandBuffer command_buffer, - vk::PipelineStageFlags dst_mask = vk::PipelineStageFlagBits::eAllCommands) - { - vkb::set_image_layout(command_buffer, -- image, -+ static_cast(image), - static_cast(old_layout), - static_cast(new_layout), - static_cast(subresource_range), -diff --git a/framework/core/hpp_buffer.cpp b/framework/core/hpp_buffer.cpp -index 8da265acb..e6509b9f4 100644 ---- a/framework/core/hpp_buffer.cpp -+++ b/framework/core/hpp_buffer.cpp -@@ -84,7 +84,7 @@ HPPBuffer::~HPPBuffer() - if (get_handle() && (allocation != VK_NULL_HANDLE)) - { - unmap(); -- vmaDestroyBuffer(get_device().get_memory_allocator(), get_handle(), allocation); -+ vmaDestroyBuffer(get_device().get_memory_allocator(), static_cast(get_handle()), allocation); - } - } - -@@ -93,7 +93,7 @@ VmaAllocation HPPBuffer::get_allocation() const - return allocation; - } - --VkDeviceMemory HPPBuffer::get_memory() const -+vk::DeviceMemory HPPBuffer::get_memory() const - { - return memory; - } -diff --git a/framework/core/hpp_buffer.h b/framework/core/hpp_buffer.h -index 7a243c265..bad47406d 100644 ---- a/framework/core/hpp_buffer.h -+++ b/framework/core/hpp_buffer.h -@@ -55,7 +55,7 @@ class HPPBuffer : public vkb::core::HPPVulkanResource - - VmaAllocation get_allocation() const; - const uint8_t *get_data() const; -- VkDeviceMemory get_memory() const; -+ vk::DeviceMemory get_memory() const; - - /** - * @return Return the buffer's device address (note: requires that the buffer has been created with the VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT usage fla) -diff --git a/framework/core/hpp_image.cpp b/framework/core/hpp_image.cpp -index 00fa89ba7..5e6f27363 100644 ---- a/framework/core/hpp_image.cpp -+++ b/framework/core/hpp_image.cpp -@@ -138,7 +138,7 @@ HPPImage::~HPPImage() - if (get_handle() && memory) - { - unmap(); -- vmaDestroyImage(get_device().get_memory_allocator(), get_handle(), memory); -+ vmaDestroyImage(get_device().get_memory_allocator(), static_cast(get_handle()), memory); - } - } - -diff --git a/samples/api/hpp_texture_loading/hpp_texture_loading.cpp b/samples/api/hpp_texture_loading/hpp_texture_loading.cpp -index 11a1f24c1..cbdd22773 100644 ---- a/samples/api/hpp_texture_loading/hpp_texture_loading.cpp -+++ b/samples/api/hpp_texture_loading/hpp_texture_loading.cpp -@@ -170,7 +170,7 @@ void HPPTextureLoading::load_texture() - memory_allocate_info = {memory_requirements.size, - get_device()->get_gpu().get_memory_type(memory_requirements.memoryTypeBits, vk::MemoryPropertyFlagBits::eDeviceLocal)}; - texture.device_memory = get_device()->get_handle().allocateMemory(memory_allocate_info); -- VK_CHECK(vkBindImageMemory(get_device()->get_handle(), texture.image, texture.device_memory, 0)); -+ get_device()->get_handle().bindImageMemory(texture.image, texture.device_memory, 0); - - vk::CommandBuffer copy_command = get_device()->create_command_buffer(vk::CommandBufferLevel::ePrimary, true); - diff --git a/meta/recipes-graphics/vulkan/vulkan-samples_git.bb b/meta/recipes-graphics/vulkan/vulkan-samples_git.bb index 4e688e44a7..93d4cdfdd9 100644 --- a/meta/recipes-graphics/vulkan/vulkan-samples_git.bb +++ b/meta/recipes-graphics/vulkan/vulkan-samples_git.bb @@ -7,14 +7,11 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=48aa35cefb768436223a6e7f18dc2a2a" SRC_URI = "gitsm://github.com/KhronosGroup/Vulkan-Samples.git;branch=main;protocol=https;lfs=0 \ file://0001-vulkan-samples-Fix-reproducibility-issue.patch \ - file://0001-Do-not-use-LFS64-functions-on-linux-musl.patch;patchdir=third_party/spdlog \ - file://0001-Deprecate-u8string_view.patch;patchdir=third_party/spdlog \ - file://32bit.patch \ file://0001-zstd.c-replace-FORCE_INLINE_TEMPLATE-with-inline.patch;patchdir=third_party/ktx \ " UPSTREAM_CHECK_COMMITS = "1" -SRCREV = "2307c3eb5608cb1205fa3514b3a31dbfb857d00c" +SRCREV = "fdce530c029514e2f66296288f9ee26a05058ec1" UPSTREAM_CHECK_GITTAGREGEX = "These are not the releases you're looking for" S = "${WORKDIR}/git" @@ -38,3 +35,5 @@ EXTRA_OECMAKE += "-DCMAKE_DISABLE_PRECOMPILE_HEADERS=ON" # This needs to be specified explicitly to avoid xcb/xlib dependencies EXTRA_OECMAKE += "-DVKB_WSI_SELECTION=D2D" + +COMPATIBLE_HOST:x86 = "null"