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

do not include SST1 and SST96 init codes together.

Browse Source
This commit is contained in:
Ozkan Sezer
2021-11-11 17:37:04 +03:00
parent a20bb982cc
commit 587e01e573
17 changed files with 272 additions and 407 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
glide2x/sst1/glide/src/Makefile.DJ
View File

@@ -164,19 +164,22 @@ GLIDE_OBJECTS += \
endif
endif
INIT_OBJECTS = \
../../init/init.o
ifeq ($(FX_GLIDE_HW),sst96)
GLIDE_OBJECTS += \
sst96.o \
sst96.o
INIT_OBJECTS += \
../../init/vg96drvr.o \
../../init/init96/init96.o \
../../init/init96/dxdrvr.o \
../../init/init96/initat3d.o \
../../init/init96/initmcrx.o
endif
GLIDE_OBJECTS += \
../../init/init.o \
../../init/init96/initmcrx.o \
../../init/initvg/gdebug.o
else
INIT_OBJECTS += \
../../init/vgdrvr.o \
../../init/vg96drvr.o \
../../init/initvg/gamma.o \
../../init/initvg/dac.o \
../../init/initvg/video.o \
@@ -186,7 +189,11 @@ GLIDE_OBJECTS += \
../../init/initvg/info.o \
../../init/initvg/print.o \
../../init/initvg/gdebug.o \
../../init/initvg/sst1init.o \
../../init/initvg/sst1init.o
endif
GLIDE_OBJECTS += \
$(INIT_OBJECTS) \
$(FX_GLIDE_SW)/newpci/pcilib/sst1_pci.o \
$(FX_GLIDE_SW)/newpci/pcilib/fxmsr.o \
$(FX_GLIDE_SW)/newpci/pcilib/fxpci.o \
@@ -223,29 +230,6 @@ xdraw.o: xdraw.asm
xdraw96.o: xdraw96.asm
$(AS) -o $@ $(ASFLAGS) $<
ifeq ($(FX_GLIDE_HW),sst96)
../../init/initvg/gamma.o: ../../init/initvg/gamma.c
$(CC) -o $@ $(CFLAGS) -USST96 -c $<
../../init/initvg/dac.o: ../../init/initvg/dac.c
$(CC) -o $@ $(CFLAGS) -USST96 -c $<
../../init/initvg/video.o: ../../init/initvg/video.c
$(CC) -o $@ $(CFLAGS) -USST96 -c $<
../../init/initvg/parse.o: ../../init/initvg/parse.c
$(CC) -o $@ $(CFLAGS) -USST96 -c $<
../../init/initvg/sli.o: ../../init/initvg/sli.c
$(CC) -o $@ $(CFLAGS) -USST96 -c $<
../../init/initvg/util.o: ../../init/initvg/util.c
$(CC) -o $@ $(CFLAGS) -USST96 -c $<
../../init/initvg/info.o: ../../init/initvg/info.c
$(CC) -o $@ $(CFLAGS) -USST96 -c $<
../../init/initvg/print.o: ../../init/initvg/print.c
$(CC) -o $@ $(CFLAGS) -USST96 -c $<
../../init/initvg/gdebug.o: ../../init/initvg/gdebug.c
$(CC) -o $@ $(CFLAGS) -USST96 -c $<
../../init/initvg/sst1init.o: ../../init/initvg/sst1init.c
$(CC) -o $@ $(CFLAGS) -USST96 -c $<
endif
$(GLIDE_OBJECTS): fxinline.h fxgasm.h
# cross-compile workaround:

67
glide2x/sst1/glide/src/Makefile.linux
View File

@@ -188,19 +188,22 @@ GLIDE_OBJECTS += \
endif
endif
INIT_OBJECTS = \
../../init/init.o
ifeq ($(FX_GLIDE_HW),sst96)
GLIDE_OBJECTS += \
sst96.o \
sst96.o
INIT_OBJECTS += \
../../init/vg96drvr.o \
../../init/init96/init96.o \
../../init/init96/lindrvr.o \
../../init/init96/initat3d.o \
../../init/init96/initmcrx.o
endif
GLIDE_OBJECTS += \
../../init/init.o \
../../init/init96/initmcrx.o \
../../init/initvg/gdebug.o
else
INIT_OBJECTS += \
../../init/vgdrvr.o \
../../init/vg96drvr.o \
../../init/initvg/gamma.o \
../../init/initvg/dac.o \
../../init/initvg/video.o \
@@ -210,7 +213,11 @@ GLIDE_OBJECTS += \
../../init/initvg/info.o \
../../init/initvg/print.o \
../../init/initvg/gdebug.o \
../../init/initvg/sst1init.o \
../../init/initvg/sst1init.o
endif
GLIDE_OBJECTS += \
$(INIT_OBJECTS) \
$(FX_GLIDE_SW)/newpci/pcilib/sst1_pci.o \
$(FX_GLIDE_SW)/newpci/pcilib/fxmsr.o \
$(FX_GLIDE_SW)/newpci/pcilib/fxpci.o \
@@ -269,50 +276,6 @@ xdraw.lo: xdraw.o
xdraw96.lo: xdraw96.o
$(CP) $< $@
ifeq ($(FX_GLIDE_HW),sst96)
../../init/initvg/gamma.o: ../../init/initvg/gamma.c
$(CC) -o $@ $(CFLAGS) -USST96 -c $<
../../init/initvg/dac.o: ../../init/initvg/dac.c
$(CC) -o $@ $(CFLAGS) -USST96 -c $<
../../init/initvg/video.o: ../../init/initvg/video.c
$(CC) -o $@ $(CFLAGS) -USST96 -c $<
../../init/initvg/parse.o: ../../init/initvg/parse.c
$(CC) -o $@ $(CFLAGS) -USST96 -c $<
../../init/initvg/sli.o: ../../init/initvg/sli.c
$(CC) -o $@ $(CFLAGS) -USST96 -c $<
../../init/initvg/util.o: ../../init/initvg/util.c
$(CC) -o $@ $(CFLAGS) -USST96 -c $<
../../init/initvg/info.o: ../../init/initvg/info.c
$(CC) -o $@ $(CFLAGS) -USST96 -c $<
../../init/initvg/print.o: ../../init/initvg/print.c
$(CC) -o $@ $(CFLAGS) -USST96 -c $<
../../init/initvg/gdebug.o: ../../init/initvg/gdebug.c
$(CC) -o $@ $(CFLAGS) -USST96 -c $<
../../init/initvg/sst1init.o: ../../init/initvg/sst1init.c
$(CC) -o $@ $(CFLAGS) -USST96 -c $<
../../init/initvg/gamma.lo: ../../init/initvg/gamma.c
$(CC) -o $@ $(CFLAGS) -DPIC -fPIC -USST96 -c $<
../../init/initvg/dac.lo: ../../init/initvg/dac.c
$(CC) -o $@ $(CFLAGS) -DPIC -fPIC -USST96 -c $<
../../init/initvg/video.lo: ../../init/initvg/video.c
$(CC) -o $@ $(CFLAGS) -DPIC -fPIC -USST96 -c $<
../../init/initvg/parse.lo: ../../init/initvg/parse.c
$(CC) -o $@ $(CFLAGS) -DPIC -fPIC -USST96 -c $<
../../init/initvg/sli.lo: ../../init/initvg/sli.c
$(CC) -o $@ $(CFLAGS) -DPIC -fPIC -USST96 -c $<
../../init/initvg/util.lo: ../../init/initvg/util.c
$(CC) -o $@ $(CFLAGS) -DPIC -fPIC -USST96 -c $<
../../init/initvg/info.lo: ../../init/initvg/info.c
$(CC) -o $@ $(CFLAGS) -DPIC -fPIC -USST96 -c $<
../../init/initvg/print.lo: ../../init/initvg/print.c
$(CC) -o $@ $(CFLAGS) -DPIC -fPIC -USST96 -c $<
../../init/initvg/gdebug.lo: ../../init/initvg/gdebug.c
$(CC) -o $@ $(CFLAGS) -DPIC -fPIC -USST96 -c $<
../../init/initvg/sst1init.lo: ../../init/initvg/sst1init.c
$(CC) -o $@ $(CFLAGS) -DPIC -fPIC -USST96 -c $<
endif
$(GLIDE_OBJECTS): fxinline.h fxgasm.h
fxinline.h: fxgasm

46
glide2x/sst1/glide/src/Makefile.mingw
View File

@@ -216,19 +216,22 @@ GLIDE_OBJECTS += \
endif
endif
INIT_OBJECTS = \
../../init/init.o
ifeq ($(FX_GLIDE_HW),sst96)
GLIDE_OBJECTS += \
sst96.o \
sst96.o
INIT_OBJECTS += \
../../init/vg96drvr.o \
../../init/init96/init96.o \
../../init/init96/dxdrvr.o \
../../init/init96/initat3d.o \
../../init/init96/initmcrx.o
endif
GLIDE_OBJECTS += \
../../init/init.o \
../../init/init96/initmcrx.o \
../../init/initvg/gdebug.o
else
INIT_OBJECTS += \
../../init/vgdrvr.o \
../../init/vg96drvr.o \
../../init/initvg/gamma.o \
../../init/initvg/dac.o \
../../init/initvg/video.o \
@@ -238,7 +241,11 @@ GLIDE_OBJECTS += \
../../init/initvg/info.o \
../../init/initvg/print.o \
../../init/initvg/gdebug.o \
../../init/initvg/sst1init.o \
../../init/initvg/sst1init.o
endif
GLIDE_OBJECTS += \
$(INIT_OBJECTS) \
$(FX_GLIDE_SW)/newpci/pcilib/sst1_pci.o \
$(FX_GLIDE_SW)/newpci/pcilib/fxmsr.o \
$(FX_GLIDE_SW)/newpci/pcilib/fxpci.o \
@@ -283,29 +290,6 @@ xdraw.o: xdraw.asm
xdraw96.o: xdraw96.asm
$(AS) -o $@ $(ASFLAGS) -D__MINGW32__ $<
ifeq ($(FX_GLIDE_HW),sst96)
../../init/initvg/gamma.o: ../../init/initvg/gamma.c
$(CC) -o $@ $(CFLAGS) -USST96 -c $<
../../init/initvg/dac.o: ../../init/initvg/dac.c
$(CC) -o $@ $(CFLAGS) -USST96 -c $<
../../init/initvg/video.o: ../../init/initvg/video.c
$(CC) -o $@ $(CFLAGS) -USST96 -c $<
../../init/initvg/parse.o: ../../init/initvg/parse.c
$(CC) -o $@ $(CFLAGS) -USST96 -c $<
../../init/initvg/sli.o: ../../init/initvg/sli.c
$(CC) -o $@ $(CFLAGS) -USST96 -c $<
../../init/initvg/util.o: ../../init/initvg/util.c
$(CC) -o $@ $(CFLAGS) -USST96 -c $<
../../init/initvg/info.o: ../../init/initvg/info.c
$(CC) -o $@ $(CFLAGS) -USST96 -c $<
../../init/initvg/print.o: ../../init/initvg/print.c
$(CC) -o $@ $(CFLAGS) -USST96 -c $<
../../init/initvg/gdebug.o: ../../init/initvg/gdebug.c
$(CC) -o $@ $(CFLAGS) -USST96 -c $<
../../init/initvg/sst1init.o: ../../init/initvg/sst1init.c
$(CC) -o $@ $(CFLAGS) -USST96 -c $<
endif
$(GLIDE_OBJECTS): fxinline.h fxgasm.h
fxinline.h: fxgasm.exe

46
glide2x/sst1/glide/src/Makefile.win32
View File

@@ -175,19 +175,22 @@ GLIDE_OBJECTS += \
endif
endif
INIT_OBJECTS = \
../../init/init.obj
ifeq ($(FX_GLIDE_HW),sst96)
GLIDE_OBJECTS += \
sst96.obj \
sst96.obj
INIT_OBJECTS += \
../../init/vg96drvr.obj \
../../init/init96/init96.obj \
../../init/init96/dxdrvr.obj \
../../init/init96/initat3d.obj \
../../init/init96/initmcrx.obj
endif
GLIDE_OBJECTS += \
../../init/init.obj \
../../init/init96/initmcrx.obj \
../../init/initvg/gdebug.obj
else
INIT_OBJECTS += \
../../init/vgdrvr.obj \
../../init/vg96drvr.obj \
../../init/initvg/gamma.obj \
../../init/initvg/dac.obj \
../../init/initvg/video.obj \
@@ -197,7 +200,11 @@ GLIDE_OBJECTS += \
../../init/initvg/info.obj \
../../init/initvg/print.obj \
../../init/initvg/gdebug.obj \
../../init/initvg/sst1init.obj \
../../init/initvg/sst1init.obj
endif
GLIDE_OBJECTS += \
$(INIT_OBJECTS) \
$(FX_GLIDE_SW)/newpci/pcilib/sst1_pci.obj \
$(FX_GLIDE_SW)/newpci/pcilib/fxmsr.obj \
$(FX_GLIDE_SW)/newpci/pcilib/fxpci.obj \
@@ -235,29 +242,6 @@ xdraw.obj: xdraw.asm
xdraw96.obj: xdraw96.asm
$(AS) -o $@ $(ASFLAGS) $<
ifeq ($(FX_GLIDE_HW),sst96)
../../init/initvg/gamma.obj: ../../init/initvg/gamma.c
$(CC) -Fo$@ $(CFLAGS) -USST96 -c $<
../../init/initvg/dac.obj: ../../init/initvg/dac.c
$(CC) -Fo$@ $(CFLAGS) -USST96 -c $<
../../init/initvg/video.obj: ../../init/initvg/video.c
$(CC) -Fo$@ $(CFLAGS) -USST96 -c $<
../../init/initvg/parse.obj: ../../init/initvg/parse.c
$(CC) -Fo$@ $(CFLAGS) -USST96 -c $<
../../init/initvg/sli.obj: ../../init/initvg/sli.c
$(CC) -Fo$@ $(CFLAGS) -USST96 -c $<
../../init/initvg/util.obj: ../../init/initvg/util.c
$(CC) -Fo$@ $(CFLAGS) -USST96 -c $<
../../init/initvg/info.obj: ../../init/initvg/info.c
$(CC) -Fo$@ $(CFLAGS) -USST96 -c $<
../../init/initvg/print.obj: ../../init/initvg/print.c
$(CC) -Fo$@ $(CFLAGS) -USST96 -c $<
../../init/initvg/gdebug.obj: ../../init/initvg/gdebug.c
$(CC) -Fo$@ $(CFLAGS) -USST96 -c $<
../../init/initvg/sst1init.obj: ../../init/initvg/sst1init.c
$(CC) -Fo$@ $(CFLAGS) -USST96 -c $<
endif
$(GLIDE_OBJECTS): fxinline.h fxgasm.h
fxinline.h: fxgasm.exe

17
glide2x/sst1/glide/src/gsst.c
View File

@@ -600,8 +600,16 @@ GR_ENTRY(grSstWinOpen, FxBool, (
** load fxoem2x.dll and map board
*/
oemi.version = OEMINIT_VERSION;
#if (GLIDE_PLATFORM & GLIDE_HW_SST1)
oemi.vendorID = sst1BoardInfo[_GlideRoot.current_sst].vendorID;
oemi.deviceID = sst1BoardInfo[_GlideRoot.current_sst].deviceID;
#else /* SST96 */
{ InitDeviceInfo info;
initGetDeviceInfo(_GlideRoot.current_sst, &info);
oemi.vendorID = info.vendorID;
oemi.deviceID = info.deviceID;
}
#endif
oemi.boardID = OEMINIT_INVALID_BOARD_ID;
oemi.subvendorID = OEMINIT_INVALID_BOARD_ID;
oemi.linearAddress = gc->base_ptr;
@@ -632,7 +640,8 @@ GR_ENTRY(grSstWinOpen, FxBool, (
ram and vald/invalid configurations
*/
#define SLI_DETECT _GlideRoot.hwConfig.SSTs[_GlideRoot.current_sst].sstBoard.VoodooConfig.sliDetect
/* this is for SST1 only: for an SST96 board, the above overlays with SST96Config.tmuRam != 0 ... */
#if (GLIDE_PLATFORM & GLIDE_HW_SST1)
if ((!SLI_DETECT) &&
((gc->fbuf_size <= 2 &&
resolution == GR_RESOLUTION_800x600 &&
@@ -649,6 +658,7 @@ GR_ENTRY(grSstWinOpen, FxBool, (
rv = FXFALSE;
goto BAILOUT;
}
#endif /* (GLIDE_PLATFORM & GLIDE_HW_SST1) */
#ifdef H3D
if (!GR_RESOLUTION_IS_AUTOFLIPPED(resolution)) {
@@ -685,6 +695,7 @@ GR_ENTRY(grSstWinOpen, FxBool, (
** sst1InitVideoBuffers()
*/
{
#if (GLIDE_PLATFORM & GLIDE_HW_SST1)
if((sstVideoRez = sst1InitFindVideoTimingStruct(resolution,refresh))) {
tvVidtiming = *sstVideoRez;
oemi.vid.res = resolution;
@@ -722,6 +733,10 @@ GR_ENTRY(grSstWinOpen, FxBool, (
}
}
}
#else
oemvidtiming = 0;
oemi.vid.refresh = 0;
#endif
}
#endif
GDBG_INFO((gc->myLevel, " Video Init\n" ));

28
glide2x/sst1/init/init.c
View File

@@ -41,8 +41,11 @@
#include <fxdpmi.h>
#endif
#if defined(SST96)
#include <init96.h>
#else
#include <sst1init.h>
#endif
#ifdef _WIN32
#define _WIN32_LEAN_AND_MEAN_
@@ -69,8 +72,11 @@ static inline void _outp_asm (unsigned short _port, unsigned char _data) {
Module Constants
-------------------------------------------------------------------*/
#if 0
static InitContext
contexts[NUM_3DFX_PRODUCTS]; /* pool of device contexts */
#endif
static InitContext initctx; /* device context - no pool anymore */
InitContext
*context; /* Current device context */
static InitDeviceInfo
@@ -214,18 +220,26 @@ initEnumHardware( InitHWEnumCallback *cb )
}
}
#if defined(SST1)
/* Sanity Check for SLI detection */
for( device = 0; device < numDevicesInSystem; device++ ) {
if ( hwInfo[device].hwClass == INIT_VOODOO &&
hwInfo[device].hwDep.vgInfo.sliDetect &&
if( hwInfo[device].hwDep.vgInfo.sliDetect &&
hwInfo[device].hwDep.vgInfo.slaveBaseAddr == 0 ) {
hwInfo[device].hwDep.vgInfo.sliDetect = FXFALSE;
}
}
#endif
#if 0
/* Initialize all drivers */
vgDriverInit( &contexts[INIT_VOODOO] );
vg96DriverInit( &contexts[INIT_VG96] );
#endif
#if !defined(SST96)
vgDriverInit( &initctx );
#else
vg96DriverInit( &initctx );
#endif
/* Mark the library as initialized */
libInitialized = FXTRUE;
@@ -351,7 +365,17 @@ FxBool
initDeviceSelect( FxU32 devNumber )
{
if ( devNumber < numDevicesInSystem ) {
#if 0 /**/
context = &contexts[hwInfo[devNumber].hwClass];
#endif
#ifdef SST96
if (hwInfo[devNumber].hwClass != INIT_VG96)
return FXFALSE;
#else
if (hwInfo[devNumber].hwClass != INIT_VOODOO)
return FXFALSE;
#endif
context = &initctx;
context->info = hwInfo[devNumber];
return FXTRUE;
}

29
glide2x/sst1/init/init96/init96.c
View File

@@ -186,6 +186,35 @@ devNum,
physAddr,
fifoMTRRNum = 0xffffffff;
/*---- copied from initvg/parse.c here for SST96 ------------*/
const char*
myGetenv(const char* envKey)
{
FxBool callRealGetenvP = FXTRUE;
#if __WIN32__
/* NB: If were being called from cya code in
* DllMain(DLL_PROCESS_DETACH) because the current app has called
* exit() or dropped off of the end of main the per dll environ
* string table has been freed by the c runtime but has not been set
* to NULL. Bad things happen if this memory has been unmapped by
* the system or if the string cannot be found.
*/
{
HANDLE curProcessHandle = GetCurrentProcess();
DWORD exitCode = STILL_ACTIVE;
callRealGetenvP = ((curProcessHandle != NULL) &&
GetExitCodeProcess(curProcessHandle, &exitCode) &&
(exitCode == STILL_ACTIVE));
}
#endif /* __WIN32__ */
return (callRealGetenvP
? getenv(envKey)
: NULL);
}
/*-----------Debuging Info Data------------------------------*/
#ifdef GDBG_INFO_ON
/* NOTE:

28
glide2x/sst1/init/vg96drvr.c
View File

@@ -30,7 +30,6 @@
#include <string.h>
#include <gdebug.h>
#if SST96
static FxBool setVideo( FxU32 hWnd,
GrScreenResolution_t sRes,
GrScreenRefresh_t vRefresh,
@@ -149,30 +148,3 @@ void vg96DriverInit( InitContext *context ) {
context->initGammaTable = gammatable;
context->findVidTimingStruct = findvidtiming;
}
#else
/* I've got to stub this one to get the Voodoo Graphics glide to link */
void vg96DriverInit( InitContext *context ) {
context->setVideo = NULL;
context->restoreVideo = NULL;
context->enableTransport = NULL;
context->disableTransport = NULL;
context->swapBuffers = NULL;
context->status = NULL;
context->busy = NULL;
context->idle = NULL;
context->getBufferPtr = NULL;
context->renderBuffer = NULL;
context->origin = NULL;
context->ioCtl = NULL;
context->control = NULL;
context->wrapFIFO = NULL;
context->gamma = NULL;
context->sliPciOwner = NULL;
context->gammaRGB = NULL;
context->initGammaTable = NULL;
context->findVidTimingStruct = NULL;
}
#endif