From 35be4ad445276539ca70dcb948fee3104d6b8658 Mon Sep 17 00:00:00 2001 From: sezero Date: Fri, 3 Aug 2018 19:49:10 +0300 Subject: [PATCH] sst1 cleanup: remove non-existent h3drvr (FX_SST2) stuff --- glide3x/sst1/glide3/src/Makefile.DJ | 1 - glide3x/sst1/glide3/src/Makefile.wat | 1 - glide3x/sst1/glide3/src/Makefile.win32 | 1 - glide3x/sst1/glide3/src/gpci.c | 1 - glide3x/sst1/init/fxinit.h | 1 - glide3x/sst1/init/h3drvr.c | 119 ------------------------- glide3x/sst1/init/init.c | 1 - glide3x/sst1/init/init.h | 26 +----- 8 files changed, 1 insertion(+), 150 deletions(-) delete mode 100644 glide3x/sst1/init/h3drvr.c diff --git a/glide3x/sst1/glide3/src/Makefile.DJ b/glide3x/sst1/glide3/src/Makefile.DJ index 4c7cec2..131bd85 100644 --- a/glide3x/sst1/glide3/src/Makefile.DJ +++ b/glide3x/sst1/glide3/src/Makefile.DJ @@ -176,7 +176,6 @@ GLIDE_OBJECTS += \ ../../init/init.o \ ../../init/vgdrvr.o \ ../../init/vg96drvr.o \ - ../../init/h3drvr.o \ ../../init/initvg/gamma.o \ ../../init/initvg/dac.o \ ../../init/initvg/video.o \ diff --git a/glide3x/sst1/glide3/src/Makefile.wat b/glide3x/sst1/glide3/src/Makefile.wat index cdbd5c3..96ed46b 100644 --- a/glide3x/sst1/glide3/src/Makefile.wat +++ b/glide3x/sst1/glide3/src/Makefile.wat @@ -174,7 +174,6 @@ GLIDE_OBJECTS += \ ../../init/init.obj \ ../../init/vgdrvr.obj \ ../../init/vg96drvr.obj \ - ../../init/h3drvr.obj \ ../../init/initvg/gamma.obj \ ../../init/initvg/dac.obj \ ../../init/initvg/video.obj \ diff --git a/glide3x/sst1/glide3/src/Makefile.win32 b/glide3x/sst1/glide3/src/Makefile.win32 index e29788c..ec15a76 100644 --- a/glide3x/sst1/glide3/src/Makefile.win32 +++ b/glide3x/sst1/glide3/src/Makefile.win32 @@ -191,7 +191,6 @@ GLIDE_OBJECTS += \ ../../init/init.obj \ ../../init/vgdrvr.obj \ ../../init/vg96drvr.obj \ - ../../init/h3drvr.obj \ ../../init/initvg/gamma.obj \ ../../init/initvg/dac.obj \ ../../init/initvg/video.obj \ diff --git a/glide3x/sst1/glide3/src/gpci.c b/glide3x/sst1/glide3/src/gpci.c index 6f69372..18017ef 100644 --- a/glide3x/sst1/glide3/src/gpci.c +++ b/glide3x/sst1/glide3/src/gpci.c @@ -451,7 +451,6 @@ _GlideInitEnvironment( void ) #endif if (getenv("FX_SNAPSHOT")) _GlideRoot.environment.snapshot = atoi(getenv("FX_SNAPSHOT")); - if (getenv("FX_SST2")) _GlideRoot.environment.sst2Flags = atoi(getenv("FX_SST2")); if (getenv("FX_GLIDE_LWM")) _GlideRoot.environment.swFifoLWM = atoi(getenv("FX_GLIDE_LWM")); if (getenv("FX_GLIDE_SWAPINTERVAL")) { diff --git a/glide3x/sst1/init/fxinit.h b/glide3x/sst1/init/fxinit.h index fe8e806..aa3c4e1 100644 --- a/glide3x/sst1/init/fxinit.h +++ b/glide3x/sst1/init/fxinit.h @@ -113,7 +113,6 @@ extern InitContext *context; void vgDriverInit( InitContext *context ); void vg96DriverInit( InitContext *context ); -void h3DriverInit( InitContext *context ); #ifdef __cplusplus } diff --git a/glide3x/sst1/init/h3drvr.c b/glide3x/sst1/init/h3drvr.c deleted file mode 100644 index 128153b..0000000 --- a/glide3x/sst1/init/h3drvr.c +++ /dev/null @@ -1,119 +0,0 @@ -/* -** THIS SOFTWARE IS SUBJECT TO COPYRIGHT PROTECTION AND IS OFFERED ONLY -** PURSUANT TO THE 3DFX GLIDE GENERAL PUBLIC LICENSE. THERE IS NO RIGHT -** TO USE THE GLIDE TRADEMARK WITHOUT PRIOR WRITTEN PERMISSION OF 3DFX -** INTERACTIVE, INC. A COPY OF THIS LICENSE MAY BE OBTAINED FROM THE -** DISTRIBUTOR OR BY CONTACTING 3DFX INTERACTIVE INC(info@3dfx.com). -** THIS PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER -** EXPRESSED OR IMPLIED. SEE THE 3DFX GLIDE GENERAL PUBLIC LICENSE FOR A -** FULL TEXT OF THE NON-WARRANTY PROVISIONS. -** -** USE, DUPLICATION OR DISCLOSURE BY THE GOVERNMENT IS SUBJECT TO -** RESTRICTIONS AS SET FORTH IN SUBDIVISION (C)(1)(II) OF THE RIGHTS IN -** TECHNICAL DATA AND COMPUTER SOFTWARE CLAUSE AT DFARS 252.227-7013, -** AND/OR IN SIMILAR OR SUCCESSOR CLAUSES IN THE FAR, DOD OR NASA FAR -** SUPPLEMENT. UNPUBLISHED RIGHTS RESERVED UNDER THE COPYRIGHT LAWS OF -** THE UNITED STATES. -** -** COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED -** -** -** $Revision$ -** $Date$ -** -*/ - -#include <3dfx.h> -#include -#include "init.h" -#include "fxinit.h" - -static FxBool setVideo( FxU32 hWnd, - GrScreenResolution_t sRes, - GrScreenRefresh_t vRefresh, - InitColorFormat_t cFormat, - InitOriginLocation_t yOrigin, - int nColBuffers, - int nAuxBuffers, - int *xres, - int *yres, - int *fbStride, - sst1VideoTimingStruct *vidTimings) { - return FXFALSE; -} - -static void restoreVideo( void ) { -} - -static FxBool enableTransport( InitFIFOData *info ) { - FxBool rv = FXFALSE; - return rv; -} - -static void disableTransport( void ) { -} - -static void swapBuffers( FxU32 code ) { -} - -static FxU32 status( void ) { - return 0; -} - -static FxBool busy(void) { - return 0; -} - -static void idle( void ) { -} - -static void *getBufferPtr( InitBuffer_t buffer, int *strideBytes ) { - return 0; -} - -static void renderBuffer( InitBuffer_t buffer ) { - return; -} - -static void origin( InitOriginLocation_t origin ) { - return; -} - -static void ioCtl( FxU32 token, void *argument ) { - return; -} - -static FxBool control( FxU32 code ) { - return FXFALSE; -} - -static FxBool wrapFIFO(InitFIFOData *fd) { - return FXTRUE; -} - -static void h3gamma( double gamma ) { -} - -static void sliPciOwner( FxU32 *regbase, FxU32 owner ) { -} - -void h3DriverInit( InitContext *context ) { - context->setVideo = setVideo; - context->restoreVideo = restoreVideo; - context->enableTransport = enableTransport; - context->disableTransport = disableTransport; - context->swapBuffers = swapBuffers; - context->status = status; - context->busy = busy; - context->idle = idle; - context->getBufferPtr = getBufferPtr; - context->renderBuffer = renderBuffer; - context->origin = origin; - context->ioCtl = ioCtl; - context->control = control; - context->wrapFIFO = wrapFIFO; - - - context->gamma = h3gamma; - context->sliPciOwner = sliPciOwner; -} diff --git a/glide3x/sst1/init/init.c b/glide3x/sst1/init/init.c index 7e87cb0..5cb34fc 100644 --- a/glide3x/sst1/init/init.c +++ b/glide3x/sst1/init/init.c @@ -219,7 +219,6 @@ initEnumHardware( InitHWEnumCallback *cb ) /* Initialize all drivers */ vgDriverInit( &contexts[INIT_VOODOO] ); vg96DriverInit( &contexts[INIT_VG96] ); - h3DriverInit( &contexts[INIT_H3] ); /* Mark the library as initialized */ diff --git a/glide3x/sst1/init/init.h b/glide3x/sst1/init/init.h index f22b6d6..050a1c8 100644 --- a/glide3x/sst1/init/init.h +++ b/glide3x/sst1/init/init.h @@ -216,27 +216,8 @@ typedef struct _VG96Info { FxU32 tfxRam; } VG96Info; -/*------------------------------------------------------------------- - Structure: H3Info - Date: 10/4 - Implementor(s): jdt - Library: Init - Description: - Capabilities of H3 - Members: - h3Rev - revision of H3 - fbRam - frame buffer ram - texRam - texture ram - -------------------------------------------------------------------*/ -typedef struct _H3Info { - FxU32 h3Rev; - FxU32 fbRam; - FxU32 texRam; -} H3Info; - typedef enum { INIT_VOODOO, INIT_VG96, - INIT_H3, NUM_3DFX_PRODUCTS } TDFXHwClass; @@ -257,11 +238,7 @@ typedef struct _InitRegisterDesc { FxU8 mclockHi; FxU8 mclockLo; } VG96RegDesc; - struct { - FxU32 - *baseAddress; /* Base address */ - } BansheeRegDesc; - } hwDep; + } hwDep; } InitRegisterDesc; /*------------------------------------------------------------------- @@ -285,7 +262,6 @@ typedef struct _InitDeviceInfo { union { VGInfo vgInfo; VG96Info vg96Info; - H3Info h3Info; } hwDep; InitRegisterDesc regs; } InitDeviceInfo;