From 34041968f883253de639f137a761340e84f82bb9 Mon Sep 17 00:00:00 2001 From: Jose Fonseca Date: Wed, 18 Jan 2017 14:42:47 +0000 Subject: 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. --- src/gallium/auxiliary/draw/draw_context.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/gallium/auxiliary/draw/draw_context.c') diff --git a/src/gallium/auxiliary/draw/draw_context.c b/src/gallium/auxiliary/draw/draw_context.c index f0dae1b1fec..56abcff5a24 100644 --- a/src/gallium/auxiliary/draw/draw_context.c +++ b/src/gallium/auxiliary/draw/draw_context.c @@ -45,7 +45,7 @@ #include "draw_vs.h" #include "draw_gs.h" -#if HAVE_GALLIUM_LLVM +#if HAVE_LLVM #include "gallivm/lp_bld_init.h" #include "gallivm/lp_bld_limits.h" #include "draw_llvm.h" @@ -78,7 +78,7 @@ draw_create_context(struct pipe_context *pipe, void *context, /* we need correct cpu caps for disabling denorms in draw_vbo() */ util_cpu_detect(); -#if HAVE_GALLIUM_LLVM +#if HAVE_LLVM if (try_llvm && draw_get_option_use_llvm()) { draw->llvm = draw_llvm_create(draw, (LLVMContextRef)context); } @@ -112,7 +112,7 @@ draw_create(struct pipe_context *pipe) } -#if HAVE_GALLIUM_LLVM +#if HAVE_LLVM struct draw_context * draw_create_with_llvm_context(struct pipe_context *pipe, void *context) @@ -221,7 +221,7 @@ void draw_destroy( struct draw_context *draw ) draw_pt_destroy( draw ); draw_vs_destroy( draw ); draw_gs_destroy( draw ); -#ifdef HAVE_GALLIUM_LLVM +#ifdef HAVE_LLVM if (draw->llvm) draw_llvm_destroy( draw->llvm ); #endif @@ -1003,7 +1003,7 @@ draw_set_samplers(struct draw_context *draw, draw->num_samplers[shader_stage] = num; -#ifdef HAVE_GALLIUM_LLVM +#ifdef HAVE_LLVM if (draw->llvm) draw_llvm_set_sampler_state(draw, shader_stage); #endif @@ -1020,7 +1020,7 @@ draw_set_mapped_texture(struct draw_context *draw, uint32_t img_stride[PIPE_MAX_TEXTURE_LEVELS], uint32_t mip_offsets[PIPE_MAX_TEXTURE_LEVELS]) { -#ifdef HAVE_GALLIUM_LLVM +#ifdef HAVE_LLVM if (draw->llvm) draw_llvm_set_mapped_texture(draw, shader_stage, @@ -1057,7 +1057,7 @@ int draw_get_shader_param(unsigned shader, enum pipe_shader_cap param) { -#ifdef HAVE_GALLIUM_LLVM +#ifdef HAVE_LLVM if (draw_get_option_use_llvm()) { switch(shader) { case PIPE_SHADER_VERTEX: -- cgit v1.2.3