vulkan-samples: update to latest revision

Drop patch as issue fixed upstream.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-graphics/vulkan/vulkan-samples/0001-zstd.c-replace-FORCE_INLINE_TEMPLATE-with-inline.patch b/meta/recipes-graphics/vulkan/vulkan-samples/0001-zstd.c-replace-FORCE_INLINE_TEMPLATE-with-inline.patch
deleted file mode 100644 (file)
index 22538d4..0000000
--- a/meta/recipes-graphics/vulkan/vulkan-samples/0001-zstd.c-replace-FORCE_INLINE_TEMPLATE-with-inline.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From a7bfe82a311c713b12bb83b8488574ad5c784f89 Mon Sep 17 00:00:00 2001
-From: Changqing Li <changqing.li@windriver.com>
-Date: Tue, 9 Jul 2024 04:29:11 +0000
-Subject: [PATCH] zstd.c: replace FORCE_INLINE_TEMPLATE with inline
-
-Refer [1], always-inline is not suggested to be used if you have indirect
-+calls. so replace FORCE_INLINE_TEMPLATE with inline to fix error:
-In function 'ZSTD_compressBlock_lazy_generic',
-    inlined from 'ZSTD_compressBlock_greedy' at TOPDIR/tmp-glibc/work/core2-32-wrs-linux/vulkan-samples/git/git/third_party/ktx/lib/basisu/zstd/zstd.c:21914:12:
-TOPDIR/tmp-glibc/work/core2-32-wrs-linux/vulkan-samples/git/git/third_party/ktx/lib/basisu/zstd/zstd.c:21551:30: error: inlining failed in call to 'always_inline' 'ZSTD_HcFindBestMatch_selectMLS': function not considered for inlining
- | FORCE_INLINE_TEMPLATE size_t ZSTD_HcFindBestMatch_selectMLS (
-      |                              ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-TOPDIR/tmp-glibc/work/core2-32-wrs-linux/vulkan-samples/git/git/third_party/ktx/lib/basisu/zstd/zstd.c:21736:32: note: called from here
-|             size_t const ml2 = searchMax(ms, ip, iend, &offsetFound);
-
-Upstream-Status: Inappropriate [ Latest upstream ktx don't have this part code ]
-
-Has report this issue to upstream Vulkan-Samples, refer [2]
-
-[1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=107931
-[2] https://github.com/KhronosGroup/Vulkan-Samples/issues/1089
-
-Signed-off-by: Changqing Li <changqing.li@windriver.com>
----
- lib/basisu/zstd/zstd.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/lib/basisu/zstd/zstd.c b/lib/basisu/zstd/zstd.c
-index eaf13738..423f149e 100644
---- a/lib/basisu/zstd/zstd.c
-+++ b/lib/basisu/zstd/zstd.c
-@@ -21548,7 +21548,7 @@ size_t ZSTD_HcFindBestMatch_generic (
- }
- 
- 
--FORCE_INLINE_TEMPLATE size_t ZSTD_HcFindBestMatch_selectMLS (
-+static inline size_t ZSTD_HcFindBestMatch_selectMLS (
-                         ZSTD_matchState_t* ms,
-                         const BYTE* ip, const BYTE* const iLimit,
-                         size_t* offsetPtr)
-@@ -21596,7 +21596,7 @@ static size_t ZSTD_HcFindBestMatch_dedicatedDictSearch_selectMLS (
- }
- 
- 
--FORCE_INLINE_TEMPLATE size_t ZSTD_HcFindBestMatch_extDict_selectMLS (
-+static inline size_t ZSTD_HcFindBestMatch_extDict_selectMLS (
-                         ZSTD_matchState_t* ms,
-                         const BYTE* ip, const BYTE* const iLimit,
-                         size_t* offsetPtr)
--- 
-2.44.0
-

diff --git a/meta/recipes-graphics/vulkan/vulkan-samples_git.bb b/meta/recipes-graphics/vulkan/vulkan-samples_git.bb
index 06e996d24358b8f8866736f11ffb672f4e277b83..2dd4bba5230d3c8955e6e7094792c10e3d74abe2 100644 (file)
--- a/meta/recipes-graphics/vulkan/vulkan-samples_git.bb
+++ b/meta/recipes-graphics/vulkan/vulkan-samples_git.bb
@@ -7,11 +7,10 @@ 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-zstd.c-replace-FORCE_INLINE_TEMPLATE-with-inline.patch;patchdir=third_party/ktx \
            "
 
 UPSTREAM_CHECK_COMMITS = "1"
-SRCREV = "fdce530c029514e2f66296288f9ee26a05058ec1"
+SRCREV = "4838e02a4b08236931bec0532fc26ee3871b466a"
 
 UPSTREAM_CHECK_GITTAGREGEX = "These are not the releases you're looking for"
 S = "${WORKDIR}/git"