]> git.pld-linux.org Git - packages/Glide_V2.git/blame - glide-cpp.patch
projects / packages / Glide_V2.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- rediffed patches, pass AR to remove 'l' option, which changed meaning
[packages/Glide_V2.git] / glide-cpp.patch
CommitLineData
a803064a
JB		 1--- GlideV2/glide3x/cvg/glide3/src/fxglide.h.orig 2000-04-20 23:26:39.000000000 +0200
2+++ GlideV2/glide3x/cvg/glide3/src/fxglide.h 2012-01-08 20:16:45.707252884 +0100
3@@ -1417,7 +1417,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@@ -3339,17 +3339,17 @@
13 #endif
14
15 #ifdef GLIDE3_DEBUG
16-#define TEX_INFO(ptr,field) ptr##field
17+#define TEX_INFO(ptr,field) ptr.field
18 #define G3_LOD_TRANSLATE(lod) (lod)
19 #define G3_ASPECT_TRANSLATE(aspect) (aspect)
20 #else /* !GLIDE3_DEBUG */
21-#define TEX_INFO(ptr,field) ptr##field##Log2
22+#define TEX_INFO(ptr,field) ptr.field##Log2
23 #define G3_LOD_TRANSLATE(lod) (0x8-lod)
24 #define G3_ASPECT_TRANSLATE(aspect) (0x3-(aspect))
25 #endif /* !GLIDE3_DEBUG */
26
27 #else /* !(defined(GLIDE3) && defined(GLIDE3_ALPHA)) */
28-#define TEX_INFO(ptr,field) ptr##field
29+#define TEX_INFO(ptr,field) ptr.field
30 #define G3_LOD_TRANSLATE(lod) (lod)
31 #define G3_ASPECT_TRANSLATE(aspect) (aspect)
32 #endif /* !(defined(GLIDE3) && defined(GLIDE3_ALPHA)) */
33--- GlideV2/glide3x/cvg/glide3/src/gsplash.c.orig 2000-04-20 23:26:39.000000000 +0200
34+++ GlideV2/glide3x/cvg/glide3/src/gsplash.c 2012-01-08 20:16:33.697252482 +0100
35@@ -298,9 +298,9 @@
36 downloadTexture(Texture *texture, Gu3dfInfo *info)
37 {
38 texture->info.data = info->data;
39- TEX_INFO(texture->info.,smallLod) = info->header.small_lod;
40- TEX_INFO(texture->info.,largeLod) = info->header.large_lod;
41- TEX_INFO(texture->info.,aspectRatio) = info->header.aspect_ratio;
42+ TEX_INFO(texture->info,smallLod) = info->header.small_lod;
43+ TEX_INFO(texture->info,largeLod) = info->header.large_lod;
44+ TEX_INFO(texture->info,aspectRatio) = info->header.aspect_ratio;
45 texture->info.format = info->header.format;
46
47 texture->addr = nextFreeBase;
48--- GlideV2/glide3x/cvg/glide3/src/ditex.c.orig 2000-04-20 23:26:39.000000000 +0200
49+++ GlideV2/glide3x/cvg/glide3/src/ditex.c 2012-01-08 20:22:59.743932075 +0100
50@@ -568,9 +568,9 @@
51 FxU32 memrequired;
52
53 GR_CHECK_F( "grTexTextureMemRequired", !info, "invalid info pointer" );
54- memrequired = _grTexTextureMemRequired( G3_LOD_TRANSLATE(TEX_INFO(info->,smallLod)),
55- G3_LOD_TRANSLATE(TEX_INFO(info->,largeLod)),
56- G3_ASPECT_TRANSLATE(TEX_INFO(info->,aspectRatio)),
57+ memrequired = _grTexTextureMemRequired( G3_LOD_TRANSLATE(TEX_INFO((*info),smallLod)),
58+ G3_LOD_TRANSLATE(TEX_INFO((*info),largeLod)),
59+ G3_ASPECT_TRANSLATE(TEX_INFO((*info),aspectRatio)),
60 info->format,
61 evenOdd );
62
63@@ -635,12 +635,12 @@
64 ---------------------------------------------------------------*/
65 #if defined(GLIDE3) && defined(GLIDE3_ALPHA)
66 #ifdef GLIDE3_DEBUG
67- for( lod = TEX_INFO(info->,largeLod); lod <= TEX_INFO(info->,smallLod); lod++ ) {
68+ for( lod = TEX_INFO((*info),largeLod); lod <= TEX_INFO((*info),smallLod); lod++ ) {
69 #else
70- for( lod = TEX_INFO(info->,largeLod); lod >= TEX_INFO(info->,smallLod); lod-- ) {
71+ for( lod = TEX_INFO((*info),largeLod); lod >= TEX_INFO((*info),smallLod); lod-- ) {
72 #endif
73 #else
74- for( lod = TEX_INFO(info->,largeLod); lod <= TEX_INFO(info->,smallLod); lod++ ) {
75+ for( lod = TEX_INFO((*info),largeLod); lod <= TEX_INFO((*info),smallLod); lod++ ) {
76 #endif
77 /*
78 ** note for glide3 lod translation:
79@@ -649,13 +649,13 @@
80 grTexDownloadMipMapLevel( tmu,
81 startAddress,
82 lod,
83- TEX_INFO(info->,largeLod),
84- TEX_INFO(info->,aspectRatio),
85+ TEX_INFO((*info),largeLod),
86+ TEX_INFO((*info),aspectRatio),
87 info->format,
88 evenOdd,
89 src_base );
90
91- src_base += _grMipMapHostSize[_gr_aspect_index_table[G3_ASPECT_TRANSLATE(TEX_INFO(info->,aspectRatio))]][G3_LOD_TRANSLATE(lod)]
92+ src_base += _grMipMapHostSize[_gr_aspect_index_table[G3_ASPECT_TRANSLATE(TEX_INFO((*info),aspectRatio))]][G3_LOD_TRANSLATE(lod)]
93 << (info->format>=GR_TEXFMT_16BIT);
94 }
95 } /* grTexDownloadMipMap */
96--- GlideV2/glide3x/cvg/glide3/src/gtex.c.orig 2000-04-20 23:26:39.000000000 +0200
97+++ GlideV2/glide3x/cvg/glide3/src/gtex.c 2012-01-09 16:40:49.713045393 +0100
98@@ -980,16 +980,16 @@
99 /*-------------------------------------------------------------
100 Update Texture Unit State
101 -------------------------------------------------------------*/
102- gc->state.tmu_config[tmu].smallLod = G3_LOD_TRANSLATE(TEX_INFO(info->,smallLod));
103- gc->state.tmu_config[tmu].largeLod = G3_LOD_TRANSLATE(TEX_INFO(info->,largeLod));
104+ gc->state.tmu_config[tmu].smallLod = G3_LOD_TRANSLATE(TEX_INFO((*info),smallLod));
105+ gc->state.tmu_config[tmu].largeLod = G3_LOD_TRANSLATE(TEX_INFO((*info),largeLod));
106 gc->state.tmu_config[tmu].evenOdd = evenOdd;
107
108 /*-------------------------------------------------------------
109 Calculate Base Address
110 -------------------------------------------------------------*/
111 baseAddress = _grTexCalcBaseAddress(startAddress,
112- G3_LOD_TRANSLATE(TEX_INFO(info->,largeLod)),
113- G3_ASPECT_TRANSLATE(TEX_INFO(info->,aspectRatio)),
114+ G3_LOD_TRANSLATE(TEX_INFO((*info),largeLod)),
115+ G3_ASPECT_TRANSLATE(TEX_INFO((*info),aspectRatio)),
116 info->format,
117 evenOdd) >> 3;
118 #if (GLIDE_PLATFORM & GLIDE_HW_H3)
119@@ -1016,11 +1016,11 @@
120 tLod = gc->state.tmu_config[tmu].tLOD;
121 tLod &= ~(SST_LODMIN | SST_LODMAX | SST_LOD_ASPECT |
122 SST_LOD_TSPLIT | SST_LOD_ODD | SST_LOD_S_IS_WIDER);
123- tLod |= SST_TLOD_MINMAX_INT(G3_LOD_TRANSLATE(TEX_INFO(info->,largeLod)),
124+ tLod |= SST_TLOD_MINMAX_INT(G3_LOD_TRANSLATE(TEX_INFO((*info),largeLod)),
125 gc->state.tmu_config[tmu].mmMode==GR_MIPMAP_DISABLE ?
126- G3_LOD_TRANSLATE(TEX_INFO(info->,largeLod)) : G3_LOD_TRANSLATE(TEX_INFO(info->,smallLod)));
127+ G3_LOD_TRANSLATE(TEX_INFO((*info),largeLod)) : G3_LOD_TRANSLATE(TEX_INFO((*info),smallLod)));
128 tLod |= _gr_evenOdd_xlate_table[evenOdd];
129- tLod |= _gr_aspect_xlate_table[G3_ASPECT_TRANSLATE(TEX_INFO(info->,aspectRatio))];
130+ tLod |= _gr_aspect_xlate_table[G3_ASPECT_TRANSLATE(TEX_INFO((*info),aspectRatio))];
131
132 /* Write relevant registers out to hardware */
133 hw = SST_TMU(hw, tmu);
134@@ -1175,7 +1175,7 @@
135 #else
136 G3_LOD_TRANSLATE(GR_LOD_LOG2_256),
137 #endif
138- G3_ASPECT_TRANSLATE(TEX_INFO(info->,aspectRatio)),
139+ G3_ASPECT_TRANSLATE(TEX_INFO((*info),aspectRatio)),
140 info->format,
141 evenOdd) >> 3;
142 GR_SET(tmuChip, hw, texBaseAddr, baseAddress);
143@@ -1189,7 +1189,7 @@
144 #else
145 G3_LOD_TRANSLATE(GR_LOD_LOG2_128),
146 #endif
147- G3_ASPECT_TRANSLATE(TEX_INFO(info->,aspectRatio)),
148+ G3_ASPECT_TRANSLATE(TEX_INFO((*info),aspectRatio)),
149 info->format,
150 evenOdd) >> 3;
151 GR_SET(tmuChip, hw, texBaseAddr1, baseAddress);
152@@ -1203,7 +1203,7 @@
153 #else
154 G3_LOD_TRANSLATE(GR_LOD_LOG2_64),
155 #endif
156- G3_ASPECT_TRANSLATE(TEX_INFO(info->,aspectRatio)),
157+ G3_ASPECT_TRANSLATE(TEX_INFO((*info),aspectRatio)),
158 info->format,
159 evenOdd) >> 3;
160 GR_SET(tmuChip, hw, texBaseAddr2, baseAddress);
161@@ -1217,7 +1217,7 @@
162 #else
163 G3_LOD_TRANSLATE(GR_LOD_LOG2_32),
164 #endif
165- G3_ASPECT_TRANSLATE(TEX_INFO(info->,aspectRatio)),
166+ G3_ASPECT_TRANSLATE(TEX_INFO((*info),aspectRatio)),
167 info->format,
168 evenOdd) >> 3;
169 GR_SET(tmuChip, hw, texBaseAddr38, baseAddress);
170--- GlideV2/glide3x/cvg/glide3/src/distate.c.orig 2000-04-20 23:26:39.000000000 +0200
171+++ GlideV2/glide3x/cvg/glide3/src/distate.c 2012-01-09 16:50:12.976397585 +0100
172@@ -166,25 +166,25 @@
173 */
174
175 #define STOREARG(function, arg) \
176-gc->state.stateArgs.##function##Args.arg = arg
177+gc->state.stateArgs.function##Args.arg = arg
178
179 #define LOADARG(function, arg) \
180-gc->state.stateArgs.##function##Args.arg
181+gc->state.stateArgs.function##Args.arg
182
183 #define INVALIDATE(regset) \
184-gc->state.invalid |= ##regset##BIT
185+gc->state.invalid |= regset##BIT
186
187 #define NOTVALID(regset) \
188-(gc->state.invalid & ##regset##BIT)
189+(gc->state.invalid & regset##BIT)
190
191 #define SETVALID(regset) \
192-(gc->state.invalid &= ~(##regset##BIT))
193+(gc->state.invalid &= ~(regset##BIT))
194
195 #define ENABLEMODE(mode) \
196-gc->state.grEnableArgs.##mode## = GR_MODE_ENABLE;
197+gc->state.grEnableArgs.mode = GR_MODE_ENABLE;
198
199 #define DISABLEMODE(mode) \
200-gc->state.grEnableArgs.##mode## = GR_MODE_DISABLE;
201+gc->state.grEnableArgs.mode = GR_MODE_DISABLE;
202
203 /*-------------------------------------------------------------------
204 Function: grAlphaBlendFunction
Glide runtime for 3Dfx Voodoo2 boards
This page took 0.085231 seconds and 4 git commands to generate.