fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-06-02 17:48:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

radeon: cleanup cmdbuffer

Browse source
This commit is contained in:
Dave Airlie 2009-02-11 16:52:56 +10:00
parent 832446c892
commit 7e98907eb8
3 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/mesa/drivers/dri/r300/r300_cmdbuf.c
View file

@ -97,12 +97,12 @@ static INLINE void r300EmitAtoms(r300ContextPtr r300, GLboolean dirty)
struct radeon_state_atom *atom;
int dwords;
cp_wait(r300, R300_WAIT_3D | R300_WAIT_3D_CLEAN);
cp_wait(r300, R300_WAIT_3D | R300_WAIT_3D_CLEAN);
BEGIN_BATCH_NO_AUTOSTATE(2);
OUT_BATCH(cmdpacket0(r300->radeon.radeonScreen, R300_TX_INVALTAGS, 1));
OUT_BATCH(R300_TX_FLUSH);
END_BATCH();
end_3d(r300);
end_3d(r300);
/* Emit actual atoms */
foreach(atom, &r300->hw.atomlist) {
@ -724,6 +724,5 @@ void r300DestroyCmdBuf(r300ContextPtr r300)
foreach(atom, &r300->hw.atomlist) {
FREE(atom->cmd);
}
rcommonDestroyCmdBuf(&r300->radeon);
}

4
src/mesa/drivers/dri/r300/r300_context.c
View file

@ -487,15 +487,17 @@ void r300DestroyContext(__DRIcontextPrivate * driContextPriv)
_swrast_DestroyContext(r300->radeon.glCtx);
rcommonFlushCmdBuf(&r300->radeon, __FUNCTION__);
r300DestroyCmdBuf(r300);
if (radeon->state.scissor.pClipRects) {
FREE(radeon->state.scissor.pClipRects);
radeon->state.scissor.pClipRects = NULL;
}
r300DestroyCmdBuf(r300);
radeonCleanupContext(&r300->radeon);
/* the memory manager might be accessed when Mesa frees the shared
* state, so don't destroy it earlier
*/

8
src/mesa/drivers/dri/radeon/common_misc.c
View file

@ -866,6 +866,9 @@ void radeonCleanupContext(radeonContextPtr radeon)
FILE *track;
struct radeon_renderbuffer *rb;
GLframebuffer *fb;
/* free the Mesa context */
_mesa_destroy_context(radeon->glCtx);
fb = (void*)radeon->dri.drawable->driverPrivate;
rb = (void *)fb->Attachment[BUFFER_FRONT_LEFT].Renderbuffer;
@ -906,12 +909,13 @@ void radeonCleanupContext(radeonContextPtr radeon)
* radeon->glCtx->DriverCtx = NULL;
*/
/* free the Mesa context */
_mesa_destroy_context(radeon->glCtx);
/* free the option cache */
driDestroyOptionCache(&radeon->optionCache);
rcommonDestroyCmdBuf(radeon);
if (radeon->state.scissor.pClipRects) {
FREE(radeon->state.scissor.pClipRects);
radeon->state.scissor.pClipRects = 0;