Commit Graph

18 Commits

Author SHA1 Message Date
Changqing Li
eb7fde3372 vulkan-samples: fix do_compile error when -Og enabled
When debug build is enabled(-Og is used), vulkan-samples do_compile
failed with 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);

Refer [1], always_inline is not suggested to use with indirect function
call, replace always_inline with inline to fix the issue

[1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=107931

(From OE-Core rev: cfff19bb3fae45e62f77e860a4413669a6dc0e81)

Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 246de52fe59de0612d1145357c5e904a51363c8c)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
2024-07-23 06:05:47 -07:00
Martin Jansa
5d32c24baa vulkan-samples: drop PE, PR from /usr/src/debug paths
(From OE-Core rev: 23c40b46af0ede566b854fdeaeae9675c2f48549)

Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2023-11-20 15:30:53 +00:00
Julien Stephan
038d646d7e vulkan-samples: convert debugfix.patch to git format patch
devtool modify on vulkan-samples fails to apply the debugfix.patch
because it is not in one of git's known formats.

Here is the error:
ERROR: Applying patch 'debugfix.patch' on target directory '<..>/build/tmp/work/core2-64-poky-linux/vulkan-samples/git/devtooltmp-38uz7jyq/workdir/git'
CmdError("sh -c 'git add -f -A .'", 0, 'stdout:
stderr: fatal: not a git repository (or any of the parent directories):
.git
')

Also, rename debugfix.patch to something more meaningfull

(From OE-Core rev: c05c508cf3141a6923d87e1d04f7387ce3c91a9d)

Signed-off-by: Julien Stephan <jstephan@baylibre.com>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2023-08-29 09:41:07 +01:00
Ross Burton
a82397c2b9 vulkan-samples: fix build on 32-bit platforms
Backport a patch from upstream to fix the build on 32-bit platforms, and
remove the COMPATIBLE_HOST restriction.

(From OE-Core rev: f4f693ac3ba46373103f749f028ab296e6aeb085)

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2023-06-06 07:41:42 +01:00
Alexander Kanavin
df05a893b3 vulkan-samples: update to latest revision
Drop patch as it's merged upstream.

(From OE-Core rev: fd1f4035fef30782f9e07a778fa63b78fab89102)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2023-02-20 15:18:30 +00:00
Khem Raj
71e301efc4 vulkan-samples: Include missing header cstdint for uint32_t
(From OE-Core rev: 47f6a75960b3af2be7f45fd06e2fb73549b6933b)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2023-01-24 22:06:51 +00:00
Khem Raj
351243a0ca vulkan-samples: Drop using u8string_view
Its deprecated in upstream fmt as well. Moreover it helps compile with
latest compiler

(From OE-Core rev: 01ef766ada47cd845643c632160e1808fa237d1c)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2023-01-20 16:40:47 +00:00
Khem Raj
db2cf93abc vulkan-samples: Update to the tip of trunk
Drop backported patches

(From OE-Core rev: bfbbade9a993fe1f39f41b81708a8a92e45b65f1)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2023-01-16 10:42:07 +00:00
Khem Raj
e73119966a vulkan-samples: Do not use LFS64 APIs in spdlog
(From OE-Core rev: cac83db8486943f013c5d33be2a353b492f20fd5)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2022-12-31 17:08:29 +00:00
Alexander Kanavin
b933243afb vulkan-samples: update to latest revision
Drop upstreamed patch.

(From OE-Core rev: b88edd42ac9bfd38153f6178d782936b52542f31)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2022-08-21 22:51:42 +01:00
Khem Raj
f7e8bf37bc vulkan-samples: Qualify move as std::move
Fixes build with clang

(From OE-Core rev: 848551e59ce5d8d11cffc51b62b3665913cf166e)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2022-08-17 19:57:32 +01:00
Alexander Kanavin
ca282da0b8 vulkan-samples: update to latest revision
(From OE-Core rev: 3d55944b1c31f8f56ea098889a62f6276358662e)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2022-07-23 13:55:25 +01:00
Alexander Kanavin
d2ef9a0874 vulkan-samples: update to latest revision
(From OE-Core rev: ea18d074a89f22460fb4e943df652e668a03a792)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2022-02-18 11:37:11 +00:00
Khem Raj
a8f34f0110 vulkan-samples: Fix cmake errors about plain signature
Fix some typecasting errors seen on 32bit platforms with clang

(From OE-Core rev: f37d209220e2393384facf676f33fb7c68ab11e6)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-11-15 12:55:27 +00:00
Alexander Kanavin
d8fe22e05f vulkan-samples: update to latest revision
Drop patch merged upstream.

(From OE-Core rev: 4ca7c5435a379160fb9ac2d2d9d7aa5550632f65)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-02-09 08:56:10 +00:00
Richard Purdie
49c12484eb vulkan-samples: Fix reproducibility issue
There is code to remove the prefix CMAKE_SOURCE_DIR from __FILENAME__ paths
used for logging with LOGE() in the code. We need to make this match the value we use
in the debug source remapping from CFLAGS. If we don't, the code is firstly removing
the incorrect prefix and possibly moving outside the string, secondly, it causes a
reproducibility issue depending on the length of path the build happens in.

Add a small patch and configuration to avoid the issue.

(From OE-Core rev: 410dbfd1f82b4862ced6fca88789edf0fd9d65df)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-01-15 13:39:25 +00:00
Changqing Li
0fa07d1811 vulkan-samples: fix do_compile failure
fix error:
| framework/lib/ppc/libframework.a(device.cpp.o): in function `std::__atomic_base<unsigned long long>::load(std::memory_order) const':
| /usr/include/c++/10.2.0/bits/atomic_base.h:426: undefined reference to `__atomic_load_8'

some arch don't have built-in atomic, so need to link it
explicitly

(From OE-Core rev: 65410c5ff4f9c34758d1e2270132c631166e7d1a)

Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-11-24 10:27:45 +00:00
Alexander Kanavin
a9973bb87d vulkan-samples: replace vulkan-demos
vulkan-samples is the official collection, and vulkan-demos
author has stated that he will be mostly contributing there:
https://github.com/SaschaWillems/Vulkan#Khronossamples

(From OE-Core rev: 76a25391d09de06f832c1053d3dbc901dee3b912)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-11-03 08:21:10 +00:00