chacha/glide
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases Activity

Rush: fixed grLfbLock(AUXBUFFER)

Browse Source
This commit is contained in:
dborca
2004-09-24 06:58:10 +00:00
parent 5484926668
commit 2506470f93
2 changed files with 45 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
glide3x/sst1/init/init96/dxdrvr.c
View File

@@ -18,12 +18,17 @@
** COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED
**
** $Log$
** Revision 1.1.2.2 2004/03/08 07:42:23 dborca
** Voodoo Rush fixes
**
** Revision 1.1.2.1 2004/03/02 07:56:03 dborca
** Bastardised Glide3x for SST1
**
** Revision 1.1.1.1 1999/12/07 21:49:06 joseph
** Initial checkin into SourceForge.
**
** 35 11/03/98 11:13a Peter
** release exclusive mode in the fullscreen case of restoreVideo
*
* 34 1/12/98 10:22p Dow
* H3D Stereo Support
@@ -745,14 +750,23 @@ FxBool
dxClose()
{
GDBG_INFO((80, "dxClose:\n"));
/*
* fixme! nulling out this code fixes bug 541... why is unclear??? XXX
/* fixme! nulling out this code fixes bug 541... why is unclear??? XXX
* A little more information... the problem is releasing lpDD1, and
* only in fullscreen mode. Temporary refined hack is to not release
* lpDD1 in fullscreen mode. Also rearrange code in dxAllocSurfaces
* to only create lpDD1 once per application execution. /PGJ
*/
#if 1
/* If we're fullscreen then we need to release exclusive mode access
* to the hw otherwise re-opens won't work. DD seems to take care of
* this if the app just quits, but nuking the surfaces does not seem
* to be sufficient in the normal case.
*/
if (IsFullScreen) {
IDirectDraw2_SetCooperativeLevel(lpDD, hWndApp, DDSCL_NORMAL );
}
// Release any allocated buffers
if( lpClipper) IDirectDrawSurface2_Release( lpClipper);
if( lpFront ) IDirectDrawSurface2_Release( lpFront );
@@ -761,6 +775,7 @@ dxClose()
}
if( lpAux ) IDirectDrawSurface2_Release( lpAux );
if( lpDD ) IDirectDraw2_Release( lpDD );
if (1 /* !IsFullScreen */) {
if( lpDD1 ) IDirectDraw_Release( lpDD1 );
lpDD1 = NULL;
@@ -771,9 +786,9 @@ dxClose()
lpBack = NULL;
lpTriple = NULL;
lpAux = NULL;
lpDD = NULL;
lpDD = NULL;
#endif /* 0 */
GDBG_INFO((80, "dxClose: Returning TRUE\n"));
return FXTRUE;
} /* dxClose */

39
glide3x/sst1/init/init96/init96.c
View File

@@ -824,10 +824,13 @@ INITVG96ENTRY(init96MapBoard, FxBool , (void *rd, void *info, FxU16 vID, FxU16 d
{
int xres=1, yres=1, fbStride;
GrScreenResolution_t res = GR_RESOLUTION_NONE;
init96SetVideo(0, res,
FxBool rv = FXTRUE;
rv = init96SetVideo(0, res,
0, 2, 1,
2, 1, regDesc,
&xres, &yres, &fbStride );
if ( !rv )
return FXFALSE;
sst96InitGetTmuInfo((FxU32 *)sstHW, vg96Info);
init96RestoreVideo(regDesc);
}
@@ -1029,7 +1032,7 @@ INITVG96ENTRY(init96SetVideo, FxBool ,
if (curHALData->initAperture)
(*curHALData->initAperture)(regDesc);
#if defined( __DOS32__ )
#ifdef __DOS32__
{
union REGS
inR, outR;
@@ -1041,7 +1044,7 @@ INITVG96ENTRY(init96SetVideo, FxBool ,
GDBG_INFO((80, "%s: Saving Current video mode (0x%x).\n",
FN_NAME, oldVidMode));
}
#endif
#endif /* __DOS32__ */
/*-------------------------------------
Set Video Mode
@@ -1415,9 +1418,9 @@ INITVG96ENTRY(init96EnableTransport, FxBool, ( InitFIFOData *info, InitRegisterD
if (res)
pciSetMTRR(fifoMTRRNum, fifoPhysBaseAddress, fifoPhysSize, fifoMemType);
else
else {
GDBG_INFO((80, "%s: Couldn't get free or used MTRR!\n"));
}
return rv;
@@ -1661,7 +1664,7 @@ INITVG96ENTRY(init96Idle, void , (Init96WriteMethod *wcb) )
Return:
void opinter to buffer
-------------------------------------------------------------------*/
#define LFB_OFFSET( X ) ( X & 0x3fffff )
#define LFB_OFFSET( X ) ( X & 0x3fffff ) /* was 0x1fffff */
INITVG96ENTRY(init96GetBufferPtr, void*, (InitBuffer_t buffer, int *strideBytes))
{
@@ -1688,7 +1691,12 @@ INITVG96ENTRY(init96GetBufferPtr, void*, (InitBuffer_t buffer, int *strideBytes)
break;
case INIT_BUFFER_AUXBUFFER:
rv = (void*)(((char*)sstHW) + LFB_OFFSET(ab0));
rv = (void*)(((char*)sstHW) + LFB_OFFSET(ab0Base));
/* [dBorca]
* used to be ab0, but I changed it to ab0Base.
* VG96STRIDE(ab0Stride) doesn't really matter,
* because we stripped off the high bits anyway!
*/
*strideBytes = ab0Stride;
GDBG_INFO((80, " get aux buffer pointer" ));
break;
@@ -2141,16 +2149,21 @@ init96LoadBufRegs(int nBuffers, InitBufDesc_t *pBufDesc, int xRes,
pAux->bufOffset = A;
}
if (pFront)
GDBG_INFO((80,"F = %.08x, s= %6d\n", pFront->bufOffset, pFront->bufStride));
if (pBack)
if (pFront) {
GDBG_INFO((80,"F = %.08x, s= %6d\n", pFront->bufOffset, pFront->bufStride));
}
if (pBack) {
GDBG_INFO((80,"B = %.08x, s= %6d\n", pBack ->bufOffset, pBack ->bufStride));
if (pTriple)
}
if (pTriple) {
GDBG_INFO((80,"T = %.08x, s= %6d\n", pTriple ->bufOffset, pTriple ->bufStride));
if (pAux)
}
if (pAux) {
GDBG_INFO((80,"A = %.08x, s= %6d\n", pAux ->bufOffset, pAux ->bufStride));
if (pFifo)
}
if (pFifo) {
GDBG_INFO((80,"C = %.08x, s= %6d\n", pFifo ->bufOffset, pFifo ->bufStride));
}
/* Fill the arrays here */
bI[0].dfbBase = pFront->bufOffset;