]>
Commit | Line | Data |
---|---|---|
976e6574 PG |
1 | --- xc/lib/GL/mesa/src/drv/tdfx/tdfx_context.c.tdfx-fix-compiler-warnings Sat Feb 16 00:51:27 2002 |
2 | +++ xc/lib/GL/mesa/src/drv/tdfx/tdfx_context.c Sun Feb 17 06:26:13 2002 | |
3 | @@ -353,7 +353,7 @@ | |
4 | FxI32 result[2]; | |
5 | ||
6 | if ( TDFX_DEBUG & DEBUG_VERBOSE_DRI ) { | |
7 | - fprintf( stderr, "%s( %p )\n", __FUNCTION__, fxMesa ); | |
8 | + fprintf( stderr, "%s( %p )\n", __FUNCTION__, (void *) fxMesa ); | |
9 | } | |
10 | ||
11 | #if DEBUG_LOCKING | |
12 | @@ -457,7 +457,7 @@ | |
13 | void tdfxDestroyContext( tdfxContextPtr fxMesa ) | |
14 | { | |
15 | if ( TDFX_DEBUG & DEBUG_VERBOSE_DRI ) { | |
16 | - fprintf( stderr, "%s( %p )\n", __FUNCTION__, fxMesa ); | |
17 | + fprintf( stderr, "%s( %p )\n", __FUNCTION__, (void *) fxMesa ); | |
18 | } | |
19 | ||
20 | if ( fxMesa ) { | |
21 | @@ -547,8 +547,8 @@ | |
22 | } | |
23 | } | |
24 | ||
25 | -#define GET_FUNCTION(PTR, NAME) \ | |
26 | - tmesa->Glide.PTR = dlsym(libHandle, NAME); \ | |
27 | +#define GET_FUNCTION(PTR, NAME, TYPEOF) \ | |
28 | + tmesa->Glide.PTR = (TYPEOF) dlsym(libHandle, NAME); \ | |
29 | if (!tmesa->Glide.PTR) { \ | |
30 | char err[1000]; \ | |
31 | sprintf(err, "couldn't find Glide function %s in %s.", \ | |
32 | @@ -556,111 +556,195 @@ | |
33 | __driMesaMessage(err); \ | |
34 | } | |
35 | ||
36 | - GET_FUNCTION(grDrawPoint, "grDrawPoint"); | |
37 | - GET_FUNCTION(grDrawLine, "grDrawLine"); | |
38 | - GET_FUNCTION(grDrawTriangle, "grDrawTriangle"); | |
39 | - GET_FUNCTION(grVertexLayout, "grVertexLayout"); | |
40 | - GET_FUNCTION(grDrawVertexArray, "grDrawVertexArray"); | |
41 | - GET_FUNCTION(grDrawVertexArrayContiguous, "grDrawVertexArrayContiguous"); | |
42 | - GET_FUNCTION(grBufferClear, "grBufferClear"); | |
43 | - /*GET_FUNCTION(grBufferSwap, "grBufferSwap");*/ | |
44 | - GET_FUNCTION(grRenderBuffer, "grRenderBuffer"); | |
45 | - GET_FUNCTION(grErrorSetCallback, "grErrorSetCallback"); | |
46 | - GET_FUNCTION(grFinish, "grFinish"); | |
47 | - GET_FUNCTION(grFlush, "grFlush"); | |
48 | - GET_FUNCTION(grSstWinOpen, "grSstWinOpen"); | |
49 | - GET_FUNCTION(grSstWinClose, "grSstWinClose"); | |
50 | + GET_FUNCTION(grDrawPoint, "grDrawPoint", void (*)(const void *)); | |
51 | + GET_FUNCTION(grDrawLine, "grDrawLine", void (*)(const void *, const void * )); | |
52 | + GET_FUNCTION(grDrawTriangle, "grDrawTriangle", ( const void *a, const void *b, const void *c )); | |
53 | + GET_FUNCTION(grVertexLayout, "grVertexLayout", (FxU32 param, FxI32 offset, FxU32 mode)); | |
54 | + GET_FUNCTION(grDrawVertexArray, "grDrawVertexArray", (FxU32 mode, FxU32 Count, void *pointers)); | |
55 | + GET_FUNCTION(grDrawVertexArrayContiguous, "grDrawVertexArrayContiguous", | |
56 | + (FxU32 mode, FxU32 Count, void *pointers, FxU32 stride)); | |
57 | + GET_FUNCTION(grBufferClear, "grBufferClear", ( GrColor_t color, GrAlpha_t alpha, FxU32 depth )); | |
58 | + /*GET_FUNCTION(grBufferSwap, "grBufferSwap", ( FxU32 swap_interval ));*/ | |
59 | + GET_FUNCTION(grRenderBuffer, "grRenderBuffer", ( GrBuffer_t buffer )); | |
60 | + GET_FUNCTION(grErrorSetCallback, "grErrorSetCallback", ( GrErrorCallbackFnc_t fnc )); | |
61 | + GET_FUNCTION(grFinish, "grFinish", (void)); | |
62 | + GET_FUNCTION(grFlush, "grFlush", (void)); | |
63 | + GET_FUNCTION(grSstWinOpen, "grSstWinOpen", (FxU32 hWnd, | |
64 | + GrScreenResolution_t screen_resolution, | |
65 | + GrScreenRefresh_t refresh_rate, | |
66 | + GrColorFormat_t color_format, | |
67 | + GrOriginLocation_t origin_location, | |
68 | + int nColBuffers, | |
69 | + int nAuxBuffers)); | |
70 | + GET_FUNCTION(grSstWinClose, "grSstWinClose", ( GrContext_t context )); | |
71 | #if 0 | |
72 | /* Not in V3 lib, and not used anyway. */ | |
73 | - GET_FUNCTION(grSetNumPendingBuffers, "grSetNumPendingBuffers"); | |
74 | + GET_FUNCTION(grSetNumPendingBuffers, "grSetNumPendingBuffers", (FxI32 NumPendingBuffers)); | |
75 | #endif | |
76 | - GET_FUNCTION(grSelectContext, "grSelectContext"); | |
77 | - GET_FUNCTION(grSstOrigin, "grSstOrigin"); | |
78 | - GET_FUNCTION(grSstSelect, "grSstSelect"); | |
79 | - GET_FUNCTION(grAlphaBlendFunction, "grAlphaBlendFunction"); | |
80 | - GET_FUNCTION(grAlphaCombine, "grAlphaCombine"); | |
81 | - GET_FUNCTION(grAlphaControlsITRGBLighting, "grAlphaControlsITRGBLighting"); | |
82 | - GET_FUNCTION(grAlphaTestFunction, "grAlphaTestFunction"); | |
83 | - GET_FUNCTION(grAlphaTestReferenceValue, "grAlphaTestReferenceValue"); | |
84 | - GET_FUNCTION(grChromakeyMode, "grChromakeyMode"); | |
85 | - GET_FUNCTION(grChromakeyValue, "grChromakeyValue"); | |
86 | - GET_FUNCTION(grClipWindow, "grClipWindow"); | |
87 | - GET_FUNCTION(grColorCombine, "grColorCombine"); | |
88 | - GET_FUNCTION(grColorMask, "grColorMask"); | |
89 | - GET_FUNCTION(grCullMode, "grCullMode"); | |
90 | - GET_FUNCTION(grConstantColorValue, "grConstantColorValue"); | |
91 | - GET_FUNCTION(grDepthBiasLevel, "grDepthBiasLevel"); | |
92 | - GET_FUNCTION(grDepthBufferFunction, "grDepthBufferFunction"); | |
93 | - GET_FUNCTION(grDepthBufferMode, "grDepthBufferMode"); | |
94 | - GET_FUNCTION(grDepthMask, "grDepthMask"); | |
95 | - GET_FUNCTION(grDisableAllEffects, "grDisableAllEffects"); | |
96 | - GET_FUNCTION(grDitherMode, "grDitherMode"); | |
97 | - GET_FUNCTION(grFogColorValue, "grFogColorValue"); | |
98 | - GET_FUNCTION(grFogMode, "grFogMode"); | |
99 | - GET_FUNCTION(grFogTable, "grFogTable"); | |
100 | - GET_FUNCTION(grLoadGammaTable, "grLoadGammaTable"); | |
101 | - GET_FUNCTION(grSplash, "grSplash"); | |
102 | - GET_FUNCTION(grGet, "grGet"); | |
103 | - GET_FUNCTION(grGetString, "grGetString"); | |
104 | - GET_FUNCTION(grQueryResolutions, "grQueryResolutions"); | |
105 | - GET_FUNCTION(grReset, "grReset"); | |
106 | - GET_FUNCTION(grGetProcAddress, "grGetProcAddress"); | |
107 | - GET_FUNCTION(grEnable, "grEnable"); | |
108 | - GET_FUNCTION(grDisable, "grDisable"); | |
109 | - GET_FUNCTION(grCoordinateSpace, "grCoordinateSpace"); | |
110 | - GET_FUNCTION(grDepthRange, "grDepthRange"); | |
111 | + GET_FUNCTION(grSelectContext, "grSelectContext", ( GrContext_t context )); | |
112 | + GET_FUNCTION(grSstOrigin, "grSstOrigin", (GrOriginLocation_t origin)); | |
113 | + GET_FUNCTION(grSstSelect, "grSstSelect", ( int which_sst )); | |
114 | + GET_FUNCTION(grAlphaBlendFunction, "grAlphaBlendFunction", | |
115 | + (GrAlphaBlendFnc_t rgb_sf, | |
116 | + GrAlphaBlendFnc_t rgb_df, | |
117 | + GrAlphaBlendFnc_t alpha_sf, | |
118 | + GrAlphaBlendFnc_t alpha_df)); | |
119 | + GET_FUNCTION(grAlphaCombine, "grAlphaCombine", | |
120 | + (GrCombineFunction_t function, | |
121 | + GrCombineFactor_t factor, | |
122 | + GrCombineLocal_t local, GrCombineOther_t other, | |
123 | + FxBool invert)); | |
124 | + GET_FUNCTION(grAlphaControlsITRGBLighting, "grAlphaControlsITRGBLighting", | |
125 | + ( FxBool enable )); | |
126 | + GET_FUNCTION(grAlphaTestFunction, "grAlphaTestFunction", ( GrCmpFnc_t function )); | |
127 | + GET_FUNCTION(grAlphaTestReferenceValue, "grAlphaTestReferenceValue", | |
128 | + ( GrAlpha_t value )); | |
129 | + GET_FUNCTION(grChromakeyMode, "grChromakeyMode", ( GrChromakeyMode_t mode )); | |
130 | + GET_FUNCTION(grChromakeyValue, "grChromakeyValue", ( GrColor_t value )); | |
131 | + GET_FUNCTION(grClipWindow, "grClipWindow", ( FxU32 minx, FxU32 miny, FxU32 maxx, FxU32 maxy )); | |
132 | + GET_FUNCTION(grColorCombine, "grColorCombine", | |
133 | + ( GrCombineFunction_t function, | |
134 | + GrCombineFactor_t factor, | |
135 | + GrCombineLocal_t local, | |
136 | + GrCombineOther_t other, | |
137 | + FxBool invert )); | |
138 | + GET_FUNCTION(grColorMask, "grColorMask", ( FxBool rgb, FxBool a )); | |
139 | + GET_FUNCTION(grCullMode, "grCullMode", ( GrCullMode_t mode )); | |
140 | + GET_FUNCTION(grConstantColorValue, "grConstantColorValue", ( GrColor_t value )); | |
141 | + GET_FUNCTION(grDepthBiasLevel, "grDepthBiasLevel", ( FxI32 level )); | |
142 | + GET_FUNCTION(grDepthBufferFunction, "grDepthBufferFunction", ( GrCmpFnc_t function )); | |
143 | + GET_FUNCTION(grDepthBufferMode, "grDepthBufferMode", ( GrDepthBufferMode_t mode )); | |
144 | + GET_FUNCTION(grDepthMask, "grDepthMask", ( FxBool mask )); | |
145 | + GET_FUNCTION(grDisableAllEffects, "grDisableAllEffects", ( void )); | |
146 | + GET_FUNCTION(grDitherMode, "grDitherMode", ( GrDitherMode_t mode )); | |
147 | + GET_FUNCTION(grFogColorValue, "grFogColorValue", ( GrColor_t fogcolor )); | |
148 | + GET_FUNCTION(grFogMode, "grFogMode", ( GrFogMode_t mode )); | |
149 | + GET_FUNCTION(grFogTable, "grFogTable", ( const GrFog_t ft[] )); | |
150 | + GET_FUNCTION(grLoadGammaTable, "grLoadGammaTable", ( FxU32 nentries, FxU32 *red, FxU32 *green, FxU32 *blue)); | |
151 | + GET_FUNCTION(grSplash, "grSplash", (float x, float y, float width, float height, FxU32 frame)); | |
152 | + GET_FUNCTION(grGet, "grGet", ( FxU32 pname, FxU32 plength, FxI32 *params )); | |
153 | + GET_FUNCTION(grGetString, "grGetString", ( FxU32 pname )); | |
154 | + GET_FUNCTION(grQueryResolutions, "grQueryResolutions", | |
155 | + ( const GrResolution *resTemplate, | |
156 | + GrResolution *output )); | |
157 | + GET_FUNCTION(grReset, "grReset", ( FxU32 what )); | |
158 | + GET_FUNCTION(grGetProcAddress, "grGetProcAddress", ( char *procName )); | |
159 | + GET_FUNCTION(grEnable, "grEnable", ( GrEnableMode_t mode )); | |
160 | + GET_FUNCTION(grDisable, "grDisable", ( GrEnableMode_t mode )); | |
161 | + GET_FUNCTION(grCoordinateSpace, "grCoordinateSpace", ( GrCoordinateSpaceMode_t mode )); | |
162 | + GET_FUNCTION(grDepthRange, "grDepthRange", ( FxFloat n, FxFloat f )); | |
163 | #if defined(__linux__) || defined(__FreeBSD__) | |
164 | - GET_FUNCTION(grStippleMode, "grStippleMode"); | |
165 | - GET_FUNCTION(grStipplePattern, "grStipplePattern"); | |
166 | + GET_FUNCTION(grStippleMode, "grStippleMode", ( GrStippleMode_t mode )); | |
167 | + GET_FUNCTION(grStipplePattern, "grStipplePattern", ( GrStipplePattern_t mode )); | |
168 | #endif /* __linux__ || __FreeBSD__ */ | |
169 | - GET_FUNCTION(grViewport, "grViewport"); | |
170 | - GET_FUNCTION(grTexCalcMemRequired, "grTexCalcMemRequired"); | |
171 | - GET_FUNCTION(grTexTextureMemRequired, "grTexTextureMemRequired"); | |
172 | - GET_FUNCTION(grTexMinAddress, "grTexMinAddress"); | |
173 | - GET_FUNCTION(grTexMaxAddress, "grTexMaxAddress"); | |
174 | - GET_FUNCTION(grTexNCCTable, "grTexNCCTable"); | |
175 | - GET_FUNCTION(grTexSource, "grTexSource"); | |
176 | - GET_FUNCTION(grTexClampMode, "grTexClampMode"); | |
177 | - GET_FUNCTION(grTexCombine, "grTexCombine"); | |
178 | - GET_FUNCTION(grTexDetailControl, "grTexDetailControl"); | |
179 | - GET_FUNCTION(grTexFilterMode, "grTexFilterMode"); | |
180 | - GET_FUNCTION(grTexLodBiasValue, "grTexLodBiasValue"); | |
181 | - GET_FUNCTION(grTexDownloadMipMap, "grTexDownloadMipMap"); | |
182 | - GET_FUNCTION(grTexDownloadMipMapLevel, "grTexDownloadMipMapLevel"); | |
183 | - GET_FUNCTION(grTexDownloadMipMapLevelPartial, "grTexDownloadMipMapLevelPartial"); | |
184 | - GET_FUNCTION(grTexDownloadTable, "grTexDownloadTable"); | |
185 | - GET_FUNCTION(grTexDownloadTablePartial, "grTexDownloadTablePartial"); | |
186 | - GET_FUNCTION(grTexMipMapMode, "grTexMipMapMode"); | |
187 | - GET_FUNCTION(grTexMultibase, "grTexMultibase"); | |
188 | - GET_FUNCTION(grTexMultibaseAddress, "grTexMultibaseAddress"); | |
189 | - GET_FUNCTION(grLfbLock, "grLfbLock"); | |
190 | - GET_FUNCTION(grLfbUnlock, "grLfbUnlock"); | |
191 | - GET_FUNCTION(grLfbConstantAlpha, "grLfbConstantAlpha"); | |
192 | - GET_FUNCTION(grLfbConstantDepth, "grLfbConstantDepth"); | |
193 | - GET_FUNCTION(grLfbWriteColorSwizzle, "grLfbWriteColorSwizzle"); | |
194 | - GET_FUNCTION(grLfbWriteColorFormat, "grLfbWriteColorFormat"); | |
195 | - GET_FUNCTION(grLfbWriteRegion, "grLfbWriteRegion"); | |
196 | - GET_FUNCTION(grLfbReadRegion, "grLfbReadRegion"); | |
197 | - GET_FUNCTION(grGlideInit, "grGlideInit"); | |
198 | - GET_FUNCTION(grGlideShutdown, "grGlideShutdown"); | |
199 | - GET_FUNCTION(grGlideGetState, "grGlideGetState"); | |
200 | - GET_FUNCTION(grGlideSetState, "grGlideSetState"); | |
201 | - GET_FUNCTION(grGlideGetVertexLayout, "grGlideGetVertexLayout"); | |
202 | - GET_FUNCTION(grGlideSetVertexLayout, "grGlideSetVertexLayout"); | |
203 | + GET_FUNCTION(grViewport, "grViewport", ( FxI32 x, FxI32 y, FxI32 width, FxI32 height )); | |
204 | + GET_FUNCTION(grTexCalcMemRequired, "grTexCalcMemRequired", | |
205 | + (GrLOD_t lodmin, GrLOD_t lodmax, | |
206 | + GrAspectRatio_t aspect, GrTextureFormat_t fmt)); | |
207 | + GET_FUNCTION(grTexTextureMemRequired, "grTexTextureMemRequired", | |
208 | + ( FxU32 evenOdd, GrTexInfo *info )); | |
209 | + GET_FUNCTION(grTexMinAddress, "grTexMinAddress", ( GrChipID_t tmu )); | |
210 | + GET_FUNCTION(grTexMaxAddress, "grTexMaxAddress", ( GrChipID_t tmu )); | |
211 | + GET_FUNCTION(grTexNCCTable, "grTexNCCTable", ( GrNCCTable_t table )); | |
212 | + GET_FUNCTION(grTexSource, "grTexSource", | |
213 | + ( GrChipID_t tmu, FxU32 startAddress, | |
214 | + FxU32 evenOdd, GrTexInfo *info )); | |
215 | + GET_FUNCTION(grTexClampMode, "grTexClampMode", ( GrChipID_t tmu, | |
216 | + GrTextureClampMode_t s_clampmode, | |
217 | + GrTextureClampMode_t t_clampmode )); | |
218 | + GET_FUNCTION(grTexCombine, "grTexCombine", ( GrChipID_t tmu, | |
219 | + GrCombineFunction_t rgb_function, | |
220 | + GrCombineFactor_t rgb_factor, | |
221 | + GrCombineFunction_t alpha_function, | |
222 | + GrCombineFactor_t alpha_factor, | |
223 | + FxBool rgb_invert, | |
224 | + FxBool alpha_invert)); | |
225 | + GET_FUNCTION(grTexDetailControl, "grTexDetailControl", | |
226 | + ( GrChipID_t tmu, int lod_bias, | |
227 | + FxU8 detail_scale, float detail_max )); | |
228 | + GET_FUNCTION(grTexFilterMode, "grTexFilterMode", ( GrChipID_t tmu, | |
229 | + GrTextureFilterMode_t minfilter_mode, | |
230 | + GrTextureFilterMode_t magfilter_mode )); | |
231 | + GET_FUNCTION(grTexLodBiasValue, "grTexLodBiasValue", (GrChipID_t tmu, float bias )); | |
232 | + GET_FUNCTION(grTexDownloadMipMap, "grTexDownloadMipMap", | |
233 | + ( GrChipID_t tmu, FxU32 startAddress, | |
234 | + FxU32 evenOdd, GrTexInfo *info )); | |
235 | + GET_FUNCTION(grTexDownloadMipMapLevel, "grTexDownloadMipMapLevel", | |
236 | + ( GrChipID_t tmu, | |
237 | + FxU32 startAddress, | |
238 | + GrLOD_t thisLod, | |
239 | + GrLOD_t largeLod, | |
240 | + GrAspectRatio_t aspectRatio, | |
241 | + GrTextureFormat_t format, | |
242 | + FxU32 evenOdd, | |
243 | + void *data )); | |
244 | + GET_FUNCTION(grTexDownloadMipMapLevelPartial, "grTexDownloadMipMapLevelPartial", | |
245 | + ( GrChipID_t tmu, | |
246 | + FxU32 startAddress, | |
247 | + GrLOD_t thisLod, | |
248 | + GrLOD_t largeLod, | |
249 | + GrAspectRatio_t aspectRatio, | |
250 | + GrTextureFormat_t format, | |
251 | + FxU32 evenOdd, | |
252 | + void *data, | |
253 | + int start, | |
254 | + int end )); | |
255 | + GET_FUNCTION(grTexDownloadTable, "grTexDownloadTable", ( GrTexTable_t type, void *data )); | |
256 | + GET_FUNCTION(grTexDownloadTablePartial, "grTexDownloadTablePartial", | |
257 | + ( GrTexTable_t type, void *data, int start, int end )); | |
258 | + GET_FUNCTION(grTexMipMapMode, "grTexMipMapMode", ( GrChipID_t tmu, | |
259 | + GrMipMapMode_t mode, FxBool lodBlend )); | |
260 | + GET_FUNCTION(grTexMultibase, "grTexMultibase", ( GrChipID_t tmu, FxBool enable )); | |
261 | + GET_FUNCTION(grTexMultibaseAddress, "grTexMultibaseAddress", | |
262 | + ( GrChipID_t tmu, FxBool enable )); | |
263 | + GET_FUNCTION(grLfbLock, "grLfbLock", ( GrLock_t type, GrBuffer_t buffer, | |
264 | + GrLfbWriteMode_t writeMode, | |
265 | + GrOriginLocation_t origin, FxBool pixelPipeline, | |
266 | + GrLfbInfo_t *info )); | |
267 | + GET_FUNCTION(grLfbUnlock, "grLfbUnlock", ( GrLock_t type, GrBuffer_t buffer )); | |
268 | + GET_FUNCTION(grLfbConstantAlpha, "grLfbConstantAlpha", ( GrAlpha_t alpha )); | |
269 | + GET_FUNCTION(grLfbConstantDepth, "grLfbConstantDepth", ( FxU32 depth )); | |
270 | + GET_FUNCTION(grLfbWriteColorSwizzle, "grLfbWriteColorSwizzle", (FxBool swizzleBytes, FxBool swapWords)); | |
271 | + GET_FUNCTION(grLfbWriteColorFormat, "grLfbWriteColorFormat", (GrColorFormat_t colorFormat)); | |
272 | + GET_FUNCTION(grLfbWriteRegion, "grLfbWriteRegion", | |
273 | + ( GrBuffer_t dst_buffer, | |
274 | + FxU32 dst_x, FxU32 dst_y, | |
275 | + GrLfbSrcFmt_t src_format, | |
276 | + FxU32 src_width, FxU32 src_height, | |
277 | + FxBool pixelPipeline, | |
278 | + FxI32 src_stride, void *src_data )); | |
279 | + GET_FUNCTION(grLfbReadRegion, "grLfbReadRegion", | |
280 | + ( GrBuffer_t src_buffer, | |
281 | + FxU32 src_x, FxU32 src_y, | |
282 | + FxU32 src_width, FxU32 src_height, | |
283 | + FxU32 dst_stride, void *dst_data )); | |
284 | + GET_FUNCTION(grGlideInit, "grGlideInit", ( void )); | |
285 | + GET_FUNCTION(grGlideShutdown, "grGlideShutdown", ( void )); | |
286 | + GET_FUNCTION(grGlideGetState, "grGlideGetState", ( void *state )); | |
287 | + GET_FUNCTION(grGlideSetState, "grGlideSetState", ( const void *state )); | |
288 | + GET_FUNCTION(grGlideGetVertexLayout, "grGlideGetVertexLayout", ( void *layout )); | |
289 | + GET_FUNCTION(grGlideSetVertexLayout, "grGlideSetVertexLayout", ( const void *layout )); | |
290 | ||
291 | /* Glide utility functions */ | |
292 | - GET_FUNCTION(guFogGenerateExp, "guFogGenerateExp"); | |
293 | - GET_FUNCTION(guFogGenerateExp2, "guFogGenerateExp2"); | |
294 | - GET_FUNCTION(guFogGenerateLinear, "guFogGenerateLinear"); | |
295 | + GET_FUNCTION(guFogGenerateExp, "guFogGenerateExp", ( GrFog_t *fogtable, float density )); | |
296 | + GET_FUNCTION(guFogGenerateExp2, "guFogGenerateExp2", ( GrFog_t *fogtable, float density )); | |
297 | + GET_FUNCTION(guFogGenerateLinear, "guFogGenerateLinear", (GrFog_t *fogtable, float nearZ, float farZ )); | |
298 | ||
299 | /* DRI functions */ | |
300 | - GET_FUNCTION(grDRIOpen, "grDRIOpen"); | |
301 | - GET_FUNCTION(grDRIPosition, "grDRIPosition"); | |
302 | - /*GET_FUNCTION(grDRILostContext, "grDRILostContext");*/ | |
303 | - GET_FUNCTION(grDRIImportFifo, "grDRIImportFifo"); | |
304 | - GET_FUNCTION(grDRIInvalidateAll, "grDRIInvalidateAll"); | |
305 | - GET_FUNCTION(grDRIResetSAREA, "grDRIResetSAREA"); | |
306 | - GET_FUNCTION(grDRIBufferSwap, "grDRIBufferSwap"); | |
307 | + GET_FUNCTION(grDRIOpen, "grDRIOpen", ( char *pFB, char *pRegs, int deviceID, | |
308 | + int width, int height, | |
309 | + int mem, int cpp, int stride, | |
310 | + int fifoOffset, int fifoSize, | |
311 | + int fbOffset, int backOffset, int depthOffset, | |
312 | + int textureOffset, int textureSize, | |
313 | + volatile int *fifoPtr, volatile int *fifoRead )); | |
314 | + GET_FUNCTION(grDRIPosition, "grDRIPosition", ( int x, int y, int w, int h, | |
315 | + int numClip, XF86DRIClipRectPtr pClip )); | |
316 | + /*GET_FUNCTION(grDRILostContext, "grDRILostContext", ( void ));*/ | |
317 | + GET_FUNCTION(grDRIImportFifo, "grDRIImportFifo", ( int fifoPtr, int fifoRead )); | |
318 | + GET_FUNCTION(grDRIInvalidateAll, "grDRIInvalidateAll", ( void )); | |
319 | + GET_FUNCTION(grDRIResetSAREA, "grDRIResetSAREA", ( void )); | |
320 | + GET_FUNCTION(grDRIBufferSwap, "grDRIBufferSwap", ( FxU32 swapInterval )); | |
321 | ||
322 | /* | |
323 | * Extension functions: | |
324 | @@ -668,22 +752,24 @@ | |
325 | * not found. | |
326 | */ | |
327 | /* PIXEXT extension */ | |
328 | - tmesa->Glide.grStencilFunc = dlsym(libHandle, "grStencilFunc"); | |
329 | - tmesa->Glide.grStencilMask = dlsym(libHandle, "grStencilMask"); | |
330 | - tmesa->Glide.grStencilOp = dlsym(libHandle, "grStencilOp"); | |
331 | - tmesa->Glide.grBufferClearExt = dlsym(libHandle, "grBufferClearExt"); | |
332 | - tmesa->Glide.grColorMaskExt = dlsym(libHandle, "grColorMaskExt"); | |
333 | + tmesa->Glide.grStencilFunc = (void (*)( GrCmpFnc_t func, GrStencil_t ref, GrStencil_t mask )) dlsym(libHandle, "grStencilFunc"); | |
334 | + tmesa->Glide.grStencilMask = (void (*)( GrStencil_t mask )) dlsym(libHandle, "grStencilMask"); | |
335 | + tmesa->Glide.grStencilOp = (void (*)( GrStencilOp_t fail, GrStencilOp_t zfail, | |
336 | + GrStencilOp_t zpass )) dlsym(libHandle, "grStencilOp"); | |
337 | + tmesa->Glide.grBufferClearExt = (void (*)( GrColor_t color, GrAlpha_t alpha, | |
338 | + FxU32 depth, GrStencil_t stencil )) dlsym(libHandle, "grBufferClearExt"); | |
339 | + tmesa->Glide.grColorMaskExt = (void (*)( FxBool, FxBool, FxBool, FxBool )) dlsym(libHandle, "grColorMaskExt"); | |
340 | /* COMBINE extension */ | |
341 | - tmesa->Glide.grColorCombineExt = dlsym(libHandle, "grColorCombineExt"); | |
342 | - tmesa->Glide.grTexColorCombineExt = dlsym(libHandle, "grTexColorCombineExt"); | |
343 | - tmesa->Glide.grAlphaCombineExt = dlsym(libHandle, "grAlphaCombineExt"); | |
344 | - tmesa->Glide.grTexAlphaCombineExt = dlsym(libHandle, "grTexAlphaCombineExt"); | |
345 | - tmesa->Glide.grAlphaBlendFunctionExt = dlsym(libHandle, "grAlphaBlendFunctionExt"); | |
346 | - tmesa->Glide.grConstantColorValueExt = dlsym(libHandle, "grConstantColorValueExt"); | |
347 | + tmesa->Glide.grColorCombineExt = (void (*)) dlsym(libHandle, "grColorCombineExt"); | |
348 | + tmesa->Glide.grTexColorCombineExt = (void (*)) dlsym(libHandle, "grTexColorCombineExt"); | |
349 | + tmesa->Glide.grAlphaCombineExt = (void (*)) dlsym(libHandle, "grAlphaCombineExt"); | |
350 | + tmesa->Glide.grTexAlphaCombineExt = (void (*)) dlsym(libHandle, "grTexAlphaCombineExt"); | |
351 | + tmesa->Glide.grAlphaBlendFunctionExt = (void (*)) dlsym(libHandle, "grAlphaBlendFunctionExt"); | |
352 | + tmesa->Glide.grConstantColorValueExt = (void (*)) dlsym(libHandle, "grConstantColorValueExt"); | |
353 | /* Texus 2 */ | |
354 | - tmesa->Glide.txImgQuantize = dlsym(libHandle, "txImgQuantize"); | |
355 | - tmesa->Glide.txImgDequantizeFXT1 = dlsym(libHandle, "_txImgDequantizeFXT1"); | |
356 | - tmesa->Glide.txErrorSetCallback = dlsym(libHandle, "txErrorSetCallback"); | |
357 | + tmesa->Glide.txImgQuantize = (void (*)) dlsym(libHandle, "txImgQuantize"); | |
358 | + tmesa->Glide.txImgDequantizeFXT1 = (void (*)) dlsym(libHandle, "_txImgDequantizeFXT1"); | |
359 | + tmesa->Glide.txErrorSetCallback = (void (*)) dlsym(libHandle, "txErrorSetCallback"); | |
360 | ||
361 | return GL_TRUE; | |
362 | } |