fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 00:28:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

r300: move firevertices out into the main place its needed.

Browse source 
This fixes a hang on context destruction on rs690
This commit is contained in:
Dave Airlie 2009-03-09 10:34:41 +11:00
parent 1386e8a6ba
commit 778cf80d9e
4 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/mesa/drivers/dri/r200/r200_state.c
View file

@ -1618,7 +1618,6 @@ void r200UpdateWindow( 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);
R200_STATECHANGE( rmesa, vpt );
rmesa->hw.vpt.cmd[VPT_SE_VPORT_XSCALE] = sx.ui32;

2
src/mesa/drivers/dri/r300/r300_state.c
View file

@ -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,

2
src/mesa/drivers/dri/radeon/radeon_common_context.c
View file

@ -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);
}

1
src/mesa/drivers/dri/radeon/radeon_state.c
View file

@ -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;