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

Fixed preprocessor invalid token errors.

Browse Source
This commit is contained in:
guillemj
2003-06-29 18:45:56 +00:00
parent ec0e9dc38b
commit da40699dd9
6 changed files with 41 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
glide3x/cvg/glide3/src/distate.c
View File

@@ -19,6 +19,9 @@
**
** $Header$
** $Log$
** Revision 1.1.1.1 1999/12/07 21:42:31 joseph
** Initial checkin into SourceForge.
**
**
** 1 10/08/98 11:30a Brent
**
@@ -163,25 +166,25 @@
*/
#define STOREARG(function, arg) \
gc->state.stateArgs.##function##Args.arg = arg
gc->state.stateArgs.function ## Args.arg = arg
#define LOADARG(function, arg) \
gc->state.stateArgs.##function##Args.arg
gc->state.stateArgs.function ## Args.arg
#define INVALIDATE(regset) \
gc->state.invalid |= ##regset##BIT
gc->state.invalid |= regset ## BIT
#define NOTVALID(regset) \
(gc->state.invalid & ##regset##BIT)
(gc->state.invalid & regset ## BIT)
#define SETVALID(regset) \
(gc->state.invalid &= ~(##regset##BIT))
(gc->state.invalid &= ~(regset ## BIT))
#define ENABLEMODE(mode) \
gc->state.grEnableArgs.##mode## = GR_MODE_ENABLE;
gc->state.grEnableArgs.mode = GR_MODE_ENABLE;
#define DISABLEMODE(mode) \
gc->state.grEnableArgs.##mode## = GR_MODE_DISABLE;
gc->state.grEnableArgs.mode = GR_MODE_DISABLE;
/*-------------------------------------------------------------------
Function: grAlphaBlendFunction

5
glide3x/cvg/glide3/src/fxglide.h
View File

@@ -19,6 +19,9 @@
**
** $Header$
** $Log$
** Revision 1.1.1.1 1999/12/07 21:42:31 joseph
** Initial checkin into SourceForge.
**
**
** 2 10/08/98 3:04p Atai
** added clip coords tri cull version
@@ -1414,7 +1417,7 @@ extern GrGCFuncs _curGCFuncs;
#ifdef GLIDE3
#define GR_STATE_ENTRY(name, type, args) \
type _##name## args
type _ ## name args
#else
#define GR_STATE_ENTRY(name, type, args) \
GR_ENTRY(name, type, args)

16
glide3x/h3/glide3/src/distate.c
View File

@@ -19,6 +19,10 @@
**
** $Header$
** $Log$
** Revision 1.2 2000/11/24 18:36:48 alanh
** Add new grStippleMode and grStipplePattern functions for both Voodoo3 and
** Voodoo5 hardware.
**
** Revision 1.1.1.1 1999/11/24 21:44:54 joseph
** Initial checkin for SourceForge
**
@@ -199,23 +203,23 @@
*/
#define STOREARG(function, arg) \
gc->state.stateArgs.##function##Args.arg = arg
gc->state.stateArgs.function ## Args.arg = arg
#define LOADARG(function, arg) \
gc->state.stateArgs.##function##Args.arg
gc->state.stateArgs.function ## Args.arg
#define NOTVALID(regset) \
(gc->state.invalid & ##regset##BIT)
(gc->state.invalid & regset ## BIT)
#define SETVALID(regset) \
(gc->state.invalid &= ~(##regset##BIT))
(gc->state.invalid &= ~(regset ## BIT))
#define ENABLEMODE(mode) \
gc->state.grEnableArgs.##mode## = GR_MODE_ENABLE;
gc->state.grEnableArgs.mode = GR_MODE_ENABLE;
#define DISABLEMODE(mode) \
gc->state.grEnableArgs.##mode## = GR_MODE_DISABLE;
gc->state.grEnableArgs.mode = GR_MODE_DISABLE;
/*-------------------------------------------------------------------
Function: grAlphaBlendFunction

7
glide3x/h3/glide3/src/fxglide.h
View File

@@ -19,6 +19,9 @@
**
** $Header$
** $Log$
** Revision 1.2.4.1 2003/05/05 07:12:46 dborca
** no message
**
** Revision 1.2 2000/11/24 18:36:48 alanh
** Add new grStippleMode and grStipplePattern functions for both Voodoo3 and
** Voodoo5 hardware.
@@ -1512,7 +1515,7 @@ extern GrGCFuncs _curGCFuncs;
#ifdef GLIDE3
#define GR_STATE_ENTRY(name, type, args) \
type _##name## args
type _ ## name args
#else
#define GR_STATE_ENTRY(name, type, args) \
GR_ENTRY(name, type, args)
@@ -1837,7 +1840,7 @@ extern FxU32 threadValueDJGPP;
#define CUR_TRI_PROC(__checkValidP, __cullP) \
(*gc->archDispatchProcs.coorModeTriVector)[__checkValidP][__cullP]
#define INVALIDATE(regset) {\
gc->state.invalid |= ##regset##BIT; \
gc->state.invalid |= regset ## BIT; \
gc->triSetupProc = CUR_TRI_PROC(FXTRUE, (gc->state.cull_mode != GR_CULL_DISABLE)); \
}

18
glide3x/h5/glide3/src/distate.c
View File

@@ -352,31 +352,31 @@
*/
#define STOREARG_TMU(function, tmu, arg) \
gc->state.stateArgs.##function##Args.arg[tmu] = arg
gc->state.stateArgs.function ## Args.arg[tmu] = arg
#define LOADARG_TMU(function, tmu, arg) \
gc->state.stateArgs.##function##Args.arg[tmu]
gc->state.stateArgs.function ## Args.arg[tmu]
#define STOREARG(function, arg) \
gc->state.stateArgs.##function##Args.arg = arg
gc->state.stateArgs.function ## Args.arg = arg
#define LOADARG(function, arg) \
gc->state.stateArgs.##function##Args.arg
gc->state.stateArgs.function ## Args.arg
#define NOTVALID(regset) \
(gc->state.invalid & ##regset##BIT)
(gc->state.invalid & regset ## BIT)
#define NOTVALID_TMU(tmu, regset) \
(gc->state.tmuInvalid[tmu] & ##regset##BIT)
(gc->state.tmuInvalid[tmu] & regset ## BIT)
#define SETVALID(regset) \
(gc->state.invalid &= ~(##regset##BIT))
(gc->state.invalid &= ~(regset ## BIT))
#define ENABLEMODE(mode) \
gc->state.grEnableArgs.##mode## = GR_MODE_ENABLE;
gc->state.grEnableArgs.mode = GR_MODE_ENABLE;
#define DISABLEMODE(mode) \
gc->state.grEnableArgs.##mode## = GR_MODE_DISABLE;
gc->state.grEnableArgs.mode = GR_MODE_DISABLE;
/*-------------------------------------------------------------------
Function: grAlphaBlendFunction

6
glide3x/h5/glide3/src/fxglide.h
View File

@@ -2220,7 +2220,7 @@ extern GrGCFuncs _curGCFuncs;
#ifdef GLIDE3
#define GR_STATE_ENTRY(name, type, args) \
type _##name## args
type _ ## name args
#else
#define GR_STATE_ENTRY(name, type, args) \
GR_ENTRY(name, type, args)
@@ -2734,13 +2734,13 @@ extern FxU32 threadValueDJGPP;
#define CUR_TRI_PROC(__checkValidP, __cullP) \
(*gc->archDispatchProcs.coorModeTriVector)[__checkValidP][__cullP]
#define INVALIDATE(regset) {\
gc->state.invalid |= ##regset##BIT; \
gc->state.invalid |= regset ## BIT; \
gc->triSetupProc = CUR_TRI_PROC(FXTRUE, (gc->state.cull_mode != GR_CULL_DISABLE)); \
}
#define INVALIDATE_TMU(tmu, regset) {\
INVALIDATE(tmuConfig); \
gc->state.tmuInvalid[tmu] |= ##regset##BIT; \
gc->state.tmuInvalid[tmu] |= regset ## BIT; \
}
void