diff options
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-graphics/renderdoc')
| -rw-r--r-- | meta-openembedded/meta-oe/recipes-graphics/renderdoc/renderdoc/0001-Remove-glslang-pool_allocator-setAllocator.patch | 31 | ||||
| -rw-r--r-- | meta-openembedded/meta-oe/recipes-graphics/renderdoc/renderdoc_1.13.bb (renamed from meta-openembedded/meta-oe/recipes-graphics/renderdoc/renderdoc_1.7.bb) | 10 |
2 files changed, 5 insertions, 36 deletions
diff --git a/meta-openembedded/meta-oe/recipes-graphics/renderdoc/renderdoc/0001-Remove-glslang-pool_allocator-setAllocator.patch b/meta-openembedded/meta-oe/recipes-graphics/renderdoc/renderdoc/0001-Remove-glslang-pool_allocator-setAllocator.patch deleted file mode 100644 index 6ba1e4268..000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/renderdoc/renderdoc/0001-Remove-glslang-pool_allocator-setAllocator.patch +++ /dev/null @@ -1,31 +0,0 @@ -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-openembedded/meta-oe/recipes-graphics/renderdoc/renderdoc_1.7.bb b/meta-openembedded/meta-oe/recipes-graphics/renderdoc/renderdoc_1.13.bb index 6ea632d06..fa74fb39e 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/renderdoc/renderdoc_1.7.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/renderdoc/renderdoc_1.13.bb @@ -2,12 +2,12 @@ SUMMARY = "RenderDoc recipe providing renderdoccmd" DESCRIPTION = "RenderDoc is a frame-capture based graphics debugger" HOMEPAGE = "https://github.com/baldurk/renderdoc" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.md;md5=df7ea9e196efc7014c124747a0ef9772" +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=5486c0df458c74c85828e0cdbffd499e" -SRCREV = "a56af589d94dc851809fd5344d0ae441da70c1f2" -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 \ +SRCREV = "cc05b288b6d1660ab04c6cf01173f1bb62e6f5dd" +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 \ " S = "${WORKDIR}/git" |