diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/gallium/auxiliary/draw/draw_context.c | 14 | ||||
| -rw-r--r-- | src/gallium/auxiliary/draw/draw_context.h | 2 | ||||
| -rw-r--r-- | src/gallium/auxiliary/draw/draw_pt.c | 4 | ||||
| -rw-r--r-- | src/gallium/auxiliary/draw/draw_vs.c | 2 | ||||
| -rw-r--r-- | src/gallium/auxiliary/draw/draw_vs.h | 2 |
5 files changed, 12 insertions, 12 deletions
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: diff --git a/src/gallium/auxiliary/draw/draw_context.h b/src/gallium/auxiliary/draw/draw_context.h index 782dec2dde3..145fc2ed467 100644 --- a/src/gallium/auxiliary/draw/draw_context.h +++ b/src/gallium/auxiliary/draw/draw_context.h @@ -65,7 +65,7 @@ struct draw_so_target { struct draw_context *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); #endif 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 { diff --git a/src/gallium/auxiliary/draw/draw_vs.c b/src/gallium/auxiliary/draw/draw_vs.c index e9966cf725e..415c4fa949a 100644 --- a/src/gallium/auxiliary/draw/draw_vs.c +++ b/src/gallium/auxiliary/draw/draw_vs.c @@ -59,7 +59,7 @@ draw_create_vertex_shader(struct draw_context *draw, tgsi_dump(shader->tokens, 0); } -#if HAVE_GALLIUM_LLVM +#if HAVE_LLVM if (draw->pt.middle.llvm) { vs = draw_create_vs_llvm(draw, shader); } diff --git a/src/gallium/auxiliary/draw/draw_vs.h b/src/gallium/auxiliary/draw/draw_vs.h index 7b9fd4fac7b..6a900224c11 100644 --- a/src/gallium/auxiliary/draw/draw_vs.h +++ b/src/gallium/auxiliary/draw/draw_vs.h @@ -163,7 +163,7 @@ draw_create_vs_exec(struct draw_context *draw, struct draw_vs_variant_key; struct draw_vertex_shader; -#if HAVE_GALLIUM_LLVM +#if HAVE_LLVM struct draw_vertex_shader * draw_create_vs_llvm(struct draw_context *draw, const struct pipe_shader_state *state); |