diff options
Diffstat (limited to 'glsl-fix.patch')
| -rw-r--r-- | glsl-fix.patch | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/glsl-fix.patch b/glsl-fix.patch new file mode 100644 index 000000000000..73cfe5511d0d --- /dev/null +++ b/glsl-fix.patch @@ -0,0 +1,24 @@ +From 24b3e8384e93f3e73b6aa14ea00a30574112f9ba Mon Sep 17 00:00:00 2001 +From: Reid Kleckner <rnk@google.com> +Date: Wed, 4 Dec 2019 14:09:03 -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. +--- + Include/PoolAlloc.h | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/Include/PoolAlloc.h b/Include/PoolAlloc.h +index 0e237a6a2..b8eccb883 100644 +--- a/Include/PoolAlloc.h ++++ b/Include/PoolAlloc.h +@@ -304,7 +304,6 @@ class pool_allocator { + 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: |