Module: Mesa Branch: master Commit: 1d57b6ebd186217a5c480245a36d169d357b8e67 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=1d57b6ebd186217a5c480245a36d169d357b8e67
Author: Marek Olšák <[email protected]> Date: Sat May 29 15:27:42 2010 +0200 r600g: make a local copy of viewport state --- src/gallium/drivers/r600/r600_blit.c | 2 +- src/gallium/drivers/r600/r600_context.h | 2 +- src/gallium/drivers/r600/r600_state.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gallium/drivers/r600/r600_blit.c b/src/gallium/drivers/r600/r600_blit.c index e92e928..a257d83 100644 --- a/src/gallium/drivers/r600/r600_blit.c +++ b/src/gallium/drivers/r600/r600_blit.c @@ -50,7 +50,7 @@ static void r600_blitter_save_states(struct pipe_context *ctx) util_blitter_save_vertex_elements(rctx->blitter, rctx->vertex_elements); util_blitter_save_viewport(rctx->blitter, - rctx->viewport); + &rctx->viewport); } void r600_clear(struct pipe_context *ctx, unsigned buffers, diff --git a/src/gallium/drivers/r600/r600_context.h b/src/gallium/drivers/r600/r600_context.h index b8ce8b8..a514903 100644 --- a/src/gallium/drivers/r600/r600_context.h +++ b/src/gallium/drivers/r600/r600_context.h @@ -76,7 +76,7 @@ struct r600_context { struct pipe_stencil_ref stencil_ref; struct pipe_framebuffer_state fb_state; struct radeon_draw *draw; - struct pipe_viewport_state *viewport; + struct pipe_viewport_state viewport; }; void r600_draw_arrays(struct pipe_context *ctx, unsigned mode, diff --git a/src/gallium/drivers/r600/r600_state.c b/src/gallium/drivers/r600/r600_state.c index d57e88d..ff574b8 100644 --- a/src/gallium/drivers/r600/r600_state.c +++ b/src/gallium/drivers/r600/r600_state.c @@ -309,7 +309,7 @@ static void r600_set_viewport_state(struct pipe_context *ctx, return; } radeon_draw_set_new(rctx->draw, rstate); - rctx->viewport = state; + rctx->viewport = *state; } static void r600_set_vertex_buffers(struct pipe_context *ctx, _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
