diff options
| author | Dave Airlie <airlied@redhat.com> | 2009-03-09 10:34:41 +1100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-03-09 13:06:10 +1100 |
| commit | 778cf80d9e462ca26e660dca1910328f66f6427d (patch) | |
| tree | 9d3e0b2f68fe4fd6eb7d87ecadb57cbafb72c51e /src/mesa/drivers/dri/radeon | |
| parent | 1386e8a6ba9732c578e0122de245abfd578a7d1d (diff) | |
r300: move firevertices out into the main place its needed.
This fixes a hang on context destruction on rs690
Diffstat (limited to 'src/mesa/drivers/dri/radeon')
| -rw-r--r-- | src/mesa/drivers/dri/radeon/radeon_common_context.c | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/radeon/radeon_state.c | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/radeon/radeon_common_context.c b/src/mesa/drivers/dri/radeon/radeon_common_context.c index 7358391097..b63aba2f89 100644 --- a/src/mesa/drivers/dri/radeon/radeon_common_context.c +++ b/src/mesa/drivers/dri/radeon/radeon_common_context.c @@ -578,7 +578,7 @@ GLboolean radeonMakeCurrent(__DRIcontextPrivate * driContextPriv, } radeon->dri.drawable = driDrawPriv; -// radeonWindowMoved(radeon); + radeon_window_moved(radeon); } radeon_draw_buffer(radeon->glCtx, &drfb->base); } diff --git a/src/mesa/drivers/dri/radeon/radeon_state.c b/src/mesa/drivers/dri/radeon/radeon_state.c index 0c92a6ff08..42b65cbee6 100644 --- a/src/mesa/drivers/dri/radeon/radeon_state.c +++ b/src/mesa/drivers/dri/radeon/radeon_state.c @@ -1398,7 +1398,6 @@ void radeonUpdateWindow( GLcontext *ctx ) float_ui32_type sz = { v[MAT_SZ] * rmesa->radeon.state.depth.scale }; float_ui32_type tz = { v[MAT_TZ] * rmesa->radeon.state.depth.scale }; - radeon_firevertices(&rmesa->radeon); RADEON_STATECHANGE( rmesa, vpt ); rmesa->hw.vpt.cmd[VPT_SE_VPORT_XSCALE] = sx.ui32; |