diff --git a/src/gallium/auxiliary/draw/draw_gs.c b/src/gallium/auxiliary/draw/draw_gs.c
index e698764ed6d..1a4a788a980 100644
--- a/src/gallium/auxiliary/draw/draw_gs.c
+++ b/src/gallium/auxiliary/draw/draw_gs.c
@@ -567,7 +567,7 @@ gs_tri_adj(struct draw_geometry_shader *shader,
 /**
  * Execute geometry shader.
  */
-int
+void
 draw_geometry_shader_run(struct draw_geometry_shader *shader,
                          const void *constants[PIPE_MAX_CONSTANT_BUFFERS],
                          const unsigned constants_size[PIPE_MAX_CONSTANT_BUFFERS],
@@ -718,8 +718,6 @@ draw_geometry_shader_run(struct draw_geometry_shader *shader,
       debug_printf("stream %d: prims = %d verts = %d\n", i,
                    output_prims[i].primitive_count, output_verts[i].count);
 #endif
-
-   return 0;
 }
 
 
diff --git a/src/gallium/auxiliary/draw/draw_gs.h b/src/gallium/auxiliary/draw/draw_gs.h
index 953d59c82a1..916fd48fd3d 100644
--- a/src/gallium/auxiliary/draw/draw_gs.h
+++ b/src/gallium/auxiliary/draw/draw_gs.h
@@ -135,14 +135,15 @@ draw_geometry_shader_new_instance(struct draw_geometry_shader *gs);
  * The vertex shader can emit any number of vertices as long as it's
  * smaller than the GS_MAX_OUTPUT_VERTICES shader property.
  */
-int draw_geometry_shader_run(struct draw_geometry_shader *shader,
-                             const void *constants[PIPE_MAX_CONSTANT_BUFFERS],
-                             const unsigned constants_size[PIPE_MAX_CONSTANT_BUFFERS],
-                             const struct draw_vertex_info *input_verts,
-                             const struct draw_prim_info *input_prim,
-                             const struct tgsi_shader_info *input_info,
-                             struct draw_vertex_info *output_verts,
-                             struct draw_prim_info *output_prims );
+void
+draw_geometry_shader_run(struct draw_geometry_shader *shader,
+                         const void *constants[PIPE_MAX_CONSTANT_BUFFERS],
+                         const unsigned constants_size[PIPE_MAX_CONSTANT_BUFFERS],
+                         const struct draw_vertex_info *input_verts,
+                         const struct draw_prim_info *input_prim,
+                         const struct tgsi_shader_info *input_info,
+                         struct draw_vertex_info *output_verts,
+                         struct draw_prim_info *output_prims );
 
 void
 draw_geometry_shader_prepare(struct draw_geometry_shader *shader,