diff options
author | Khem Raj <raj.khem@gmail.com> | 2017-07-29 00:42:49 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-07-31 14:25:44 +0100 |
commit | da29bc17e4dd748f50b054c5e3afaf8d41bf4077 (patch) | |
tree | f9d7a4bf464dc1896b35563d5169d63f8ddefa8f /meta/recipes-graphics/mesa/files/0002-gallivm-Fix-build-against-LLVM-SVN-r302589.patch | |
parent | 8724ef9c53e7804ead9ba0f019369b0e4daada63 (diff) | |
download | openembedded-core-da29bc17e4dd748f50b054c5e3afaf8d41bf4077.tar.gz |
mesa: Fix build when building with llvmpipe
Add following in mesa.inc to enable llvmpipe
PACKAGECONFIG_append_x86 = " gallium-llvm gallium r600"
PACKAGECONFIG_append_x86-64 = " gallium-llvm gallium r600"
This would enable llvmpipe for swrast, to check run this
root@qemux86:~# glxinfo | grep llvm
Device: llvmpipe (LLVM 5.0, 128 bits) (0xffffffff)
OpenGL renderer string: Gallium 0.4 on llvmpipe (LLVM 5.0, 128 bits)
Backport patches to support llvm 5.0.0+
Add a patch to understand llvm version when llvm is build from git/svn
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta/recipes-graphics/mesa/files/0002-gallivm-Fix-build-against-LLVM-SVN-r302589.patch')
-rw-r--r-- | meta/recipes-graphics/mesa/files/0002-gallivm-Fix-build-against-LLVM-SVN-r302589.patch | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/meta/recipes-graphics/mesa/files/0002-gallivm-Fix-build-against-LLVM-SVN-r302589.patch b/meta/recipes-graphics/mesa/files/0002-gallivm-Fix-build-against-LLVM-SVN-r302589.patch new file mode 100644 index 0000000000..ac8caec74d --- /dev/null +++ b/meta/recipes-graphics/mesa/files/0002-gallivm-Fix-build-against-LLVM-SVN-r302589.patch @@ -0,0 +1,49 @@ +From a02a0dfda2712d30ad62b8f0421ec7b8244ba2cb Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <michel.daenzer@amd.com> +Date: Wed, 10 May 2017 17:26:07 +0900 +Subject: [PATCH 2/2] gallivm: Fix build against LLVM SVN >= r302589 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +deregisterEHFrames doesn't take any parameters anymore. + +Reviewed-by: Vedran Miletić <vedran@miletic.net> +Reviewed-by: Marek Olšák <marek.olsak@amd.com> +--- +Upstream-Status: Backport + + src/gallium/auxiliary/gallivm/lp_bld_misc.cpp | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) + +diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp +index 2a388cb..0e4a531 100644 +--- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp ++++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp +@@ -342,14 +342,20 @@ class DelegatingJITMemoryManager : public BaseMemoryManager { + virtual void registerEHFrames(uint8_t *Addr, uint64_t LoadAddr, size_t Size) { + mgr()->registerEHFrames(Addr, LoadAddr, Size); + } +- virtual void deregisterEHFrames(uint8_t *Addr, uint64_t LoadAddr, size_t Size) { +- mgr()->deregisterEHFrames(Addr, LoadAddr, Size); +- } + #else + virtual void registerEHFrames(llvm::StringRef SectionData) { + mgr()->registerEHFrames(SectionData); + } + #endif ++#if HAVE_LLVM >= 0x0500 ++ virtual void deregisterEHFrames() { ++ mgr()->deregisterEHFrames(); ++ } ++#elif HAVE_LLVM >= 0x0304 ++ virtual void deregisterEHFrames(uint8_t *Addr, uint64_t LoadAddr, size_t Size) { ++ mgr()->deregisterEHFrames(Addr, LoadAddr, Size); ++ } ++#endif + virtual void *getPointerToNamedFunction(const std::string &Name, + bool AbortOnFailure=true) { + return mgr()->getPointerToNamedFunction(Name, AbortOnFailure); +-- +2.13.3 + |