draw: fix some build breakage when LLVM is not used
authorBrian Paul <brianp@vmware.com>
Thu, 28 Mar 2013 23:03:57 +0000 (17:03 -0600)
committerBrian Paul <brianp@vmware.com>
Thu, 28 Mar 2013 23:15:58 +0000 (17:15 -0600)
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=62883
Tested-by: Vinson Lee <vlee@freedesktop.org>
src/gallium/auxiliary/draw/draw_gs.c
src/gallium/auxiliary/draw/draw_gs.h

index 0115d4716a1c7d87b77f3d5bdf6889f66ceb955c..9af82e2239b63904114090de90a3216bdf2a4cbf 100644 (file)
@@ -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
index e62b34a17948a878134cfb90dfb756cd65f47c24..9c826485aba1dbbb91625301981b283b72da48df 100644 (file)
@@ -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