From 778cf80d9e462ca26e660dca1910328f66f6427d Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Mon, 9 Mar 2009 10:34:41 +1100 Subject: r300: move firevertices out into the main place its needed. This fixes a hang on context destruction on rs690 --- src/mesa/drivers/dri/r300/r300_state.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/mesa/drivers/dri/r300/r300_state.c') diff --git a/src/mesa/drivers/dri/r300/r300_state.c b/src/mesa/drivers/dri/r300/r300_state.c index 6bb0063bc1..17e7b5227a 100644 --- a/src/mesa/drivers/dri/r300/r300_state.c +++ b/src/mesa/drivers/dri/r300/r300_state.c @@ -1069,7 +1069,6 @@ static void r300UpdateWindow(GLcontext * ctx) GLfloat sz = v[MAT_SZ] * rmesa->radeon.state.depth.scale; GLfloat tz = v[MAT_TZ] * rmesa->radeon.state.depth.scale; - radeon_firevertices(&rmesa->radeon); R300_STATECHANGE(rmesa, vpt); rmesa->hw.vpt.cmd[R300_VPT_XSCALE] = r300PackFloat32(sx); @@ -2137,6 +2136,7 @@ static void r300ResetHwState(r300ContextPtr r300) if (RADEON_DEBUG & DEBUG_STATE) fprintf(stderr, "%s\n", __FUNCTION__); + radeon_firevertices(&r300->radeon); r300UpdateWindow(ctx); r300ColorMask(ctx, -- cgit v1.2.3