diff options
| author | Jose Fonseca <[email protected]> | 2017-01-18 14:42:47 +0000 |
|---|---|---|
| committer | Jose Fonseca <[email protected]> | 2017-01-18 14:46:54 +0000 |
| commit | 34041968f883253de639f137a761340e84f82bb9 (patch) | |
| tree | 5a905d479bce14b673d23cea73b7e11ae8674f62 /src/gallium/auxiliary/draw/draw_pt.c | |
| parent | 5034cf4e35446bf3a4eab0aab7694211dadffae3 (diff) | |
configure.ac: Revert recent HAVE_LLVM changes.
This reverts changes 903eb09b5fb78d47d0f8a4bdf826a113ca2aff40..1a0aa468f354f0ee94dd383cd40ae915584624aa:
Tobias Droste (5):
configure.ac: Rename MESA_LLVM to FOUND_LLVM
configure.ac: Only set LLVM_LIBS if LLVM is used
configure.ac: Only define HAVE_LLVM if LLVM is used
configure.ac: Set and use HAVE_GALLIUM_LLVM define
configure.ac: Don't check LLVM version in gallium_require_llvm
They break scons build, and I'm not convinced this is the right fix. In
particular changing HAVE_LLVM in the C code is something I'd rather
avoid no matter what. So it's better to discuss without the pressure of
broken builds.
Diffstat (limited to 'src/gallium/auxiliary/draw/draw_pt.c')
| -rw-r--r-- | src/gallium/auxiliary/draw/draw_pt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/auxiliary/draw/draw_pt.c b/src/gallium/auxiliary/draw/draw_pt.c index 1be983f56a3..5a49acb64d3 100644 --- a/src/gallium/auxiliary/draw/draw_pt.c +++ b/src/gallium/auxiliary/draw/draw_pt.c @@ -191,7 +191,7 @@ boolean draw_pt_init( struct draw_context *draw ) if (!draw->pt.middle.general) return FALSE; -#if HAVE_GALLIUM_LLVM +#if HAVE_LLVM if (draw->llvm) draw->pt.middle.llvm = draw_pt_fetch_pipeline_or_emit_llvm( draw ); #endif @@ -519,7 +519,7 @@ draw_vbo(struct draw_context *draw, draw->pt.vertex_element, draw->pt.nr_vertex_elements, info); -#if HAVE_GALLIUM_LLVM +#if HAVE_LLVM if (!draw->llvm) #endif { |