diff options
| author | Christian König <[email protected]> | 2012-07-19 15:20:45 +0200 |
|---|---|---|
| committer | Christian König <[email protected]> | 2012-07-24 12:29:30 +0200 |
| commit | ca9cf611b63e5576b596c21b73b1b639d250d649 (patch) | |
| tree | ba6078296137c6cd3473a982e04d70e10761f24a /src/gallium/drivers/radeonsi/radeonsi_pipe.h | |
| parent | 0d6b0b512acadbc5d64039063b5649fc401b3367 (diff) | |
radeonsi: move draw state into new handling
Split it out into si_state_draw.c
Signed-off-by: Christian König <[email protected]>
Diffstat (limited to 'src/gallium/drivers/radeonsi/radeonsi_pipe.h')
| -rw-r--r-- | src/gallium/drivers/radeonsi/radeonsi_pipe.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/gallium/drivers/radeonsi/radeonsi_pipe.h b/src/gallium/drivers/radeonsi/radeonsi_pipe.h index f78d8ef3af1..a0dcc411664 100644 --- a/src/gallium/drivers/radeonsi/radeonsi_pipe.h +++ b/src/gallium/drivers/radeonsi/radeonsi_pipe.h @@ -163,9 +163,8 @@ struct r600_context { /* for saving when using blitter */ struct pipe_stencil_ref stencil_ref; struct r600_pipe_state config; - struct si_pipe_shader *ps_shader; - struct si_pipe_shader *vs_shader; - struct r600_pipe_state vs_user_data; + struct si_pipe_shader *ps_shader; + struct si_pipe_shader *vs_shader; struct pipe_query *current_render_cond; unsigned current_render_cond_mode; struct pipe_query *saved_render_cond; @@ -253,8 +252,6 @@ static INLINE void r600_atom_dirty(struct r600_context *rctx, struct r600_atom * /* evergreen_state.c */ void cayman_init_state_functions(struct r600_context *rctx); -void si_pipe_shader_ps(struct pipe_context *ctx, struct si_pipe_shader *shader); -void si_pipe_shader_vs(struct pipe_context *ctx, struct si_pipe_shader *shader); uint32_t si_translate_vertexformat(struct pipe_screen *screen, enum pipe_format format, const struct util_format_description *desc, @@ -339,7 +336,6 @@ void r600_set_so_targets(struct pipe_context *ctx, unsigned num_targets, struct pipe_stream_output_target **targets, unsigned append_bitmask); -void r600_draw_vbo(struct pipe_context *ctx, const struct pipe_draw_info *info); /* * common helpers |