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

Fixed some bugs in linhwc.c, and added some related definitions.

Browse Source 
Note: Even with these fixes, SLI and AA do not work properly, but
      we are epsilon closer.
This commit is contained in:
billwhite
2000-12-07 03:19:13 +00:00
parent e9896db7fa
commit 8cb58add2c
5 changed files with 78 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
glide3x/h3/minihwc/minihwc.h
View File

@@ -19,6 +19,9 @@
**
** $Header$
** $Log$
** Revision 1.1.1.1 1999/11/24 21:45:07 joseph
** Initial checkin for SourceForge
**
**
** 7 6/24/99 12:45a Stb_mmcclure
** Modifications to fix PRS 6627. Added hwcUnmapMemory9x for revised 9x
@@ -555,6 +558,16 @@ hwcAllocAuxRenderingBuffer(hwcBoardInfo *bInfo,
#endif /* __WIN32__ */
#ifdef __linux__
/*
* Setup for full screen mode in Linux.
*
* The parameter "state" is true just in case we are
* entering full screen mode.
*/
extern Bool hwcSetupFullScreen(hwcBoardInfo *bInfo, FxBool state);
#endif /* defined(__linux__) */
FxBool
hwcGammaRGB(hwcBoardInfo *bInfo, float r, float g, float b);

4
glide3x/h5/glide3/src/fxcmd.h
View File

@@ -1691,4 +1691,8 @@ GR_CHECK_SIZE()
#endif
#ifdef __linux__
extern void _grImportFifo(int fifoPtr, int fifoRead);
#endif /* defined(__linux__) */
#endif /* __FX_CMD_H__ */

4
glide3x/h5/glide3/src/glide.h
View File

@@ -932,6 +932,10 @@ grGlideGetVertexLayout( void *layout );
FX_ENTRY void FX_CALL
grGlideSetVertexLayout( const void *layout );
#ifdef __linux__
FX_ENTRY FxBool FX_CALL
grDRISetupFullScreen(FxBool state);
#endif /* defined(__linux__) */
#endif /* FX_GLIDE_NO_FUNC_PROTO */
#ifdef __cplusplus

21
glide3x/h5/glide3/src/gsst.c
View File

@@ -2357,10 +2357,11 @@ GR_EXT_ENTRY(grSstWinOpenExt, GrContext_t, ( FxU32 hWnd,
} else {
/* %%KCD - I pass in true because I know this will just fall through to hwcInitFifo() */
#if __POWERPC__
if (!hwcInitAGPFifo(bInfo, FXFALSE)) {
if (!hwcInitAGPFifo(bInfo, FXFALSE))
#else
if (!hwcInitAGPFifo(bInfo, FXTRUE)) {
#endif
if (!hwcInitAGPFifo(bInfo, FXTRUE))
#endif
{
hwcRestoreVideo(bInfo);
GrErrorCallback(hwcGetErrorString(), FXFALSE);
GDBG_INFO(gc->myLevel, "hwcInitFifo failed\n");
@@ -2676,10 +2677,9 @@ GR_EXT_ENTRY(grSstWinOpenExt, GrContext_t, ( FxU32 hWnd,
if (bInfo->fifoInfo.agpFifo) {
gcFifo->fifoStart = (FxU32 *) bInfo->fifoInfo.agpVirtAddr;
gcFifo->fifoOffset = bInfo->fifoInfo.agpPhysAddr;
} else {
#else
{
} else
#endif
{
gcFifo->fifoStart = gc->rawLfb + ( gcFifo->fifoOffset >> 2 );
}
gcFifo->fifoEnd = gcFifo->fifoStart + ( gcFifo->fifoSize >> 2 );
@@ -3934,13 +3934,16 @@ _grRenderMode(FxU32 pixelformat)
} /* _grRenderMode */
#ifdef __linux__
void grDRISetupFullScreen(FxBool state) {
/*
* Setup for full screen. Most of the work is done in minihwc.
*/
GR_ENTRY(grDRISetupFullScreen, FxBool, (FxBool state))
{
GR_DCL_GC;
/* hwcInitFifo(gc->bInfo, FXFALSE); */
_grImportFifo(*driInfo.fifoPtr, *driInfo.fifoRead);
hwcSetupFullScreen(gc->bInfo, state);
return(hwcSetupFullScreen(gc->bInfo, state));
}
void grSetSliCount(int chips, int sli) {

65
glide3x/h5/minihwc/linhwc.c
View File

@@ -76,7 +76,6 @@ static FxU32 fenceVar;
#define HWC_TILED_BUFFER_BYTES 0x1000UL /* 128 Bytes x 32 lines */
#define HWC_TILED_BUFFER_Y_ALIGN 0x20000UL
#define HWC_TILED_BUFFER_X_ADJUST 0x80UL
#define HWC_RAW_LFB_STRIDE SST_RAW_LFB_ADDR_STRIDE_8K
static hwcInfo hInfo;
static char errorString[1024];
@@ -131,7 +130,8 @@ static void loadEnvFile() {
char data[128];
char *env, *val;
envitem *item;
int first=1;
unsigned int sawError=0;
envitem *first=(envitem *)0;
if (envinit) return;
envinit=1;
@@ -143,9 +143,9 @@ static void loadEnvFile() {
if (*data=='\n') continue;
val=strchr(data, '=');
if (!val) {
if (first) {
if (!sawError) {
fprintf(stderr, "In config file /etc/conf.3dfx/voodoo3:\n");
first=0;
sawError=1;
}
fprintf(stderr, "Malformed line: %s\n", data);
continue;
@@ -319,6 +319,7 @@ hwcBufferLfbAddr(const hwcBoardInfo *bInfo, FxU32 physAddress)
FxU32 tileRow;
FxU32 lfbAddress;
FxU32 lfbYOffset;
FxU32 lfbBufferStride = bInfo->buffInfo.bufLfbStride;
if (bInfo->vidInfo.tiled) {
GDBG_INFO(80, "\tphysAddress: 0x%08lx\n",physAddress);
@@ -351,7 +352,9 @@ hwcBufferLfbAddr(const hwcBoardInfo *bInfo, FxU32 physAddress)
lfbYOffset = ((tileRow * 32 + tileScanline) << (bInfo->h3nwaySli >> 1));
/* Compute LFB address of tile start */
lfbAddress = bInfo->primaryOffset + lfbYOffset * HWC_LFB_STRIDE + tileXOffset * 128;
lfbAddress = bInfo->primaryOffset
+ lfbYOffset * lfbBufferStride
+ tileXOffset * 128;
GDBG_INFO(80, "\tlfbAddress: %08lx\n", lfbAddress);
retVal = lfbAddress;
@@ -379,7 +382,7 @@ calculateLfbStride(FxU32 screenWidth)
FxBool hwcSetupBufferFullscreen(hwcBoardInfo *bInfo, FxU32 nColBuffers,
FxU32 nAuxBuffers)
{
#define FN_NAME "hwcAllocBuffersFullscreen"
#define FN_NAME "hwcSetupBufferFullscreen"
FxU32 bufStride, bufSize;
if (bInfo->vidInfo.initialized == FXFALSE) {
@@ -479,6 +482,7 @@ hwcSetupBuffersWindowed(hwcBoardInfo *bInfo, FxU32 nColBuffers, FxU32 nAuxBuffer
bInfo->buffInfo.bufStride = bufStride;
bInfo->buffInfo.bufSize = bufSize;
bInfo->buffInfo.bufLfbStride = calculateLfbStride(bufStride);
if (bInfo->vidInfo.tiled) {
driInfo.fullScreenStride=bInfo->buffInfo.bufStrideInTiles = (bufStride >> 7);
@@ -546,6 +550,7 @@ hwcAllocBuffers(hwcBoardInfo *bInfo, FxU32 nColBuffers, FxU32 nAuxBuffers)
GDBG_INFO(80, "\tbufStride: 0x%x\n", bInfo->buffInfo.bufStride);
GDBG_INFO(80, "\tbufStrideInTiles:0x%x\n", bInfo->buffInfo.bufStrideInTiles);
GDBG_INFO(80, "\tbufHeightInTiles:0x%x\n", bInfo->buffInfo.bufHeightInTiles);
GDBG_INFO(80, "\tbufLfbStride :0x%x\n", bInfo->buffInfo.bufLfbStride);
GDBG_INFO(80, "\tnColBuffers: 0x%x\n", bInfo->buffInfo.nColBuffers);
GDBG_INFO(80, "\tcolBuffStart0[0]: 0x%x\n", bInfo->buffInfo.colBuffStart0[0]);
GDBG_INFO(80, "\tcolBuffEnd0[0]: 0x%x\n", bInfo->buffInfo.colBuffEnd0[0]);
@@ -838,7 +843,7 @@ calcBufferStride(hwcBoardInfo *bInfo, FxU32 xres, FxBool tiled)
if (tiled == FXTRUE) {
/* Calculate tile width stuff */
strideInTiles = (xres << shift) >> 7;
if ((xres << 1) & (HWC_TILE_WIDTH - 1))
if ((xres << shift) & (HWC_TILE_WIDTH - 1))
strideInTiles++;
return (strideInTiles * HWC_TILE_WIDTH);
@@ -1226,13 +1231,36 @@ void grDRIResetSAREA() {
_grExportFifo(driInfo.fifoPtr, driInfo.fifoRead);
}
void hwcSetupFullScreen(hwcBoardInfo *bInfo, FxBool state) {
Bool hwcSetupFullScreen(hwcBoardInfo *bInfo, FxBool state) {
driInfo.isFullScreen=state;
if (state) {
int vidScreenSize, lfbMemoryConfig;
int vidScreenSize;
int desktopBpp = driInfo.cpp;
int lg2desktopBpp;
switch (desktopBpp) {
case 2:
lg2desktopBpp = 1;
break;
case 3:
desktopBpp = 4;
/*
* Allez Oop.
*/
case 4:
lg2desktopBpp = 2;
break;
default:
/*
* This cannot happen.
*/
fprintf(stderr,
"Bad desktop BPP value %d in hwcSetupFullScreen\n",
desktopBpp);
return FXFALSE;
}
HWC_IO_STORE(bInfo->regInfo, vidOverlayDudxOffsetSrcWidth,
((driInfo.sPriv->width << 1) << 19));
((driInfo.sPriv->width << lg2desktopBpp) << 19));
/* Video pixel buffer threshold */
{
@@ -1268,18 +1296,11 @@ void hwcSetupFullScreen(hwcBoardInfo *bInfo, FxBool state) {
driInfo.stride); /* distance between scanlines of the OS, in
units of bytes for linear OS's and tiles for
tiled OS's */
lfbMemoryConfig =
SST_RAW_LFB_TILE_BEGIN_PAGE_MUNGE((bInfo->buffInfo.colBuffStart0[0] >> 12))
| HWC_RAW_LFB_STRIDE
| (bInfo->buffInfo.bufStrideInTiles << SST_RAW_LFB_TILE_STRIDE_SHIFT);
HWC_IO_STORE(bInfo->regInfo, lfbMemoryConfig, lfbMemoryConfig);
HWC_IO_STORE(bInfo->regInfo, vidOverlayStartCoords, 0);
HWC_IO_STORE(bInfo->regInfo, vidOverlayEndScreenCoord,
(driInfo.sPriv->height << SST_OVERLAY_Y_SHIFT) |
(driInfo.sPriv->width & SST_OVERLAY_X) );
HWC_IO_STORE(bInfo->regInfo, vidOverlayDudx, 0);
HWC_IO_STORE(bInfo->regInfo, vidOverlayDudx, driInfo.screenWidth);
HWC_IO_STORE(bInfo->regInfo, vidOverlayDvdy, 0);
HWC_IO_LOAD(bInfo->regInfo, vidScreenSize, vidScreenSize);
vidScreenSize &= ~SST_VIDEO_SCREEN_DESKTOPADDR_FIFO_ENABLE;
@@ -1305,12 +1326,15 @@ void hwcSetupFullScreen(hwcBoardInfo *bInfo, FxBool state) {
}
}
}
#if 0
HWC_IO_STORE( bInfo->regInfo, vidDesktopOverlayStride,
( driInfo.stride << 16 ) |
driInfo.stride );
#endif
grSetSliCount(driInfo.sPriv->numChips, driInfo.sliCount);
_grEnableSliCtrl();
if (driInfo.sliCount > 1) {
_grEnableSliCtrl();
}
} else {
hwcInitVideoOverlaySurface(
&bInfo->regInfo,
@@ -1333,4 +1357,5 @@ void hwcSetupFullScreen(hwcBoardInfo *bInfo, FxBool state) {
grSetSliCount(1, 1);
driInfo.stride=driInfo.windowedStride;
}
return(FXTRUE);
}