diff options
| author | Brian Paul <[email protected]> | 2013-03-28 17:03:57 -0600 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2013-03-28 17:15:58 -0600 |
| commit | 499aa3ddb448a7461c0bdea93c8f218db6992720 (patch) | |
| tree | ee8308916f792734a08531ed6b2dfb8dab7bf50f | |
| parent | 9ad914191716631169427f44e08078812ce38ff8 (diff) | |
draw: fix some build breakage when LLVM is not used
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=62883
Tested-by: Vinson Lee <[email protected]>
| -rw-r--r-- | src/gallium/auxiliary/draw/draw_gs.c | 7 | ||||
| -rw-r--r-- | src/gallium/auxiliary/draw/draw_gs.h | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/gallium/auxiliary/draw/draw_gs.c b/src/gallium/auxiliary/draw/draw_gs.c index 0115d4716a1..9af82e2239b 100644 --- a/src/gallium/auxiliary/draw/draw_gs.c +++ b/src/gallium/auxiliary/draw/draw_gs.c @@ -681,13 +681,16 @@ draw_create_geometry_shader(struct draw_context *draw, gs->max_output_vertices = 32; gs->max_out_prims = 0; +#ifdef HAVE_LLVM if (draw_get_option_use_llvm()) { /* TODO: change the input array to handle the following vector length, instead of the currently hardcoded TGSI_NUM_CHANNELS gs->vector_length = lp_native_vector_width / 32;*/ gs->vector_length = TGSI_NUM_CHANNELS; - } else { + } else +#endif + { gs->vector_length = TGSI_NUM_CHANNELS; } @@ -799,8 +802,10 @@ void draw_delete_geometry_shader(struct draw_context *draw, } +#ifdef HAVE_LLVM void draw_gs_set_current_variant(struct draw_geometry_shader *shader, struct draw_gs_llvm_variant *variant) { shader->current_variant = variant; } +#endif diff --git a/src/gallium/auxiliary/draw/draw_gs.h b/src/gallium/auxiliary/draw/draw_gs.h index e62b34a1794..9c826485aba 100644 --- a/src/gallium/auxiliary/draw/draw_gs.h +++ b/src/gallium/auxiliary/draw/draw_gs.h @@ -132,7 +132,9 @@ void draw_geometry_shader_prepare(struct draw_geometry_shader *shader, int draw_gs_max_output_vertices(struct draw_geometry_shader *shader, unsigned pipe_prim); +#ifdef HAVE_LLVM void draw_gs_set_current_variant(struct draw_geometry_shader *shader, struct draw_gs_llvm_variant *variant); +#endif #endif |