From: José Fonseca <jfonseca@vmware.com>
Date: Wed, 7 Nov 2012 14:19:55 +0000 (+0000)
Subject: draw: Remove redundant draw_geometry_shader_delete().
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c84dd7a940f98fa7e26f8cd0aa75cb26d2a9ee07;p=mesa.git

draw: Remove redundant draw_geometry_shader_delete().

draw_delete_geometry_shader() seems to be the real one.

Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Roland Scheidegger <sroland@vmware.com>
---

diff --git a/src/gallium/auxiliary/draw/draw_gs.c b/src/gallium/auxiliary/draw/draw_gs.c
index 0152c1a0cbb..60e39520f8e 100644
--- a/src/gallium/auxiliary/draw/draw_gs.c
+++ b/src/gallium/auxiliary/draw/draw_gs.c
@@ -156,6 +156,8 @@ void draw_bind_geometry_shader(struct draw_context *draw,
 void draw_delete_geometry_shader(struct draw_context *draw,
                                  struct draw_geometry_shader *dgs)
 {
+   FREE(dgs->primitive_lengths);
+   FREE((void*) dgs->state.tokens);
    FREE(dgs);
 }
 
@@ -469,12 +471,6 @@ int draw_geometry_shader_run(struct draw_geometry_shader *shader,
    return shader->emitted_vertices;
 }
 
-void draw_geometry_shader_delete(struct draw_geometry_shader *shader)
-{
-   FREE((void*) shader->state.tokens);
-   FREE(shader);
-}
-
 void draw_geometry_shader_prepare(struct draw_geometry_shader *shader,
                                   struct draw_context *draw)
 {
diff --git a/src/gallium/auxiliary/draw/draw_gs.h b/src/gallium/auxiliary/draw/draw_gs.h
index 67bc1aa73ff..bfac02c6635 100644
--- a/src/gallium/auxiliary/draw/draw_gs.h
+++ b/src/gallium/auxiliary/draw/draw_gs.h
@@ -82,8 +82,6 @@ int draw_geometry_shader_run(struct draw_geometry_shader *shader,
 void draw_geometry_shader_prepare(struct draw_geometry_shader *shader,
                                   struct draw_context *draw);
 
-void draw_geometry_shader_delete(struct draw_geometry_shader *shader);
-
 int draw_gs_max_output_vertices(struct draw_geometry_shader *shader,
                                 unsigned pipe_prim);