summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2013-03-28 17:03:57 -0600
committerBrian Paul <brianp@vmware.com>2013-03-28 17:15:58 -0600
commit499aa3ddb448a7461c0bdea93c8f218db6992720 (patch)
treeee8308916f792734a08531ed6b2dfb8dab7bf50f
parent9ad914191716631169427f44e08078812ce38ff8 (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 <vlee@freedesktop.org>
-rw-r--r--src/gallium/auxiliary/draw/draw_gs.c7
-rw-r--r--src/gallium/auxiliary/draw/draw_gs.h2
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,
681 gs->max_output_vertices = 32; 681 gs->max_output_vertices = 32;
682 gs->max_out_prims = 0; 682 gs->max_out_prims = 0;
683 683
684#ifdef HAVE_LLVM
684 if (draw_get_option_use_llvm()) { 685 if (draw_get_option_use_llvm()) {
685 /* TODO: change the input array to handle the following 686 /* TODO: change the input array to handle the following
686 vector length, instead of the currently hardcoded 687 vector length, instead of the currently hardcoded
687 TGSI_NUM_CHANNELS 688 TGSI_NUM_CHANNELS
688 gs->vector_length = lp_native_vector_width / 32;*/ 689 gs->vector_length = lp_native_vector_width / 32;*/
689 gs->vector_length = TGSI_NUM_CHANNELS; 690 gs->vector_length = TGSI_NUM_CHANNELS;
690 } else { 691 } else
692#endif
693 {
691 gs->vector_length = TGSI_NUM_CHANNELS; 694 gs->vector_length = TGSI_NUM_CHANNELS;
692 } 695 }
693 696
@@ -799,8 +802,10 @@ void draw_delete_geometry_shader(struct draw_context *draw,
799} 802}
800 803
801 804
805#ifdef HAVE_LLVM
802void draw_gs_set_current_variant(struct draw_geometry_shader *shader, 806void draw_gs_set_current_variant(struct draw_geometry_shader *shader,
803 struct draw_gs_llvm_variant *variant) 807 struct draw_gs_llvm_variant *variant)
804{ 808{
805 shader->current_variant = variant; 809 shader->current_variant = variant;
806} 810}
811#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,
132int draw_gs_max_output_vertices(struct draw_geometry_shader *shader, 132int draw_gs_max_output_vertices(struct draw_geometry_shader *shader,
133 unsigned pipe_prim); 133 unsigned pipe_prim);
134 134
135#ifdef HAVE_LLVM
135void draw_gs_set_current_variant(struct draw_geometry_shader *shader, 136void draw_gs_set_current_variant(struct draw_geometry_shader *shader,
136 struct draw_gs_llvm_variant *variant); 137 struct draw_gs_llvm_variant *variant);
138#endif
137 139
138#endif 140#endif