Mesa (arb_geometry_shader4): gs: use pipe_geometry_shader_state

Zack Rusin zack at kemper.freedesktop.org
Fri Jun 5 22:24:18 UTC 2009


Module: Mesa
Branch: arb_geometry_shader4
Commit: 8b7c63848a74d0fd615016a778918ec03b577570
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=8b7c63848a74d0fd615016a778918ec03b577570

Author: Zack Rusin <zackr at vmware.com>
Date:   Fri May 22 13:38:07 2009 -0400

gs: use pipe_geometry_shader_state

---

 src/gallium/auxiliary/draw/draw_context.h  |    2 +-
 src/gallium/auxiliary/draw/draw_gs.c       |    2 +-
 src/gallium/drivers/softpipe/sp_state.h    |    4 ++--
 src/gallium/drivers/softpipe/sp_state_fs.c |    8 ++++----
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/gallium/auxiliary/draw/draw_context.h b/src/gallium/auxiliary/draw/draw_context.h
index ed72139..d236cf2 100644
--- a/src/gallium/auxiliary/draw/draw_context.h
+++ b/src/gallium/auxiliary/draw/draw_context.h
@@ -118,7 +118,7 @@ void draw_delete_vertex_shader(struct draw_context *draw,
  */
 struct draw_geometry_shader *
 draw_create_geometry_shader(struct draw_context *draw,
-                            const struct pipe_shader_state *shader);
+                            const struct pipe_geometry_shader_state *shader);
 void draw_bind_geometry_shader(struct draw_context *draw,
                                struct draw_geometry_shader *dvs);
 void draw_delete_geometry_shader(struct draw_context *draw,
diff --git a/src/gallium/auxiliary/draw/draw_gs.c b/src/gallium/auxiliary/draw/draw_gs.c
index 283717d..c7f6839 100644
--- a/src/gallium/auxiliary/draw/draw_gs.c
+++ b/src/gallium/auxiliary/draw/draw_gs.c
@@ -36,7 +36,7 @@
 
 struct draw_geometry_shader *
 draw_create_geometry_shader(struct draw_context *draw,
-                            const struct pipe_shader_state *shader)
+                            const struct pipe_geometry_shader_state *shader)
 {
    struct draw_geometry_shader *gs;
 
diff --git a/src/gallium/drivers/softpipe/sp_state.h b/src/gallium/drivers/softpipe/sp_state.h
index 03d0652..67a8cf0 100644
--- a/src/gallium/drivers/softpipe/sp_state.h
+++ b/src/gallium/drivers/softpipe/sp_state.h
@@ -92,7 +92,7 @@ struct sp_vertex_shader {
 
 /** Subclass of pipe_shader_state */
 struct sp_geometry_shader {
-   struct pipe_shader_state shader;
+   struct pipe_geometry_shader_state shader;
    struct draw_geometry_shader *draw_data;
 };
 
@@ -145,7 +145,7 @@ void *softpipe_create_vs_state(struct pipe_context *,
 void softpipe_bind_vs_state(struct pipe_context *, void *);
 void softpipe_delete_vs_state(struct pipe_context *, void *);
 void *softpipe_create_gs_state(struct pipe_context *,
-                               const struct pipe_shader_state *);
+                               const struct pipe_geometry_shader_state *);
 void softpipe_bind_gs_state(struct pipe_context *, void *);
 void softpipe_delete_gs_state(struct pipe_context *, void *);
 
diff --git a/src/gallium/drivers/softpipe/sp_state_fs.c b/src/gallium/drivers/softpipe/sp_state_fs.c
index 6c28126..f20110e 100644
--- a/src/gallium/drivers/softpipe/sp_state_fs.c
+++ b/src/gallium/drivers/softpipe/sp_state_fs.c
@@ -170,7 +170,7 @@ softpipe_set_constant_buffer(struct pipe_context *pipe,
 
 void *
 softpipe_create_gs_state(struct pipe_context *pipe,
-                         const struct pipe_shader_state *templ)
+                         const struct pipe_geometry_shader_state *templ)
 {
    struct softpipe_context *softpipe = softpipe_context(pipe);
    struct sp_geometry_shader *state;
@@ -181,8 +181,8 @@ softpipe_create_gs_state(struct pipe_context *pipe,
 
    /* copy shader tokens, the ones passed in will go away.
     */
-   state->shader.tokens = tgsi_dup_tokens(templ->tokens);
-   if (state->shader.tokens == NULL)
+   state->shader.shader.tokens = tgsi_dup_tokens(templ->shader.tokens);
+   if (state->shader.shader.tokens == NULL)
       goto fail;
 
    state->draw_data = draw_create_geometry_shader(softpipe->draw, templ);
@@ -193,7 +193,7 @@ softpipe_create_gs_state(struct pipe_context *pipe,
 
 fail:
    if (state) {
-      FREE( (void *)state->shader.tokens );
+      FREE( (void *)state->shader.shader.tokens );
       FREE( state->draw_data );
       FREE( state );
    }




More information about the mesa-commit mailing list