Module: Mesa Branch: master Commit: 22d615a9c4b95c528d6604eccb71cf6fe5193d5a URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=22d615a9c4b95c528d6604eccb71cf6fe5193d5a
Author: Corbin Simpson <[email protected]> Date: Mon Jan 11 20:27:54 2010 -0800 r300g: Avoid segfault on binding null RS state. --- src/gallium/drivers/r300/r300_state.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/src/gallium/drivers/r300/r300_state.c b/src/gallium/drivers/r300/r300_state.c index 78764dd..4c22d4e 100644 --- a/src/gallium/drivers/r300/r300_state.c +++ b/src/gallium/drivers/r300/r300_state.c @@ -717,7 +717,11 @@ static void r300_bind_rs_state(struct pipe_context* pipe, void* state) draw_set_rasterizer_state(r300->draw, &rs->rs); } - r300->tcl_bypass = rs->rs.bypass_vs_clip_and_viewport; + if (rs) { + r300->tcl_bypass = rs->rs.bypass_vs_clip_and_viewport; + } else { + r300->tcl_bypass = FALSE; + } r300->rs_state.state = rs; r300->rs_state.dirty = TRUE; _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
