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

sst1 cleanup: remove non-existent h3drvr (FX_SST2) stuff [glide2x side]

Browse Source
This commit is contained in:
sezero
2018-08-04 11:01:20 +03:00
parent 8b047bb95c
commit 1a273ba12a
8 changed files with 3 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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 \

1
glide2x/sst1/glide/src/makefile.linux
View File

@@ -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 \

1
glide2x/sst1/init/fxinit.h
View File

@@ -113,7 +113,6 @@ extern InitContext *context;
void vgDriverInit( InitContext *context );
void vg96DriverInit( InitContext *context );
void h3DriverInit( InitContext *context );
#ifdef __cplusplus
}

120
glide2x/sst1/init/h3drvr.c
View File

@@ -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 <sst1init.h>
#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;
}

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

@@ -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 */

26
glide2x/sst1/init/init.h
View File

@@ -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;

2
glide2x/sst1/init/makefile.linux
View File

@@ -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

2
glide2x/sst1/init/makefile.unix
View File

@@ -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