Mesa (master): draw: Remove redundant draw_geometry_shader_delete().
Jose Fonseca
jrfonseca at kemper.freedesktop.org
Fri Nov 9 13:56:37 UTC 2012
Module: Mesa
Branch: master
Commit: c84dd7a940f98fa7e26f8cd0aa75cb26d2a9ee07
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c84dd7a940f98fa7e26f8cd0aa75cb26d2a9ee07
Author: José Fonseca <jfonseca at vmware.com>
Date: Wed Nov 7 14:19:55 2012 +0000
draw: Remove redundant draw_geometry_shader_delete().
draw_delete_geometry_shader() seems to be the real one.
Reviewed-by: Brian Paul <brianp at vmware.com>
Reviewed-by: Roland Scheidegger <sroland at vmware.com>
---
src/gallium/auxiliary/draw/draw_gs.c | 8 ++------
src/gallium/auxiliary/draw/draw_gs.h | 2 --
2 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/src/gallium/auxiliary/draw/draw_gs.c b/src/gallium/auxiliary/draw/draw_gs.c
index 0152c1a..60e3952 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 67bc1aa..bfac02c 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);
More information about the mesa-commit
mailing list