diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2019-12-29 23:22:00 -0800 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2019-12-31 11:06:23 -0800 |
| commit | 13b8e3fc5d091057fff8914a5c42efacaefd63ee (patch) | |
| tree | ced3c1e4493fe9c2e7005fb8cf124e643f8282bb | |
| parent | 0b80ef143193955300941421e16b3aa207fa6405 (diff) | |
| download | meta-openembedded-contrib-13b8e3fc5d091057fff8914a5c42efacaefd63ee.tar.gz | |
renderdoc: Upgrade to 1.5
Backport a patch from glslang to fix a build error
https://github.com/KhronosGroup/glslang/issues/1869
Signed-off-by: Khem Raj <raj.khem@gmail.com>
| -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.5.bb (renamed from meta-oe/recipes-graphics/renderdoc/renderdoc_1.4.bb) | 3 |
2 files changed, 33 insertions, 1 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 new file mode 100644 index 0000000000..6ba1e42687 --- /dev/null +++ b/meta-oe/recipes-graphics/renderdoc/renderdoc/0001-Remove-glslang-pool_allocator-setAllocator.patch @@ -0,0 +1,31 @@ +From 49dd914109fd1ee9e1e917890bf18f85dd95ff31 Mon Sep 17 00:00:00 2001 +From: Reid Kleckner <rnk@google.com> +Date: Sun, 29 Dec 2019 23:17:16 -0800 +Subject: [PATCH] Remove glslang::pool_allocator::setAllocator + +TPoolAllocator is not copy assignable, so this setter could never have +been used. After a recent change (878a24ee2), new versions of Clang +reject this code outright. + +Upstream-Status: Backport [https://github.com/KhronosGroup/glslang/commit/0de87ee9a5bf5d094a3faa1a71fd9080e80b6be0] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + renderdoc/3rdparty/glslang/glslang/Include/PoolAlloc.h | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/renderdoc/3rdparty/glslang/glslang/Include/PoolAlloc.h b/renderdoc/3rdparty/glslang/glslang/Include/PoolAlloc.h +index 0e237a6a2..b8eccb883 100644 +--- a/renderdoc/3rdparty/glslang/glslang/Include/PoolAlloc.h ++++ b/renderdoc/3rdparty/glslang/glslang/Include/PoolAlloc.h +@@ -304,7 +304,6 @@ public: + size_type max_size() const { return static_cast<size_type>(-1) / sizeof(T); } + size_type max_size(int size) const { return static_cast<size_type>(-1) / size; } + +- void setAllocator(TPoolAllocator* a) { allocator = *a; } + TPoolAllocator& getAllocator() const { return allocator; } + + protected: +-- +2.24.1 + diff --git a/meta-oe/recipes-graphics/renderdoc/renderdoc_1.4.bb b/meta-oe/recipes-graphics/renderdoc/renderdoc_1.5.bb index 784f6fbb8c..5f81e841dc 100644 --- a/meta-oe/recipes-graphics/renderdoc/renderdoc_1.4.bb +++ b/meta-oe/recipes-graphics/renderdoc/renderdoc_1.5.bb @@ -4,9 +4,10 @@ HOMEPAGE = "https://github.com/baldurk/renderdoc" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.md;md5=9753b1b4fba3261c27d1ce5c1acef667" -SRCREV = "214d85228538e71cc63a0d7fa11dd75b1d56cc81" +SRCREV = "a94f238e37cfe2f142093eb8e5da7775abaa88c6" SRC_URI = "git://github.com/baldurk/${BPN}.git;protocol=http;branch=v1.x \ file://0001-renderdoc-use-xxd-instead-of-cross-compiling-shim-bi.patch \ + file://0001-Remove-glslang-pool_allocator-setAllocator.patch \ " S = "${WORKDIR}/git" |