diff --git a/glide2x/sst1/glide/src/Makefile.win32 b/glide2x/sst1/glide/src/Makefile.win32 index 05d9324..20ef22a 100644 --- a/glide2x/sst1/glide/src/Makefile.win32 +++ b/glide2x/sst1/glide/src/Makefile.win32 @@ -199,7 +199,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/glide2x/sst1/glide/src/makefile.linux b/glide2x/sst1/glide/src/makefile.linux index fb4f425..87d0c51 100644 --- a/glide2x/sst1/glide/src/makefile.linux +++ b/glide2x/sst1/glide/src/makefile.linux @@ -192,7 +192,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/glide2x/sst1/init/fxinit.h b/glide2x/sst1/init/fxinit.h index fe8e806..aa3c4e1 100644 --- a/glide2x/sst1/init/fxinit.h +++ b/glide2x/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/glide2x/sst1/init/h3drvr.c b/glide2x/sst1/init/h3drvr.c deleted file mode 100644 index afaa943..0000000 --- a/glide2x/sst1/init/h3drvr.c +++ /dev/null @@ -1,120 +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 InitSwapType_t swapBuffers( FxU32 code ) { - return 0; -} - -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 gamma( 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 = gamma; - context->sliPciOwner = sliPciOwner; -} diff --git a/glide2x/sst1/init/init.c b/glide2x/sst1/init/init.c index 4ee6648..e1b990a 100644 --- a/glide2x/sst1/init/init.c +++ b/glide2x/sst1/init/init.c @@ -214,7 +214,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/glide2x/sst1/init/init.h b/glide2x/sst1/init/init.h index 9104eb1..3afa356 100644 --- a/glide2x/sst1/init/init.h +++ b/glide2x/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; diff --git a/glide2x/sst1/init/makefile.linux b/glide2x/sst1/init/makefile.linux index 2060972..f9c44ee 100644 --- a/glide2x/sst1/init/makefile.linux +++ b/glide2x/sst1/init/makefile.linux @@ -44,7 +44,7 @@ LCDEFS += -D$(INITHW) HEADERS = init.h sst1vid.h PRIVATE_HEADERS = fxinit.h INSTALL_DESTINATION = $(BUILD_ROOT_HW) -CFILES = init.c vgdrvr.c vg96drvr.c h3drvr.c +CFILES = init.c vgdrvr.c vg96drvr.c LIBRARIES = libinit.a diff --git a/glide2x/sst1/init/makefile.unix b/glide2x/sst1/init/makefile.unix index 7c12e8d..b8e3c6e 100644 --- a/glide2x/sst1/init/makefile.unix +++ b/glide2x/sst1/init/makefile.unix @@ -44,7 +44,7 @@ LCDEFS += -D$(INITHW) HEADERS = init.h sst1vid.h PRIVATE_HEADERS = fxinit.h INSTALL_DESTINATION = $(BUILD_ROOT_SST1) -CFILES = init.c vgdrvr.c vg96drvr.c h3drvr.c +CFILES = init.c vgdrvr.c vg96drvr.c LIBRARIES = libinit.a