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

Try to tackle bug #5148

Browse source
This commit is contained in:
Aapo Tahkola 2006-01-20 21:56:52 +00:00
parent c90b569238
commit ef073b7a75
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -169,16 +169,24 @@ static __inline__ void r300DoEmitState(r300ContextPtr r300, GLboolean dirty)
}
}
/* Emit WAIT */
*dest = cmdwait(R300_WAIT_3D | R300_WAIT_3D_CLEAN);
dest ++;
r300->cmdbuf.count_used ++;
*dest = cmdpacket0(R300_TX_CNTL, 1);
dest ++;
r300->cmdbuf.count_used ++;
*dest = 0x0;
dest ++;
r300->cmdbuf.count_used ++;
/* Emit END3D */
*dest = cmdpacify();
dest ++;
r300->cmdbuf.count_used ++;
/* Emit actual atoms */
@ -273,7 +281,7 @@ void r300InitCmdBuf(r300ContextPtr r300)
{
int size, mtu;
r300->hw.max_state_size = 2; /* reserve extra space for WAIT_IDLE */
r300->hw.max_state_size = 2+2; /* reserve extra space for WAIT_IDLE and tex cache flush */
mtu = r300->radeon.glCtx->Const.MaxTextureUnits;
if (RADEON_DEBUG & DEBUG_TEXTURE) {

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

@ -922,7 +922,7 @@ __driCreateNewScreen_20050727( __DRInativeDisplay *dpy,
static const char *driver_name = "R300";
static const __DRIutilversion2 ddx_expected = { 4, 5, 0, 0 };
static const __DRIversion dri_expected = { 4, 0, 0 };
static const __DRIversion drm_expected = { 1, 20, 0 };
static const __DRIversion drm_expected = { 1, 22, 0 };
#endif
dri_interface = interface;