projects / packages / Glide_V3-DRI.git / blame
| Commit | Line | Data |
|---|---|---|
| acc67c3e JB |
1 | --- glide3x-20010309/h3/glide3/src/fxglide.h.orig Thu Jul 17 16:10:34 2003 |
| 2 | +++ glide3x-20010309/h3/glide3/src/fxglide.h Thu Jul 17 16:19:04 2003 | |
| 3 | @@ -1517,7 +1517,7 @@ | |
| 4 | ||
| 5 | #ifdef GLIDE3 | |
| 6 | #define GR_STATE_ENTRY(name, type, args) \ | |
| 7 | - type _##name## args | |
| 8 | + type _##name args | |
| 9 | #else | |
| 10 | #define GR_STATE_ENTRY(name, type, args) \ | |
| 11 | GR_ENTRY(name, type, args) | |
| 12 | @@ -1836,7 +1836,7 @@ | |
| 13 | #define CUR_TRI_PROC(__checkValidP, __cullP) \ | |
| 14 | (*gc->archDispatchProcs.coorModeTriVector)[__checkValidP][__cullP] | |
| 15 | #define INVALIDATE(regset) {\ | |
| 16 | - gc->state.invalid |= ##regset##BIT; \ | |
| 17 | + gc->state.invalid |= regset##BIT; \ | |
| 18 | gc->triSetupProc = CUR_TRI_PROC(FXTRUE, (gc->state.cull_mode != GR_CULL_DISABLE)); \ | |
| 19 | } | |
| 20 | ||
| 21 | --- glide3x-20010309/h3/glide3/src/distate.c.orig Fri Nov 24 19:36:48 2000 | |
| 22 | +++ glide3x-20010309/h3/glide3/src/distate.c Thu Jul 17 16:24:04 2003 | |
| 23 | @@ -203,23 +203,23 @@ | |
| 24 | */ | |
| 25 | ||
| 26 | #define STOREARG(function, arg) \ | |
| 27 | -gc->state.stateArgs.##function##Args.arg = arg | |
| 28 | +gc->state.stateArgs.function##Args.arg = arg | |
| 29 | ||
| 30 | #define LOADARG(function, arg) \ | |
| 31 | -gc->state.stateArgs.##function##Args.arg | |
| 32 | +gc->state.stateArgs.function##Args.arg | |
| 33 | ||
| 34 | ||
| 35 | #define NOTVALID(regset) \ | |
| 36 | -(gc->state.invalid & ##regset##BIT) | |
| 37 | +(gc->state.invalid & regset##BIT) | |
| 38 | ||
| 39 | #define SETVALID(regset) \ | |
| 40 | -(gc->state.invalid &= ~(##regset##BIT)) | |
| 41 | +(gc->state.invalid &= ~(regset##BIT)) | |
| 42 | ||
| 43 | #define ENABLEMODE(mode) \ | |
| 44 | -gc->state.grEnableArgs.##mode## = GR_MODE_ENABLE; | |
| 45 | +gc->state.grEnableArgs.mode = GR_MODE_ENABLE; | |
| 46 | ||
| 47 | #define DISABLEMODE(mode) \ | |
| 48 | -gc->state.grEnableArgs.##mode## = GR_MODE_DISABLE; | |
| 49 | +gc->state.grEnableArgs.mode = GR_MODE_DISABLE; | |
| 50 | ||
| 51 | /*------------------------------------------------------------------- | |
| 52 | Function: grAlphaBlendFunction | |
| 53 | --- glide3x-20010309/h5/glide3/src/fxglide.h.orig Thu Jul 17 17:00:23 2003 | |
| 54 | +++ glide3x-20010309/h5/glide3/src/fxglide.h Thu Jul 17 17:08:30 2003 | |
| 55 | @@ -2123,7 +2123,7 @@ | |
| 56 | ||
| 57 | #ifdef GLIDE3 | |
| 58 | #define GR_STATE_ENTRY(name, type, args) \ | |
| 59 | - type _##name## args | |
| 60 | + type _##name args | |
| 61 | #else | |
| 62 | #define GR_STATE_ENTRY(name, type, args) \ | |
| 63 | GR_ENTRY(name, type, args) | |
| 64 | @@ -2630,13 +2630,13 @@ | |
| 65 | #define CUR_TRI_PROC(__checkValidP, __cullP) \ | |
| 66 | (*gc->archDispatchProcs.coorModeTriVector)[__checkValidP][__cullP] | |
| 67 | #define INVALIDATE(regset) {\ | |
| 68 | - gc->state.invalid |= ##regset##BIT; \ | |
| 69 | + gc->state.invalid |= regset##BIT; \ | |
| 70 | gc->triSetupProc = CUR_TRI_PROC(FXTRUE, (gc->state.cull_mode != GR_CULL_DISABLE)); \ | |
| 71 | } | |
| 72 | ||
| 73 | #define INVALIDATE_TMU(tmu, regset) {\ | |
| 74 | INVALIDATE(tmuConfig); \ | |
| 75 | - gc->state.tmuInvalid[tmu] |= ##regset##BIT; \ | |
| 76 | + gc->state.tmuInvalid[tmu] |= regset##BIT; \ | |
| 77 | } | |
| 78 | ||
| 79 | void | |
| 80 | --- glide3x-20010309/h5/glide3/src/distate.c.orig Fri Nov 24 19:36:47 2000 | |
| 81 | +++ glide3x-20010309/h5/glide3/src/distate.c Thu Jul 17 17:09:02 2003 | |
| 82 | @@ -349,31 +349,31 @@ | |
| 83 | */ | |
| 84 | ||
| 85 | #define STOREARG_TMU(function, tmu, arg) \ | |
| 86 | -gc->state.stateArgs.##function##Args.arg[tmu] = arg | |
| 87 | +gc->state.stateArgs.function##Args.arg[tmu] = arg | |
| 88 | ||
| 89 | #define LOADARG_TMU(function, tmu, arg) \ | |
| 90 | -gc->state.stateArgs.##function##Args.arg[tmu] | |
| 91 | +gc->state.stateArgs.function##Args.arg[tmu] | |
| 92 | ||
| 93 | #define STOREARG(function, arg) \ | |
| 94 | -gc->state.stateArgs.##function##Args.arg = arg | |
| 95 | +gc->state.stateArgs.function##Args.arg = arg | |
| 96 | ||
| 97 | #define LOADARG(function, arg) \ | |
| 98 | -gc->state.stateArgs.##function##Args.arg | |
| 99 | +gc->state.stateArgs.function##Args.arg | |
| 100 | ||
| 101 | #define NOTVALID(regset) \ | |
| 102 | -(gc->state.invalid & ##regset##BIT) | |
| 103 | +(gc->state.invalid & regset##BIT) | |
| 104 | ||
| 105 | #define NOTVALID_TMU(tmu, regset) \ | |
| 106 | -(gc->state.tmuInvalid[tmu] & ##regset##BIT) | |
| 107 | +(gc->state.tmuInvalid[tmu] & regset##BIT) | |
| 108 | ||
| 109 | #define SETVALID(regset) \ | |
| 110 | -(gc->state.invalid &= ~(##regset##BIT)) | |
| 111 | +(gc->state.invalid &= ~(regset##BIT)) | |
| 112 | ||
| 113 | #define ENABLEMODE(mode) \ | |
| 114 | -gc->state.grEnableArgs.##mode## = GR_MODE_ENABLE; | |
| 115 | +gc->state.grEnableArgs.mode = GR_MODE_ENABLE; | |
| 116 | ||
| 117 | #define DISABLEMODE(mode) \ | |
| 118 | -gc->state.grEnableArgs.##mode## = GR_MODE_DISABLE; | |
| 119 | +gc->state.grEnableArgs.mode = GR_MODE_DISABLE; | |
| 120 | ||
| 121 | /*------------------------------------------------------------------- | |
| 122 | Function: grAlphaBlendFunction |