Mesa (master): r300g: make a local copy of framebuffer state
Corbin Simpson
csimpson at kemper.freedesktop.org
Sun Feb 7 07:49:45 UTC 2010
Module: Mesa
Branch: master
Commit: 2f5fcce933dd9beb66d2da4c1ca979ccde57483e
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=2f5fcce933dd9beb66d2da4c1ca979ccde57483e
Author: Marek Olšák <maraeo at gmail.com>
Date: Fri Feb 5 08:12:01 2010 +0100
r300g: make a local copy of framebuffer state
The previous more direct approach was simply incorrect.
piglit/levelclamp passes again.
---
src/gallium/drivers/r300/r300_context.c | 4 ++++
src/gallium/drivers/r300/r300_state.c | 2 +-
2 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/gallium/drivers/r300/r300_context.c b/src/gallium/drivers/r300/r300_context.c
index 9837530..2df2dcf 100644
--- a/src/gallium/drivers/r300/r300_context.c
+++ b/src/gallium/drivers/r300/r300_context.c
@@ -55,6 +55,7 @@ static void r300_destroy_context(struct pipe_context* context)
FREE(r300->blend_color_state.state);
FREE(r300->clip_state.state);
+ FREE(r300->fb_state.state);
FREE(r300->rs_block_state.state);
FREE(r300->scissor_state.state);
FREE(r300->vertex_format_state.state);
@@ -124,6 +125,9 @@ static void r300_setup_atoms(struct r300_context* r300)
R300_INIT_ATOM(viewport, 9);
R300_INIT_ATOM(rs_block, 21);
R300_INIT_ATOM(vertex_format, 26);
+
+ /* Some non-CSO atoms need explicit space to store the state locally. */
+ r300->fb_state.state = CALLOC_STRUCT(pipe_framebuffer_state);
}
struct pipe_context* r300_create_context(struct pipe_screen* screen,
diff --git a/src/gallium/drivers/r300/r300_state.c b/src/gallium/drivers/r300/r300_state.c
index ca4d25a..76e1385 100644
--- a/src/gallium/drivers/r300/r300_state.c
+++ b/src/gallium/drivers/r300/r300_state.c
@@ -511,7 +511,7 @@ static void
draw_flush(r300->draw);
}
- r300->fb_state.state = state;
+ memcpy(r300->fb_state.state, state, sizeof(struct pipe_framebuffer_state));
/* Don't rely on the order of states being set for the first time. */
/* XXX wait what */
More information about the mesa-commit
mailing list