Re: [Mesa-dev] [PATCH] swr/rast: fix build break for llvm-6

2018-01-03 Thread Cherniak, Bruce
Reviewed-by: Bruce Cherniak 

> On Jan 2, 2018, at 10:57 AM, Tim Rowley  wrote:
> 
> LLVM api change.
> 
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104381
> ---
> src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp | 4 
> 1 file changed, 4 insertions(+)
> 
> diff --git a/src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp 
> b/src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp
> index 3f0772c942..59672bb545 100644
> --- a/src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp
> +++ b/src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp
> @@ -498,7 +498,11 @@ std::unique_ptr 
> JitCache::getObject(const llvm::Module* M)
> break;
> }
> 
> +#if LLVM_VERSION_MAJOR < 6
> pBuf = 
> llvm::MemoryBuffer::getNewUninitMemBuffer(size_t(header.GetBufferSize()));
> +#else
> +pBuf = 
> llvm::WritableMemoryBuffer::getNewUninitMemBuffer(size_t(header.GetBufferSize()));
> +#endif
> if (!fread(const_cast(pBuf->getBufferStart()), 
> header.GetBufferSize(), 1, fpIn))
> {
> pBuf = nullptr;
> -- 
> 2.14.1
> 
> ___
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev


Re: [Mesa-dev] [PATCH] swr/rast: fix build break for llvm-6

2018-01-03 Thread Laurent Carlier
Le mardi 2 janvier 2018, 17:57:03 CET Tim Rowley a écrit :
> LLVM api change.
> 
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104381

Tested-by: Laurent Carlier 

> ---
>  src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp | 4 
>  1 file changed, 4 insertions(+)
> 
> diff --git a/src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp
> b/src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp index
> 3f0772c942..59672bb545 100644
> --- a/src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp
> +++ b/src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp
> @@ -498,7 +498,11 @@ std::unique_ptr
> JitCache::getObject(const llvm::Module* M) break;
>  }
> 
> +#if LLVM_VERSION_MAJOR < 6
>  pBuf =
> llvm::MemoryBuffer::getNewUninitMemBuffer(size_t(header.GetBufferSize()));
> +#else
> +pBuf =
> llvm::WritableMemoryBuffer::getNewUninitMemBuffer(size_t(header.GetBufferSi
> ze())); +#endif
>  if (!fread(const_cast(pBuf->getBufferStart()),
> header.GetBufferSize(), 1, fpIn)) {
>  pBuf = nullptr;


-- 
Laurent Carlier
http://www.archlinux.org

signature.asc
Description: This is a digitally signed message part.
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev


[Mesa-dev] [PATCH] swr/rast: fix build break for llvm-6

2018-01-02 Thread Tim Rowley
LLVM api change.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104381
---
 src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp | 4 
 1 file changed, 4 insertions(+)

diff --git a/src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp 
b/src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp
index 3f0772c942..59672bb545 100644
--- a/src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp
+++ b/src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp
@@ -498,7 +498,11 @@ std::unique_ptr 
JitCache::getObject(const llvm::Module* M)
 break;
 }
 
+#if LLVM_VERSION_MAJOR < 6
 pBuf = 
llvm::MemoryBuffer::getNewUninitMemBuffer(size_t(header.GetBufferSize()));
+#else
+pBuf = 
llvm::WritableMemoryBuffer::getNewUninitMemBuffer(size_t(header.GetBufferSize()));
+#endif
 if (!fread(const_cast(pBuf->getBufferStart()), 
header.GetBufferSize(), 1, fpIn))
 {
 pBuf = nullptr;
-- 
2.14.1

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev