diff options
author | Andreas Müller <schnitzeltony@gmail.com> | 2021-05-24 18:08:39 +0200 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2021-05-28 06:55:33 -0700 |
commit | 3ff4d6eb943e1ad9c60046070372f49f033d2f2b (patch) | |
tree | 3f398174026d8562aefe5e29d93bce32b3c0c301 /meta-oe/recipes-graphics | |
parent | 74d9b806a71a424d3864f6e5e88ab192c4d468db (diff) | |
download | meta-openembedded-3ff4d6eb943e1ad9c60046070372f49f033d2f2b.tar.gz |
renderdoc: upgrade 1.7 -> 1.13
* backported patch can go
* license checksum was changed by update of copyright year
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-graphics')
-rw-r--r-- | meta-oe/recipes-graphics/renderdoc/renderdoc/0001-Remove-glslang-pool_allocator-setAllocator.patch | 31 | ||||
-rw-r--r-- | meta-oe/recipes-graphics/renderdoc/renderdoc_1.13.bb (renamed from meta-oe/recipes-graphics/renderdoc/renderdoc_1.7.bb) | 10 |
2 files changed, 5 insertions, 36 deletions
diff --git a/meta-oe/recipes-graphics/renderdoc/renderdoc/0001-Remove-glslang-pool_allocator-setAllocator.patch b/meta-oe/recipes-graphics/renderdoc/renderdoc/0001-Remove-glslang-pool_allocator-setAllocator.patch deleted file mode 100644 index 6ba1e4268..000000000 --- a/meta-oe/recipes-graphics/renderdoc/renderdoc/0001-Remove-glslang-pool_allocator-setAllocator.patch +++ /dev/null | |||
@@ -1,31 +0,0 @@ | |||
1 | From 49dd914109fd1ee9e1e917890bf18f85dd95ff31 Mon Sep 17 00:00:00 2001 | ||
2 | From: Reid Kleckner <rnk@google.com> | ||
3 | Date: Sun, 29 Dec 2019 23:17:16 -0800 | ||
4 | Subject: [PATCH] Remove glslang::pool_allocator::setAllocator | ||
5 | |||
6 | TPoolAllocator is not copy assignable, so this setter could never have | ||
7 | been used. After a recent change (878a24ee2), new versions of Clang | ||
8 | reject this code outright. | ||
9 | |||
10 | Upstream-Status: Backport [https://github.com/KhronosGroup/glslang/commit/0de87ee9a5bf5d094a3faa1a71fd9080e80b6be0] | ||
11 | |||
12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
13 | --- | ||
14 | renderdoc/3rdparty/glslang/glslang/Include/PoolAlloc.h | 1 - | ||
15 | 1 file changed, 1 deletion(-) | ||
16 | |||
17 | diff --git a/renderdoc/3rdparty/glslang/glslang/Include/PoolAlloc.h b/renderdoc/3rdparty/glslang/glslang/Include/PoolAlloc.h | ||
18 | index 0e237a6a2..b8eccb883 100644 | ||
19 | --- a/renderdoc/3rdparty/glslang/glslang/Include/PoolAlloc.h | ||
20 | +++ b/renderdoc/3rdparty/glslang/glslang/Include/PoolAlloc.h | ||
21 | @@ -304,7 +304,6 @@ public: | ||
22 | size_type max_size() const { return static_cast<size_type>(-1) / sizeof(T); } | ||
23 | size_type max_size(int size) const { return static_cast<size_type>(-1) / size; } | ||
24 | |||
25 | - void setAllocator(TPoolAllocator* a) { allocator = *a; } | ||
26 | TPoolAllocator& getAllocator() const { return allocator; } | ||
27 | |||
28 | protected: | ||
29 | -- | ||
30 | 2.24.1 | ||
31 | |||
diff --git a/meta-oe/recipes-graphics/renderdoc/renderdoc_1.7.bb b/meta-oe/recipes-graphics/renderdoc/renderdoc_1.13.bb index 6ea632d06..fa74fb39e 100644 --- a/meta-oe/recipes-graphics/renderdoc/renderdoc_1.7.bb +++ b/meta-oe/recipes-graphics/renderdoc/renderdoc_1.13.bb | |||
@@ -2,12 +2,12 @@ SUMMARY = "RenderDoc recipe providing renderdoccmd" | |||
2 | DESCRIPTION = "RenderDoc is a frame-capture based graphics debugger" | 2 | DESCRIPTION = "RenderDoc is a frame-capture based graphics debugger" |
3 | HOMEPAGE = "https://github.com/baldurk/renderdoc" | 3 | HOMEPAGE = "https://github.com/baldurk/renderdoc" |
4 | LICENSE = "MIT" | 4 | LICENSE = "MIT" |
5 | LIC_FILES_CHKSUM = "file://LICENSE.md;md5=df7ea9e196efc7014c124747a0ef9772" | 5 | LIC_FILES_CHKSUM = "file://LICENSE.md;md5=5486c0df458c74c85828e0cdbffd499e" |
6 | 6 | ||
7 | SRCREV = "a56af589d94dc851809fd5344d0ae441da70c1f2" | 7 | SRCREV = "cc05b288b6d1660ab04c6cf01173f1bb62e6f5dd" |
8 | SRC_URI = "git://github.com/baldurk/${BPN}.git;protocol=http;branch=v1.x \ | 8 | SRC_URI = " \ |
9 | file://0001-renderdoc-use-xxd-instead-of-cross-compiling-shim-bi.patch \ | 9 | git://github.com/baldurk/${BPN}.git;protocol=http;branch=v1.x \ |
10 | file://0001-Remove-glslang-pool_allocator-setAllocator.patch \ | 10 | file://0001-renderdoc-use-xxd-instead-of-cross-compiling-shim-bi.patch \ |
11 | " | 11 | " |
12 | S = "${WORKDIR}/git" | 12 | S = "${WORKDIR}/git" |
13 | 13 | ||