| blob | 8d6e5122a4e2c524207ec8945901ced1b3f37c12 |
1 Index: DerelictVorbis/derelict/ogg/vorbiscodec.d
2 ===================================================================
3 --- DerelictVorbis/derelict/ogg/vorbiscodec.d (revision 318)
4 +++ DerelictVorbis/derelict/ogg/vorbiscodec.d (working copy)
5 @@ -107,90 +107,86 @@
6 extern (C)
7 {
8 // Vorbis PRIMITIVES: general
9 - typedef void function(vorbis_info *vi) pfvorbis_info_init;
10 - typedef void function(vorbis_info *vi) pfvorbis_info_clear;
11 - typedef int function(vorbis_info *vi,int zo) pfvorbis_info_blocksize;
12 - typedef void function(vorbis_comment *vc) pfvorbis_comment_init;
13 - typedef void function(vorbis_comment *vc, byte *comment) pfvorbis_comment_add;
14 - typedef void function(vorbis_comment *vc, byte *tag, byte *contents) pfvorbis_comment_add_tag;
15 - typedef byte* function(vorbis_comment *vc, byte *tag, int count) pfvorbis_comment_query;
16 - typedef int function(vorbis_comment *vc, byte *tag) pfvorbis_comment_query_count;
17 - typedef void function(vorbis_comment *vc) pfvorbis_comment_clear;
18 + alias void function(vorbis_info *vi) pfvorbis_info_init;
19 + alias void function(vorbis_info *vi) pfvorbis_info_clear;
20 + alias int function(vorbis_info *vi,int zo) pfvorbis_info_blocksize;
21 + alias void function(vorbis_comment *vc) pfvorbis_comment_init;
22 + alias void function(vorbis_comment *vc, byte *comment) pfvorbis_comment_add;
23 + alias void function(vorbis_comment *vc, byte *tag, byte *contents) pfvorbis_comment_add_tag;
24 + alias byte* function(vorbis_comment *vc, byte *tag, int count) pfvorbis_comment_query;
25 + alias int function(vorbis_comment *vc, byte *tag) pfvorbis_comment_query_count;
26 + alias void function(vorbis_comment *vc) pfvorbis_comment_clear;
28 - typedef int function(vorbis_dsp_state *v, vorbis_block *vb) pfvorbis_block_init;
29 - typedef int function(vorbis_block *vb) pfvorbis_block_clear;
30 - typedef void function(vorbis_dsp_state *v) pfvorbis_dsp_clear;
31 - typedef double function(vorbis_dsp_state *v, ogg_int64_t granulepos) pfvorbis_granule_time;
32 + alias int function(vorbis_dsp_state *v, vorbis_block *vb) pfvorbis_block_init;
33 + alias int function(vorbis_block *vb) pfvorbis_block_clear;
34 + alias void function(vorbis_dsp_state *v) pfvorbis_dsp_clear;
35 + alias double function(vorbis_dsp_state *v, ogg_int64_t granulepos) pfvorbis_granule_time;
37 - pfvorbis_info_init vorbis_info_init;
38 - pfvorbis_info_clear vorbis_info_clear;
39 - pfvorbis_info_blocksize vorbis_info_blocksize;
40 - pfvorbis_comment_init vorbis_comment_init;
41 - pfvorbis_comment_add vorbis_comment_add;
42 - pfvorbis_comment_add_tag vorbis_comment_add_tag;
43 - pfvorbis_comment_query vorbis_comment_query;
44 - pfvorbis_comment_query_count vorbis_comment_query_count;
45 - pfvorbis_comment_clear vorbis_comment_clear;
46 - pfvorbis_block_init vorbis_block_init;
47 - pfvorbis_block_clear vorbis_block_clear;
48 - pfvorbis_dsp_clear vorbis_dsp_clear;
49 - pfvorbis_granule_time vorbis_granule_time;
51 // Vorbis PRIMITIVES: analysis/DSP layer
52 - typedef int function(vorbis_dsp_state *v,vorbis_info *vi) pfvorbis_analysis_init;
53 - typedef int function(vorbis_comment *vc, ogg_packet *op) pfvorbis_commentheader_out;
54 - typedef int function(vorbis_dsp_state *v, vorbis_comment *vc, ogg_packet *op, ogg_packet *op_comm, ogg_packet *op_code) pfvorbis_analysis_headerout;
55 - typedef float** function(vorbis_dsp_state *v,int vals) pfvorbis_analysis_buffer;
56 - typedef int function(vorbis_dsp_state *v,int vals) pfvorbis_analysis_wrote;
57 - typedef int function(vorbis_dsp_state *v,vorbis_block *vb) pfvorbis_analysis_blockout;
58 - typedef int function(vorbis_block *vb,ogg_packet *op) pfvorbis_analysis;
59 - pfvorbis_analysis_init vorbis_analysis_init;
60 - pfvorbis_commentheader_out vorbis_commentheader_out;
61 - pfvorbis_analysis_headerout vorbis_analysis_headerout;
62 - pfvorbis_analysis_buffer vorbis_analysis_buffer;
63 - pfvorbis_analysis_wrote vorbis_analysis_wrote;
64 - pfvorbis_analysis_blockout vorbis_analysis_blockout;
65 - pfvorbis_analysis vorbis_analysis;
66 + alias int function(vorbis_dsp_state *v,vorbis_info *vi) pfvorbis_analysis_init;
67 + alias int function(vorbis_comment *vc, ogg_packet *op) pfvorbis_commentheader_out;
68 + alias int function(vorbis_dsp_state *v, vorbis_comment *vc, ogg_packet *op, ogg_packet *op_comm, ogg_packet *op_code) pfvorbis_analysis_headerout;
69 + alias float** function(vorbis_dsp_state *v,int vals) pfvorbis_analysis_buffer;
70 + alias int function(vorbis_dsp_state *v,int vals) pfvorbis_analysis_wrote;
71 + alias int function(vorbis_dsp_state *v,vorbis_block *vb) pfvorbis_analysis_blockout;
72 + alias int function(vorbis_block *vb,ogg_packet *op) pfvorbis_analysis;
74 - typedef int function(vorbis_block *vb) pfvorbis_bitrate_addblock;
75 - typedef int function(vorbis_dsp_state *vd, ogg_packet *op) pfvorbis_bitrate_flushpacket;
76 - pfvorbis_bitrate_addblock vorbis_bitrate_addblock;
77 - pfvorbis_bitrate_flushpacket vorbis_bitrate_flushpacket;
78 + alias int function(vorbis_block *vb) pfvorbis_bitrate_addblock;
79 + alias int function(vorbis_dsp_state *vd, ogg_packet *op) pfvorbis_bitrate_flushpacket;
81 // Vorbis PRIMITIVES: synthesis layer
82 - typedef int function(vorbis_info *vi,vorbis_comment *vc, ogg_packet *op) pfvorbis_synthesis_headerin;
83 - pfvorbis_synthesis_headerin vorbis_synthesis_headerin;
84 + alias int function(vorbis_info *vi,vorbis_comment *vc, ogg_packet *op) pfvorbis_synthesis_headerin;
86 - typedef int function(vorbis_dsp_state *v,vorbis_info *vi) pfvorbis_synthesis_init;
87 - typedef int function(vorbis_dsp_state *v) pfvorbis_synthesis_restart;
88 - typedef int function(vorbis_block *vb,ogg_packet *op) pfvorbis_synthesis;
89 - typedef int function(vorbis_block *vb,ogg_packet *op) pfvorbis_synthesis_trackonly;
90 - typedef int function(vorbis_dsp_state *v,vorbis_block *vb) pfvorbis_synthesis_blockin;
91 - typedef int function(vorbis_dsp_state *v,float ***pcm) pfvorbis_synthesis_pcmout;
92 - typedef int function(vorbis_dsp_state *v,float ***pcm) pfvorbis_synthesis_lapout;
93 - typedef int function(vorbis_dsp_state *v,int samples) pfvorbis_synthesis_read;
94 - typedef int function(vorbis_info *vi,ogg_packet *op) pfvorbis_packet_blocksize;
95 - pfvorbis_synthesis_init vorbis_synthesis_init;
96 - pfvorbis_synthesis_restart vorbis_synthesis_restart;
97 - pfvorbis_synthesis vorbis_synthesis;
98 - pfvorbis_synthesis_trackonly vorbis_synthesis_trackonly;
99 - pfvorbis_synthesis_blockin vorbis_synthesis_blockin;
100 - pfvorbis_synthesis_pcmout vorbis_synthesis_pcmout;
101 - pfvorbis_synthesis_lapout vorbis_synthesis_lapout;
102 - pfvorbis_synthesis_read vorbis_synthesis_read;
103 - pfvorbis_packet_blocksize vorbis_packet_blocksize;
104 + alias int function(vorbis_dsp_state *v,vorbis_info *vi) pfvorbis_synthesis_init;
105 + alias int function(vorbis_dsp_state *v) pfvorbis_synthesis_restart;
106 + alias int function(vorbis_block *vb,ogg_packet *op) pfvorbis_synthesis;
107 + alias int function(vorbis_block *vb,ogg_packet *op) pfvorbis_synthesis_trackonly;
108 + alias int function(vorbis_dsp_state *v,vorbis_block *vb) pfvorbis_synthesis_blockin;
109 + alias int function(vorbis_dsp_state *v,float ***pcm) pfvorbis_synthesis_pcmout;
110 + alias int function(vorbis_dsp_state *v,float ***pcm) pfvorbis_synthesis_lapout;
111 + alias int function(vorbis_dsp_state *v,int samples) pfvorbis_synthesis_read;
112 + alias int function(vorbis_info *vi,ogg_packet *op) pfvorbis_packet_blocksize;
114 - typedef int function(vorbis_info *v,int flag) pfvorbis_synthesis_halfrate;
115 - typedef int function(vorbis_info *v) pfvorbis_synthesis_halfrate_p;
116 - pfvorbis_synthesis_halfrate vorbis_synthesis_halfrate;
117 - pfvorbis_synthesis_halfrate_p vorbis_synthesis_halfrate_p;
118 + alias int function(vorbis_info *v,int flag) pfvorbis_synthesis_halfrate;
119 + alias int function(vorbis_info *v) pfvorbis_synthesis_halfrate_p;
120 } // extern(C)
122 -
123 -
124 -
125 -
126 -
127 -
128 -
129 -
130 +pfvorbis_info_init vorbis_info_init;
131 +pfvorbis_info_clear vorbis_info_clear;
132 +pfvorbis_info_blocksize vorbis_info_blocksize;
133 +pfvorbis_comment_init vorbis_comment_init;
134 +pfvorbis_comment_add vorbis_comment_add;
135 +pfvorbis_comment_add_tag vorbis_comment_add_tag;
136 +pfvorbis_comment_query vorbis_comment_query;
137 +pfvorbis_comment_query_count vorbis_comment_query_count;
138 +pfvorbis_comment_clear vorbis_comment_clear;
139 +pfvorbis_block_init vorbis_block_init;
140 +pfvorbis_block_clear vorbis_block_clear;
141 +pfvorbis_dsp_clear vorbis_dsp_clear;
142 +pfvorbis_granule_time vorbis_granule_time;
143 +
144 +pfvorbis_analysis_init vorbis_analysis_init;
145 +pfvorbis_commentheader_out vorbis_commentheader_out;
146 +pfvorbis_analysis_headerout vorbis_analysis_headerout;
147 +pfvorbis_analysis_buffer vorbis_analysis_buffer;
148 +pfvorbis_analysis_wrote vorbis_analysis_wrote;
149 +pfvorbis_analysis_blockout vorbis_analysis_blockout;
150 +pfvorbis_analysis vorbis_analysis;
151 +
152 +pfvorbis_bitrate_addblock vorbis_bitrate_addblock;
153 +pfvorbis_bitrate_flushpacket vorbis_bitrate_flushpacket;
154 +
155 +pfvorbis_synthesis_headerin vorbis_synthesis_headerin;
156 +pfvorbis_synthesis_init vorbis_synthesis_init;
157 +pfvorbis_synthesis_restart vorbis_synthesis_restart;
158 +pfvorbis_synthesis vorbis_synthesis;
159 +pfvorbis_synthesis_trackonly vorbis_synthesis_trackonly;
160 +pfvorbis_synthesis_blockin vorbis_synthesis_blockin;
161 +pfvorbis_synthesis_pcmout vorbis_synthesis_pcmout;
162 +pfvorbis_synthesis_lapout vorbis_synthesis_lapout;
163 +pfvorbis_synthesis_read vorbis_synthesis_read;
164 +pfvorbis_packet_blocksize vorbis_packet_blocksize;
165 +
166 +pfvorbis_synthesis_halfrate vorbis_synthesis_halfrate;
167 +pfvorbis_synthesis_halfrate_p vorbis_synthesis_halfrate_p;
168 Index: DerelictVorbis/derelict/ogg/vorbisfile.d
169 ===================================================================
170 --- DerelictVorbis/derelict/ogg/vorbisfile.d (revision 318)
171 +++ DerelictVorbis/derelict/ogg/vorbisfile.d (working copy)
172 @@ -120,86 +120,94 @@
173 extern (C)
174 {
176 - typedef int function(OggVorbis_File *vf) pfov_clear;
177 - //typedef int function(FILE *f, OggVorbis_File *vf, char *initial, long ibytes) pfov_open;
178 - typedef int function(void *datasource, OggVorbis_File *vf, char *initial, int ibytes, ov_callbacks callbacks) pfov_open_callbacks;
179 - pfov_clear ov_clear;
180 - //pfov_open ov_open; // rewritten below because of incompatibility between compilers with FILE struct
181 - pfov_open_callbacks ov_open_callbacks;
182 + alias int function(OggVorbis_File *vf) pfov_clear;
183 + //alias int function(FILE *f, OggVorbis_File *vf, char *initial, long ibytes) pfov_open;
184 + alias int function(void *datasource, OggVorbis_File *vf, char *initial, int ibytes, ov_callbacks callbacks) pfov_open_callbacks;
186 - typedef int function(FILE *f,OggVorbis_File *vf, byte *initial, int ibytes) pfov_test;
187 - typedef int function(void *datasource, OggVorbis_File *vf, char *initial, int ibytes, ov_callbacks callbacks) pfov_test_callbacks;
188 - typedef int function(OggVorbis_File *vf) pfov_test_open;
189 - pfov_test ov_test;
190 - pfov_test_callbacks ov_test_callbacks;
191 - pfov_test_open ov_test_open;
192 + alias int function(FILE *f,OggVorbis_File *vf, byte *initial, int ibytes) pfov_test;
193 + alias int function(void *datasource, OggVorbis_File *vf, char *initial, int ibytes, ov_callbacks callbacks) pfov_test_callbacks;
194 + alias int function(OggVorbis_File *vf) pfov_test_open;
196 - typedef int function(OggVorbis_File *vf,int i) pfov_bitrate;
197 - typedef int function(OggVorbis_File *vf) pfov_bitrate_instant;
198 - typedef int function(OggVorbis_File *vf) pfov_streams;
199 - typedef int function(OggVorbis_File *vf) pfov_seekable;
200 - typedef int function(OggVorbis_File *vf,int i) pfov_serialnumber;
201 - pfov_bitrate ov_bitrate;
202 - pfov_bitrate_instant ov_bitrate_instant;
203 - pfov_streams ov_streams;
204 - pfov_seekable ov_seekable;
205 - pfov_serialnumber ov_serialnumber;
206 + alias int function(OggVorbis_File *vf,int i) pfov_bitrate;
207 + alias int function(OggVorbis_File *vf) pfov_bitrate_instant;
208 + alias int function(OggVorbis_File *vf) pfov_streams;
209 + alias int function(OggVorbis_File *vf) pfov_seekable;
210 + alias int function(OggVorbis_File *vf,int i) pfov_serialnumber;
212 - typedef ogg_int64_t function(OggVorbis_File *vf,int i) pfov_raw_total;
213 - typedef ogg_int64_t function(OggVorbis_File *vf,int i) pfov_pcm_total;
214 - typedef double function(OggVorbis_File *vf,int i) pfov_time_total;
215 - pfov_raw_total ov_raw_total;
216 - pfov_pcm_total ov_pcm_total;
217 - pfov_time_total ov_time_total;
218 + alias ogg_int64_t function(OggVorbis_File *vf,int i) pfov_raw_total;
219 + alias ogg_int64_t function(OggVorbis_File *vf,int i) pfov_pcm_total;
220 + alias double function(OggVorbis_File *vf,int i) pfov_time_total;
222 - typedef int function(OggVorbis_File *vf,ogg_int64_t pos) pfov_raw_seek;
223 - typedef int function(OggVorbis_File *vf,ogg_int64_t pos) pfov_pcm_seek;
224 - typedef int function(OggVorbis_File *vf,ogg_int64_t pos) pfov_pcm_seek_page;
225 - typedef int function(OggVorbis_File *vf,double pos) pfov_time_seek;
226 - typedef int function(OggVorbis_File *vf,double pos) pfov_time_seek_page;
227 - pfov_raw_seek ov_raw_seek;
228 - pfov_pcm_seek ov_pcm_seek;
229 - pfov_pcm_seek_page ov_pcm_seek_page;
230 - pfov_time_seek ov_time_seek;
231 - pfov_time_seek_page ov_time_seek_page;
232 + alias int function(OggVorbis_File *vf,ogg_int64_t pos) pfov_raw_seek;
233 + alias int function(OggVorbis_File *vf,ogg_int64_t pos) pfov_pcm_seek;
234 + alias int function(OggVorbis_File *vf,ogg_int64_t pos) pfov_pcm_seek_page;
235 + alias int function(OggVorbis_File *vf,double pos) pfov_time_seek;
236 + alias int function(OggVorbis_File *vf,double pos) pfov_time_seek_page;
238 - typedef int function(OggVorbis_File *vf,ogg_int64_t pos) pfov_raw_seek_lap;
239 - typedef int function(OggVorbis_File *vf,ogg_int64_t pos) pfov_pcm_seek_lap;
240 - typedef int function(OggVorbis_File *vf,ogg_int64_t pos) pfov_pcm_seek_page_lap;
241 - typedef int function(OggVorbis_File *vf,double pos) pfov_time_seek_lap;
242 - typedef int function(OggVorbis_File *vf,double pos) pfov_time_seek_page_lap;
243 - pfov_raw_seek_lap ov_raw_seek_lap;
244 - pfov_pcm_seek_lap ov_pcm_seek_lap;
245 - pfov_pcm_seek_page_lap ov_pcm_seek_page_lap;
246 - pfov_time_seek_lap ov_time_seek_lap;
247 - pfov_time_seek_page_lap ov_time_seek_page_lap;
248 + alias int function(OggVorbis_File *vf,ogg_int64_t pos) pfov_raw_seek_lap;
249 + alias int function(OggVorbis_File *vf,ogg_int64_t pos) pfov_pcm_seek_lap;
250 + alias int function(OggVorbis_File *vf,ogg_int64_t pos) pfov_pcm_seek_page_lap;
251 + alias int function(OggVorbis_File *vf,double pos) pfov_time_seek_lap;
252 + alias int function(OggVorbis_File *vf,double pos) pfov_time_seek_page_lap;
254 - typedef ogg_int64_t function(OggVorbis_File *vf) pfov_raw_tell;
255 - typedef ogg_int64_t function(OggVorbis_File *vf) pfov_pcm_tell;
256 - typedef double function(OggVorbis_File *vf) pfov_time_tell;
257 - pfov_raw_tell ov_raw_tell;
258 - pfov_pcm_tell ov_pcm_tell;
259 - pfov_time_tell ov_time_tell;
260 + alias ogg_int64_t function(OggVorbis_File *vf) pfov_raw_tell;
261 + alias ogg_int64_t function(OggVorbis_File *vf) pfov_pcm_tell;
262 + alias double function(OggVorbis_File *vf) pfov_time_tell;
264 - typedef vorbis_info* function(OggVorbis_File *vf,int link) pfov_info;
265 - typedef vorbis_comment* function(OggVorbis_File *vf,int link) pfov_comment;
266 - pfov_info ov_info;
267 - pfov_comment ov_comment;
268 + alias vorbis_info* function(OggVorbis_File *vf,int link) pfov_info;
269 + alias vorbis_comment* function(OggVorbis_File *vf,int link) pfov_comment;
271 - typedef int function(OggVorbis_File *vf, float ***pcm_channels, int samples, int *bitstream) pfov_read_float;
272 - typedef int function(OggVorbis_File *vf, byte *buffer, int length, int bigendianp, int word, int sgned, int *bitstream) pfov_read;
273 - typedef int function(OggVorbis_File *vf1,OggVorbis_File *vf2) pfov_crosslap;
274 - pfov_read_float ov_read_float;
275 - pfov_read ov_read;
276 - pfov_crosslap ov_crosslap;
277 + alias int function(OggVorbis_File *vf, float ***pcm_channels, int samples, int *bitstream) pfov_read_float;
278 + alias int function(OggVorbis_File *vf, byte *buffer, int length, int bigendianp, int word, int sgned, int *bitstream) pfov_read;
279 + alias int function(OggVorbis_File *vf1,OggVorbis_File *vf2) pfov_crosslap;
281 - typedef int function(OggVorbis_File *vf,int flag) pfov_halfrate;
282 - typedef int function(OggVorbis_File *vf) pfov_halfrate_p;
283 - pfov_halfrate ov_halfrate;
284 - pfov_halfrate_p ov_halfrate_p;
285 -
286 -
287 + alias int function(OggVorbis_File *vf,int flag) pfov_halfrate;
288 + alias int function(OggVorbis_File *vf) pfov_halfrate_p;
289 } // extern(C)
290 +
291 +pfov_clear ov_clear;
292 + //pfov_open ov_open; // rewritten below because of incompatibility between compilers with FILE struct
293 +pfov_open_callbacks ov_open_callbacks;
294 +
295 +pfov_test ov_test;
296 +pfov_test_callbacks ov_test_callbacks;
297 +pfov_test_open ov_test_open;
298 +
299 +pfov_bitrate ov_bitrate;
300 +pfov_bitrate_instant ov_bitrate_instant;
301 +pfov_streams ov_streams;
302 +pfov_seekable ov_seekable;
303 +pfov_serialnumber ov_serialnumber;
304 +
305 +pfov_raw_total ov_raw_total;
306 +pfov_pcm_total ov_pcm_total;
307 +pfov_time_total ov_time_total;
308 +
309 +pfov_raw_seek ov_raw_seek;
310 +pfov_pcm_seek ov_pcm_seek;
311 +pfov_pcm_seek_page ov_pcm_seek_page;
312 +pfov_time_seek ov_time_seek;
313 +pfov_time_seek_page ov_time_seek_page;
314 +
315 +pfov_raw_seek_lap ov_raw_seek_lap;
316 +pfov_pcm_seek_lap ov_pcm_seek_lap;
317 +pfov_pcm_seek_page_lap ov_pcm_seek_page_lap;
318 +pfov_time_seek_lap ov_time_seek_lap;
319 +pfov_time_seek_page_lap ov_time_seek_page_lap;
320 +
321 +pfov_raw_tell ov_raw_tell;
322 +pfov_pcm_tell ov_pcm_tell;
323 +pfov_time_tell ov_time_tell;
324 +
325 +pfov_info ov_info;
326 +pfov_comment ov_comment;
327 +
328 +pfov_read_float ov_read_float;
329 +pfov_read ov_read;
330 +pfov_crosslap ov_crosslap;
331 +
332 +pfov_halfrate ov_halfrate;
333 +pfov_halfrate_p ov_halfrate_p;
335 // ov_open is rewritten below because of incompatibility between compilers with FILE struct
336 // Using this wrapper, it *should* work exactly as it would in c++. --JoeCoder
337 Index: DerelictIL/derelict/devil/ilfuncs.d
338 ===================================================================
339 --- DerelictIL/derelict/devil/ilfuncs.d (revision 318)
340 +++ DerelictIL/derelict/devil/ilfuncs.d (working copy)
341 @@ -140,8 +140,7 @@
342 );
343 }
345 -extern(System):
346 -
347 +extern(System) {
348 alias void* ILHANDLE;
349 alias ILvoid (*fCloseRProc)(ILHANDLE);
350 alias ILboolean (*fEofProc) (ILHANDLE);
351 @@ -161,93 +160,95 @@
352 alias ILenum (*IL_LOADPROC)( ILstring);
353 alias ILenum (*IL_SAVEPROC)( ILstring);
355 -typedef ILboolean function(ILuint Number) pfilActiveImage;
356 -typedef ILboolean function(ILuint Number) pfilActiveLayer;
357 -typedef ILboolean function(ILuint Number) pfilActiveMipmap;
358 -typedef ILboolean function( ILstring FileName) pfilApplyPal;
359 -typedef ILboolean function( ILstring InProfile, ILstring OutProfile) pfilApplyProfile;
360 -typedef ILvoid function(ILuint Image) pfilBindImage;
361 -typedef ILboolean function(ILuint Source, ILint DestX, ILint DestY, ILint DestZ, ILuint SrcX, ILuint SrcY, ILuint SrcZ, ILuint Width, ILuint Height, ILuint Depth) pfilBlit;
362 -typedef ILvoid function(ILclampf Red, ILclampf Green, ILclampf Blue, ILclampf Alpha) pfilClearColour;
363 -typedef ILboolean function() pfilClearImage;
364 -typedef ILuint function() pfilCloneCurImage;
365 -typedef ILboolean function(ILenum Mode) pfilCompressFunc;
366 -typedef ILboolean function(ILenum DestFormat, ILenum DestType) pfilConvertImage;
367 -typedef ILboolean function(ILenum DestFormat) pfilConvertPal;
368 -typedef ILboolean function(ILuint Src) pfilCopyImage;
369 -typedef ILuint function(ILuint XOff, ILuint YOff, ILuint ZOff, ILuint Width, ILuint Height, ILuint Depth, ILenum Format, ILenum Type, ILvoid *Data) pfilCopyPixels;
370 -typedef ILuint function(ILenum Type, ILuint Num) pfilCreateSubImage;
371 -typedef ILboolean function() pfilDefaultImage;
372 -typedef ILvoid function(ILsizei Num, ILuint *Images) pfilDeleteImages;
373 -typedef ILboolean function(ILenum Mode) pfilDisable;
374 -typedef ILboolean function(ILenum Mode) pfilEnable;
375 -typedef ILboolean function(ILenum Mode) pfilFormatFunc;
376 -typedef ILvoid function(ILsizei Num, ILuint *Images) pfilGenImages;
377 -typedef ILubyte* function(ILenum Type) pfilGetAlpha;
378 -//typedef ILvoid function( ILint AlphaValue ) pfilModAlpha;
379 -//typedef ILvoid function( ILuint AlphaValue ) pfilSetAlpha;
380 -typedef ILboolean function(ILenum Mode) pfilGetBoolean;
381 -typedef ILvoid function(ILenum Mode, ILboolean *Param) pfilGetBooleanv;
382 -typedef ILubyte* function() pfilGetData;
383 -typedef ILuint function(ILvoid *Buffer, ILuint BufferSize, ILenum DXTCFormat) pfilGetDXTCData;
384 -typedef ILenum function() pfilGetError;
385 -typedef ILint function(ILenum Mode) pfilGetInteger;
386 -typedef ILvoid function(ILenum Mode, ILint *Param) pfilGetIntegerv;
387 -typedef ILuint function() pfilGetLumpPos;
388 -typedef ILubyte* function() pfilGetPalette;
389 -typedef ILstring function(ILenum StringName) pfilGetString;
390 -typedef ILvoid function(ILenum Target, ILenum Mode) pfilHint;
391 -typedef ILvoid function() pfilInit;
392 -typedef ILboolean function(ILenum Mode) pfilIsDisabled;
393 -typedef ILboolean function(ILenum Mode) pfilIsEnabled;
394 -typedef ILboolean function(ILuint Image) pfilIsImage;
395 -typedef ILboolean function(ILenum Type, ILstring FileName) pfilIsValid;
396 -typedef ILboolean function(ILenum Type, ILHANDLE File) pfilIsValidF;
397 -typedef ILboolean function(ILenum Type, ILvoid *Lump, ILuint Size) pfilIsValidL;
398 -typedef ILvoid function(ILclampf Red, ILclampf Green, ILclampf Blue, ILclampf Alpha) pfilKeyColour;
399 -typedef ILboolean function(ILenum Type, ILstring FileName) pfilLoad;
400 -typedef ILboolean function(ILenum Type, ILHANDLE File) pfilLoadF;
401 -typedef ILboolean function( ILstring FileName) pfilLoadImage;
402 -typedef ILboolean function(ILenum Type, ILvoid *Lump, ILuint Size) pfilLoadL;
403 -typedef ILboolean function( ILstring FileName) pfilLoadPal;
404 -typedef ILboolean function(ILenum Mode) pfilOriginFunc;
405 -typedef ILboolean function(ILuint Source, ILint XCoord, ILint YCoord, ILint ZCoord) pfilOverlayImage;
406 -typedef ILvoid function() pfilPopAttrib;
407 -typedef ILvoid function(ILuint Bits) pfilPushAttrib;
408 -typedef ILvoid function(ILenum Format) pfilRegisterFormat;
409 -typedef ILboolean function( ILstring Ext, IL_LOADPROC Load) pfilRegisterLoad;
410 -typedef ILboolean function(ILuint Num) pfilRegisterMipNum;
411 -typedef ILboolean function(ILuint Num) pfilRegisterNumImages;
412 -typedef ILvoid function(ILenum Origin) pfilRegisterOrigin;
413 -typedef ILvoid function(ILvoid *Pal, ILuint Size, ILenum Type) pfilRegisterPal;
414 -typedef ILboolean function( ILstring Ext, IL_SAVEPROC Save) pfilRegisterSave;
415 -typedef ILvoid function(ILenum Type) pfilRegisterType;
416 -typedef ILboolean function( ILstring Ext) pfilRemoveLoad;
417 -typedef ILboolean function( ILstring Ext) pfilRemoveSave;
418 -typedef ILvoid function() pfilResetMemory;
419 -typedef ILvoid function() pfilResetRead;
420 -typedef ILvoid function() pfilResetWrite;
421 -typedef ILboolean function(ILenum Type, ILstring FileName) pfilSave;
422 -typedef ILuint function(ILenum Type, ILHANDLE File) pfilSaveF;
423 -typedef ILboolean function( ILstring FileName) pfilSaveImage;
424 -typedef ILboolean function(ILvoid *Data) pfilSetData;
425 -typedef ILboolean function(ILuint Duration) pfilSetDuration;
426 -typedef ILvoid function(ILenum Mode, ILint Param) pfilSetInteger;
427 -typedef ILvoid function(mAlloc, mFree) pfilSetMemory;
428 -typedef ILvoid function(ILint XOff, ILint YOff, ILint ZOff, ILuint Width, ILuint Height, ILuint Depth, ILenum Format, ILenum Type, ILvoid *Data) pfilSetPixels;
429 -typedef ILvoid function(fOpenRProc, fCloseRProc, fEofProc, fGetcProc, fReadProc, fSeekRProc, fTellRProc) pfilSetRead;
430 -typedef ILvoid function(ILenum Mode, char *String) pfilSetString;
431 -typedef ILvoid function(fOpenWProc, fCloseWProc, fPutcProc, fSeekWProc, fTellWProc, fWriteProc) pfilSetWrite;
432 -typedef ILvoid function() pfilShutDown;
433 -typedef ILboolean function(ILuint Width, ILuint Height, ILuint Depth, ILubyte Bpp, ILenum Format, ILenum Type, ILvoid *Data) pfilTexImage;
434 -typedef ILboolean function(ILenum Mode) pfilTypeFunc;
435 -typedef ILboolean function( ILstring FileName, ILuint Width, ILuint Height, ILuint Depth, ILubyte Bpp) pfilLoadData;
436 -typedef ILboolean function(ILHANDLE File, ILuint Width, ILuint Height, ILuint Depth, ILubyte Bpp) pfilLoadDataF;
437 -typedef ILboolean function(ILvoid *Lump, ILuint Size, ILuint Width, ILuint Height, ILuint Depth, ILubyte Bpp) pfilLoadDataL;
438 -typedef ILboolean function( ILstring FileName) pfilSaveData;
439 -typedef ILboolean function(ILvoid* JpegDecompressorPtr) pfilLoadFromJpegStruct;
440 -typedef ILboolean function(ILvoid* JpegCompressorPtr) pfilSaveFromJpegStruct;
442 +alias ILboolean function(ILuint Number) pfilActiveImage;
443 +alias ILboolean function(ILuint Number) pfilActiveLayer;
444 +alias ILboolean function(ILuint Number) pfilActiveMipmap;
445 +alias ILboolean function( ILstring FileName) pfilApplyPal;
446 +alias ILboolean function( ILstring InProfile, ILstring OutProfile) pfilApplyProfile;
447 +alias ILvoid function(ILuint Image) pfilBindImage;
448 +alias ILboolean function(ILuint Source, ILint DestX, ILint DestY, ILint DestZ, ILuint SrcX, ILuint SrcY, ILuint SrcZ, ILuint Width, ILuint Height, ILuint Depth) pfilBlit;
449 +alias ILvoid function(ILclampf Red, ILclampf Green, ILclampf Blue, ILclampf Alpha) pfilClearColour;
450 +alias ILboolean function() pfilClearImage;
451 +alias ILuint function() pfilCloneCurImage;
452 +alias ILboolean function(ILenum Mode) pfilCompressFunc;
453 +alias ILboolean function(ILenum DestFormat, ILenum DestType) pfilConvertImage;
454 +alias ILboolean function(ILenum DestFormat) pfilConvertPal;
455 +alias ILboolean function(ILuint Src) pfilCopyImage;
456 +alias ILuint function(ILuint XOff, ILuint YOff, ILuint ZOff, ILuint Width, ILuint Height, ILuint Depth, ILenum Format, ILenum Type, ILvoid *Data) pfilCopyPixels;
457 +alias ILuint function(ILenum Type, ILuint Num) pfilCreateSubImage;
458 +alias ILboolean function() pfilDefaultImage;
459 +alias ILvoid function(ILsizei Num, ILuint *Images) pfilDeleteImages;
460 +alias ILboolean function(ILenum Mode) pfilDisable;
461 +alias ILboolean function(ILenum Mode) pfilEnable;
462 +alias ILboolean function(ILenum Mode) pfilFormatFunc;
463 +alias ILvoid function(ILsizei Num, ILuint *Images) pfilGenImages;
464 +alias ILubyte* function(ILenum Type) pfilGetAlpha;
465 +//alias ILvoid function( ILint AlphaValue ) pfilModAlpha;
466 +//alias ILvoid function( ILuint AlphaValue ) pfilSetAlpha;
467 +alias ILboolean function(ILenum Mode) pfilGetBoolean;
468 +alias ILvoid function(ILenum Mode, ILboolean *Param) pfilGetBooleanv;
469 +alias ILubyte* function() pfilGetData;
470 +alias ILuint function(ILvoid *Buffer, ILuint BufferSize, ILenum DXTCFormat) pfilGetDXTCData;
471 +alias ILenum function() pfilGetError;
472 +alias ILint function(ILenum Mode) pfilGetInteger;
473 +alias ILvoid function(ILenum Mode, ILint *Param) pfilGetIntegerv;
474 +alias ILuint function() pfilGetLumpPos;
475 +alias ILubyte* function() pfilGetPalette;
476 +alias ILstring function(ILenum StringName) pfilGetString;
477 +alias ILvoid function(ILenum Target, ILenum Mode) pfilHint;
478 +alias ILvoid function() pfilInit;
479 +alias ILboolean function(ILenum Mode) pfilIsDisabled;
480 +alias ILboolean function(ILenum Mode) pfilIsEnabled;
481 +alias ILboolean function(ILuint Image) pfilIsImage;
482 +alias ILboolean function(ILenum Type, ILstring FileName) pfilIsValid;
483 +alias ILboolean function(ILenum Type, ILHANDLE File) pfilIsValidF;
484 +alias ILboolean function(ILenum Type, ILvoid *Lump, ILuint Size) pfilIsValidL;
485 +alias ILvoid function(ILclampf Red, ILclampf Green, ILclampf Blue, ILclampf Alpha) pfilKeyColour;
486 +alias ILboolean function(ILenum Type, ILstring FileName) pfilLoad;
487 +alias ILboolean function(ILenum Type, ILHANDLE File) pfilLoadF;
488 +alias ILboolean function( ILstring FileName) pfilLoadImage;
489 +alias ILboolean function(ILenum Type, ILvoid *Lump, ILuint Size) pfilLoadL;
490 +alias ILboolean function( ILstring FileName) pfilLoadPal;
491 +alias ILboolean function(ILenum Mode) pfilOriginFunc;
492 +alias ILboolean function(ILuint Source, ILint XCoord, ILint YCoord, ILint ZCoord) pfilOverlayImage;
493 +alias ILvoid function() pfilPopAttrib;
494 +alias ILvoid function(ILuint Bits) pfilPushAttrib;
495 +alias ILvoid function(ILenum Format) pfilRegisterFormat;
496 +alias ILboolean function( ILstring Ext, IL_LOADPROC Load) pfilRegisterLoad;
497 +alias ILboolean function(ILuint Num) pfilRegisterMipNum;
498 +alias ILboolean function(ILuint Num) pfilRegisterNumImages;
499 +alias ILvoid function(ILenum Origin) pfilRegisterOrigin;
500 +alias ILvoid function(ILvoid *Pal, ILuint Size, ILenum Type) pfilRegisterPal;
501 +alias ILboolean function( ILstring Ext, IL_SAVEPROC Save) pfilRegisterSave;
502 +alias ILvoid function(ILenum Type) pfilRegisterType;
503 +alias ILboolean function( ILstring Ext) pfilRemoveLoad;
504 +alias ILboolean function( ILstring Ext) pfilRemoveSave;
505 +alias ILvoid function() pfilResetMemory;
506 +alias ILvoid function() pfilResetRead;
507 +alias ILvoid function() pfilResetWrite;
508 +alias ILboolean function(ILenum Type, ILstring FileName) pfilSave;
509 +alias ILuint function(ILenum Type, ILHANDLE File) pfilSaveF;
510 +alias ILboolean function( ILstring FileName) pfilSaveImage;
511 +alias ILboolean function(ILvoid *Data) pfilSetData;
512 +alias ILboolean function(ILuint Duration) pfilSetDuration;
513 +alias ILvoid function(ILenum Mode, ILint Param) pfilSetInteger;
514 +alias ILvoid function(mAlloc, mFree) pfilSetMemory;
515 +alias ILvoid function(ILint XOff, ILint YOff, ILint ZOff, ILuint Width, ILuint Height, ILuint Depth, ILenum Format, ILenum Type, ILvoid *Data) pfilSetPixels;
516 +alias ILvoid function(fOpenRProc, fCloseRProc, fEofProc, fGetcProc, fReadProc, fSeekRProc, fTellRProc) pfilSetRead;
517 +alias ILvoid function(ILenum Mode, char *String) pfilSetString;
518 +alias ILvoid function(fOpenWProc, fCloseWProc, fPutcProc, fSeekWProc, fTellWProc, fWriteProc) pfilSetWrite;
519 +alias ILvoid function() pfilShutDown;
520 +alias ILboolean function(ILuint Width, ILuint Height, ILuint Depth, ILubyte Bpp, ILenum Format, ILenum Type, ILvoid *Data) pfilTexImage;
521 +alias ILboolean function(ILenum Mode) pfilTypeFunc;
522 +alias ILboolean function( ILstring FileName, ILuint Width, ILuint Height, ILuint Depth, ILubyte Bpp) pfilLoadData;
523 +alias ILboolean function(ILHANDLE File, ILuint Width, ILuint Height, ILuint Depth, ILubyte Bpp) pfilLoadDataF;
524 +alias ILboolean function(ILvoid *Lump, ILuint Size, ILuint Width, ILuint Height, ILuint Depth, ILubyte Bpp) pfilLoadDataL;
525 +alias ILboolean function( ILstring FileName) pfilSaveData;
526 +alias ILboolean function(ILvoid* JpegDecompressorPtr) pfilLoadFromJpegStruct;
527 +alias ILboolean function(ILvoid* JpegCompressorPtr) pfilSaveFromJpegStruct;
528 +}
529 +
530 pfilActiveImage ilActiveImage;
531 pfilActiveLayer ilActiveLayer;
532 pfilActiveMipmap ilActiveMipmap;
533 Index: DerelictODE/derelict/ode/rotation.d
534 ===================================================================
535 --- DerelictODE/derelict/ode/rotation.d (revision 318)
536 +++ DerelictODE/derelict/ode/rotation.d (working copy)
537 @@ -41,16 +41,36 @@
538 //==============================================================================
539 // FUNCTIONS
540 //==============================================================================
541 -extern(C):
542 +extern(C) {
544 /* set a vector/matrix of size n to all zeros, or to a specific value. */
545 -typedef void function(dMatrix3 R) pfdRSetIdentity;
546 -typedef void function(dMatrix3 R, dReal ax, dReal ay, dReal az, dReal angle) pfdRFromAxisAndAngle;
547 -typedef void function(dMatrix3 R, dReal phi, dReal theta, dReal psi) pfdRFromEulerAngles;
548 -typedef void function(dMatrix3 R, dReal ax, dReal ay, dReal az, dReal bx, dReal by, dReal bz) pfdRFrom2Axes;
549 -typedef void function(dMatrix3 R, dReal ax, dReal ay, dReal az) pfdRFromZAxis;
550 -typedef void function(dQuaternion q) pfdQSetIdentity;
551 -typedef void function(dQuaternion q, dReal ax, dReal ay, dReal az, dReal angle) pfdQFromAxisAndAngle;
552 +alias void function(dMatrix3 R) pfdRSetIdentity;
553 +alias void function(dMatrix3 R, dReal ax, dReal ay, dReal az, dReal angle) pfdRFromAxisAndAngle;
554 +alias void function(dMatrix3 R, dReal phi, dReal theta, dReal psi) pfdRFromEulerAngles;
555 +alias void function(dMatrix3 R, dReal ax, dReal ay, dReal az, dReal bx, dReal by, dReal bz) pfdRFrom2Axes;
556 +alias void function(dMatrix3 R, dReal ax, dReal ay, dReal az) pfdRFromZAxis;
557 +alias void function(dQuaternion q) pfdQSetIdentity;
558 +alias void function(dQuaternion q, dReal ax, dReal ay, dReal az, dReal angle) pfdQFromAxisAndAngle;
559 +
560 +
561 +/* Quaternion multiplication, analogous to the matrix multiplication routines. */
562 +/* qa = rotate by qc, then qb */
563 +alias void function(dQuaternion qa, dQuaternion qb, dQuaternion qc) pfdQMultiply0;
564 +
565 +/* qa = rotate by qc, then by inverse of qb */
566 +alias void function(dQuaternion qa, dQuaternion qb, dQuaternion qc) pfdQMultiply1;
567 +
568 +/* qa = rotate by inverse of qc, then by qb */
569 +alias void function(dQuaternion qa, dQuaternion qb, dQuaternion qc) pfdQMultiply2;
570 +
571 +/* qa = rotate by inverse of qc, then by inverse of qb */
572 +alias void function(dQuaternion qa, dQuaternion qb, dQuaternion qc) pfdQMultiply3;
573 +
574 +alias void function(dMatrix3 R, dQuaternion q) pfdRfromQ;
575 +alias void function(dQuaternion q, dMatrix3 R) pfdQfromR;
576 +alias void function(dReal dq[4], dVector3 w, dQuaternion q) pfdDQfromW;
577 +}
578 +
579 pfdRSetIdentity dRSetIdentity;
580 pfdRFromAxisAndAngle dRFromAxisAndAngle;
581 pfdRFromEulerAngles dRFromEulerAngles;
582 @@ -58,28 +78,10 @@
583 pfdRFromZAxis dRFromZAxis;
584 pfdQSetIdentity dQSetIdentity;
585 pfdQFromAxisAndAngle dQFromAxisAndAngle;
586 -
587 -
588 -/* Quaternion multiplication, analogous to the matrix multiplication routines. */
589 -/* qa = rotate by qc, then qb */
590 -typedef void function(dQuaternion qa, dQuaternion qb, dQuaternion qc) pfdQMultiply0;
591 pfdQMultiply0 dQMultiply0;
592 -
593 -/* qa = rotate by qc, then by inverse of qb */
594 -typedef void function(dQuaternion qa, dQuaternion qb, dQuaternion qc) pfdQMultiply1;
595 pfdQMultiply1 dQMultiply1;
596 -
597 -/* qa = rotate by inverse of qc, then by qb */
598 -typedef void function(dQuaternion qa, dQuaternion qb, dQuaternion qc) pfdQMultiply2;
599 pfdQMultiply2 dQMultiply2;
600 -
601 -/* qa = rotate by inverse of qc, then by inverse of qb */
602 -typedef void function(dQuaternion qa, dQuaternion qb, dQuaternion qc) pfdQMultiply3;
603 pfdQMultiply3 dQMultiply3;
604 -
605 -typedef void function(dMatrix3 R, dQuaternion q) pfdRfromQ;
606 -typedef void function(dQuaternion q, dMatrix3 R) pfdQfromR;
607 -typedef void function(dReal dq[4], dVector3 w, dQuaternion q) pfdDQfromW;
608 pfdRfromQ dRfromQ;
609 pfdQfromR dQfromR;
610 pfdDQfromW dDQfromW;
611 Index: DerelictODE/derelict/ode/mass.d
612 ===================================================================
613 --- DerelictODE/derelict/ode/mass.d (revision 318)
614 +++ DerelictODE/derelict/ode/mass.d (working copy)
615 @@ -97,7 +97,7 @@
616 //==============================================================================
617 // FUNCTIONS
618 //==============================================================================
619 -extern(C):
620 +extern(C) {
622 /**
623 * Check if a mass structure has valid value.
624 @@ -107,24 +107,29 @@
625 *
626 * @return 1 if both codition are met
627 */
628 -typedef void function(dMass* m) pfdMassCheck;
629 -pfdMassCheck dMassCheck;
630 +alias void function(dMass* m) pfdMassCheck;
633 -typedef void function(dMass* m) pfdMassSetZero;
634 -typedef void function(dMass* m, dReal themass, dReal cgx, dReal cgy, dReal cgz, dReal I11, dReal I22, dReal I33, dReal I12, dReal I13, dReal I23) pfdMassSetParameters;
635 -typedef void function(dMass* m, dReal density, dReal radius) pfdMassSetSphere;
636 -typedef void function(dMass* m, dReal total_mass, dReal radius) pfdMassSetSphereTotal;
637 -typedef void function(dMass* m, dReal density, int direction, dReal radius, dReal length) pfdMassSetCapsule;
638 -typedef void function(dMass* m, dReal total_mass, int direction, dReal radius, dReal length) pfdMassSetCapsuleTotal;
639 -typedef void function(dMass* m, dReal density, int direction, dReal radius, dReal length) pfdMassSetCylinder;
640 -typedef void function(dMass* m, dReal total_mass, int direction, dReal radius, dReal length) pfdMassSetCylinderTotal;
641 -typedef void function(dMass* m, dReal density, dReal lx, dReal ly, dReal lz) pfdMassSetBox;
642 -typedef void function(dMass* m, dReal total_mass, dReal lx, dReal ly, dReal lz) pfdMassSetBoxTotal;
643 -typedef void function(dMass* m, dReal newmass) pfdMassAdjust;
644 -typedef void function(dMass* m, dReal x, dReal y, dReal z) pfdMassTranslate;
645 -typedef void function(dMass* m, dMatrix3 R) pfdMassRotate;
646 -typedef void function(dMass* m, dMass* b) pfdMassAdd;
647 +alias void function(dMass* m) pfdMassSetZero;
648 +alias void function(dMass* m, dReal themass, dReal cgx, dReal cgy, dReal cgz, dReal I11, dReal I22, dReal I33, dReal I12, dReal I13, dReal I23) pfdMassSetParameters;
649 +alias void function(dMass* m, dReal density, dReal radius) pfdMassSetSphere;
650 +alias void function(dMass* m, dReal total_mass, dReal radius) pfdMassSetSphereTotal;
651 +alias void function(dMass* m, dReal density, int direction, dReal radius, dReal length) pfdMassSetCapsule;
652 +alias void function(dMass* m, dReal total_mass, int direction, dReal radius, dReal length) pfdMassSetCapsuleTotal;
653 +alias void function(dMass* m, dReal density, int direction, dReal radius, dReal length) pfdMassSetCylinder;
654 +alias void function(dMass* m, dReal total_mass, int direction, dReal radius, dReal length) pfdMassSetCylinderTotal;
655 +alias void function(dMass* m, dReal density, dReal lx, dReal ly, dReal lz) pfdMassSetBox;
656 +alias void function(dMass* m, dReal total_mass, dReal lx, dReal ly, dReal lz) pfdMassSetBoxTotal;
657 +alias void function(dMass* m, dReal newmass) pfdMassAdjust;
658 +alias void function(dMass* m, dReal x, dReal y, dReal z) pfdMassTranslate;
659 +alias void function(dMass* m, dMatrix3 R) pfdMassRotate;
660 +alias void function(dMass* m, dMass* b) pfdMassAdd;
661 +
662 +// Added in 0.8
663 +alias void function(dMass *, dReal density, dGeomID g) pfdMassSetTrimesh;
664 +}
665 +
666 +pfdMassCheck dMassCheck;
667 pfdMassSetZero dMassSetZero;
668 pfdMassSetParameters dMassSetParameters;
669 pfdMassSetSphere dMassSetSphere;
670 @@ -139,12 +144,8 @@
671 pfdMassTranslate dMassTranslate;
672 pfdMassRotate dMassRotate;
673 pfdMassAdd dMassAdd;
674 -
675 -// Added in 0.8
676 -typedef void function(dMass *, dReal density, dGeomID g) pfdMassSetTrimesh;
677 pfdMassSetTrimesh dMassSetTrimesh;
679 -
680 // Backwards compatible API
681 alias dMassSetCapsule dMassSetCappedCylinder;
682 alias dMassSetCapsuleTotal dMassSetCappedCylinderTotal;
683 Index: DerelictODE/derelict/ode/export_dif.d
684 ===================================================================
685 --- DerelictODE/derelict/ode/export_dif.d (revision 318)
686 +++ DerelictODE/derelict/ode/export_dif.d (working copy)
687 @@ -54,8 +54,6 @@
688 // FUNCTIONS
689 //==============================================================================
691 -extern(C):
692 -
693 -typedef void function(dWorldID w, FILE* file, char* world_name) pfdWorldExportDIF;
694 +extern(C) alias void function(dWorldID w, FILE* file, char* world_name) pfdWorldExportDIF;
695 pfdWorldExportDIF dWorldExportDIF;
697 Index: DerelictODE/derelict/ode/matrix.d
698 ===================================================================
699 --- DerelictODE/derelict/ode/matrix.d (revision 318)
700 +++ DerelictODE/derelict/ode/matrix.d (working copy)
701 @@ -41,19 +41,18 @@
702 //==============================================================================
703 // FUNCTIONS
704 //==============================================================================
705 -extern(C):
706 +extern(C) {
707 +
708 +/* set a vector/matrix of size n to all zeros, or to a specefic value. */
709 +alias void function(dReal* a, int n) pfdSetZero;
711 /* set a vector/matrix of size n to all zeros, or to a specific value. */
712 -typedef void function(dReal* a, int n) pfdSetZero;
713 -typedef void function(dReal* a, int n, dReal value) pfdSetValue;
714 -pfdSetZero dSetZero;
715 -pfdSetValue dSetValue;
716 +alias void function(dReal* a, int n, dReal value) pfdSetValue;
718 /* get the dot product of two n*1 vectors. if n <= 0 then
719 * zero will be returned (in which case a and b need not be valid).
720 */
721 -typedef dReal function(dReal* a, dReal* b, int n) pfdDot;
722 -pfdDot dDot;
723 +alias dReal function(dReal* a, dReal* b, int n) pfdDot;
725 /* matrix multiplication. all matrices are stored in standard row format.
726 * the digit refers to the argument that is transposed:
727 @@ -63,41 +62,34 @@
728 * case 1,2 are equivalent to saying that the operation is A=B*C but
729 * B or C are stored in standard column format.
730 */
731 -typedef void function(dReal* A, in dReal* B, in dReal* C, int p, int q, int r) pfdMultiply0;
732 -typedef void function(dReal* A, in dReal* B, in dReal* C, int p, int q, int r) pfdMultiply1;
733 -typedef void function(dReal* A, in dReal* B, in dReal* C, int p, int q, int r) pfdMultiply2;
734 -pfdMultiply0 dMultiply0;
735 -pfdMultiply1 dMultiply1;
736 -pfdMultiply2 dMultiply2;
737 +alias void function(dReal* A, in dReal* B, in dReal* C, int p, int q, int r) pfdMultiply0;
738 +alias void function(dReal* A, in dReal* B, in dReal* C, int p, int q, int r) pfdMultiply1;
739 +alias void function(dReal* A, in dReal* B, in dReal* C, int p, int q, int r) pfdMultiply2;
741 /* do an in-place cholesky decomposition on the lower triangle of the n*n
742 * symmetric matrix A (which is stored by rows). the resulting lower triangle
743 * will be such that L*L'=A. return 1 on success and 0 on failure (on failure
744 * the matrix is not positive definite).
745 */
746 -typedef int function(dReal* A, int n) pfdFactorCholesky;
747 -pfdFactorCholesky dFactorCholesky;
748 +alias int function(dReal* A, int n) pfdFactorCholesky;
750 /* solve for x: L*L'*x = b, and put the result back into x.
751 * L is size n*n, b is size n*1. only the lower triangle of L is considered.
752 */
753 -typedef void function(dReal* L, dReal* b, int n) pfdSolveCholesky;
754 -pfdSolveCholesky dSolveCholesky;
755 +alias void function(dReal* L, dReal* b, int n) pfdSolveCholesky;
757 /* compute the inverse of the n*n positive definite matrix A and put it in
758 * Ainv. this is not especially fast. this returns 1 on success (A was
759 * positive definite) or 0 on failure (not PD).
760 */
761 -typedef int function(dReal* A, dReal* Ainv, int n) pfdInvertPDMatrix;
762 -pfdInvertPDMatrix dInvertPDMatrix;
763 +alias int function(dReal* A, dReal* Ainv, int n) pfdInvertPDMatrix;
765 /* check whether an n*n matrix A is positive definite, return 1/0 (yes/no).
766 * positive definite means that x'*A*x > 0 for any x. this performs a
767 * cholesky decomposition of A. if the decomposition fails then the matrix
768 * is not positive definite. A is stored by rows. A is not altered.
769 */
770 -typedef int function(dReal* A, int n) pfdIsPositiveDefinite;
771 -pfdIsPositiveDefinite dIsPositiveDefinite;
772 +alias int function(dReal* A, int n) pfdIsPositiveDefinite;
774 /* factorize a matrix A into L*D*L', where L is lower triangular with ones on
775 * the diagonal, and D is diagonal.
776 @@ -106,28 +98,24 @@
777 * written) and the reciprocal of the diagonal elements of D are written into
778 * d.
779 */
780 -typedef void function(dReal* A, dReal* d, int n, int nskip) pfdFactorLDLT;
781 -pfdFactorLDLT dFactorLDLT;
782 +alias void function(dReal* A, dReal* d, int n, int nskip) pfdFactorLDLT;
784 /* solve L*x=b, where L is n*n lower triangular with ones on the diagonal,
785 * and x,b are n*1. b is overwritten with x.
786 * the leading dimension of L is `nskip'.
787 */
788 -typedef void function(dReal* L, dReal *b, int n, int nskip) pfdSolveL1;
789 -pfdSolveL1 dSolveL1;
790 +alias void function(dReal* L, dReal *b, int n, int nskip) pfdSolveL1;
793 /* solve L'*x=b, where L is n*n lower triangular with ones on the diagonal,
794 * and x,b are n*1. b is overwritten with x.
795 * the leading dimension of L is `nskip'.
796 */
797 -typedef void function(dReal* L, dReal* b, int n, int nskip) pfdSolveL1T;
798 -pfdSolveL1T dSolveL1T;
799 +alias void function(dReal* L, dReal* b, int n, int nskip) pfdSolveL1T;
802 /* in matlab syntax: a(1:n) = a(1:n) .* d(1:n) */
803 -typedef void function(dReal* a, dReal* d, int n) pfdVectorScale;
804 -pfdVectorScale dVectorScale;
805 +alias void function(dReal* a, dReal* d, int n) pfdVectorScale;
808 /* given `L', a n*n lower triangular matrix with ones on the diagonal,
809 @@ -135,8 +123,7 @@
810 * D, solve L*D*L'*x=b where x,b are n*1. x overwrites b.
811 * the leading dimension of L is `nskip'.
812 */
813 -typedef void function(dReal* L, dReal* d, dReal* b, int n, int nskip) pfdSolveLDLT;
814 -pfdSolveLDLT dSolveLDLT;
815 +alias void function(dReal* L, dReal* d, dReal* b, int n, int nskip) pfdSolveLDLT;
818 /* given an L*D*L' factorization of an n*n matrix A, return the updated
819 @@ -152,8 +139,7 @@
820 * the result is written into L, except that the left column of L and d[0]
821 * are not actually modified. see ldltaddTL.m for further comments.
822 */
823 -typedef void function(dReal* L, dReal* d, dReal* a, int n, int nskip) pfdLDLTAddTL;
824 -pfdLDLTAddTL dLDLTAddTL;
825 +alias void function(dReal* L, dReal* d, dReal* a, int n, int nskip) pfdLDLTAddTL;
828 /* given an L*D*L' factorization of a permuted matrix A, produce a new
829 @@ -173,14 +159,31 @@
830 *
831 * a fast O(n^2) algorithm is used. see ldltremove.m for further comments.
832 */
833 -typedef void function(dReal** A, int* p, dReal* L, dReal* d, int n1, int n2, int r, int nskip) pfdLDLTRemove;
834 -pfdLDLTRemove dLDLTRemove;
835 +alias void function(dReal** A, int* p, dReal* L, dReal* d, int n1, int n2, int r, int nskip) pfdLDLTRemove;
838 /* given an n*n matrix A (with leading dimension nskip), remove the r'th row
839 * and column by moving elements. the new matrix will have the same leading
840 * dimension. the last row and column of A are untouched on exit.
841 */
842 -typedef void function(dReal* A, int n, int nskip, int r) pfdRemoveRowCol;
843 +alias void function(dReal* A, int n, int nskip, int r) pfdRemoveRowCol;
844 +}
845 +
846 +pfdSetZero dSetZero;
847 +pfdSetValue dSetValue;
848 +pfdDot dDot;
849 +pfdMultiply0 dMultiply0;
850 +pfdMultiply1 dMultiply1;
851 +pfdMultiply2 dMultiply2;
852 +pfdFactorCholesky dFactorCholesky;
853 +pfdSolveCholesky dSolveCholesky;
854 +pfdInvertPDMatrix dInvertPDMatrix;
855 +pfdIsPositiveDefinite dIsPositiveDefinite;
856 +pfdFactorLDLT dFactorLDLT;
857 +pfdSolveL1 dSolveL1;
858 +pfdSolveL1T dSolveL1T;
859 +pfdVectorScale dVectorScale;
860 +pfdSolveLDLT dSolveLDLT;
861 +pfdLDLTAddTL dLDLTAddTL;
862 +pfdLDLTRemove dLDLTRemove;
863 pfdRemoveRowCol dRemoveRowCol;
864 -
865 Index: DerelictODE/derelict/ode/collision_space.d
866 ===================================================================
867 --- DerelictODE/derelict/ode/collision_space.d (revision 318)
868 +++ DerelictODE/derelict/ode/collision_space.d (working copy)
869 @@ -56,52 +56,40 @@
870 *
871 * @ingroup collide
872 */
873 -typedef void function(void* data, dGeomID o1, dGeomID o2) dNearCallback;
874 +alias void function(void* data, dGeomID o1, dGeomID o2) dNearCallback;
876 -extern(C):
877 +extern(C) {
879 /* set a new error, debug or warning handler. if fn is 0, the default handlers
880 * are used.
881 */
882 -typedef dSpaceID function(dSpaceID space) pfdSimpleSpaceCreate;
883 -pfdSimpleSpaceCreate dSimpleSpaceCreate;
884 +alias dSpaceID function(dSpaceID space) pfdSimpleSpaceCreate;
885 +alias dSpaceID function(dSpaceID space) pfdHashSpaceCreate;
886 +alias dSpaceID function(dSpaceID space, dVector3 Center, dVector3 Extents, int Depth) pfdQuadTreeSpaceCreate;
887 +alias void function(dSpaceID space) pfdSpaceDestroy;
888 +alias void function(dSpaceID space, int minlevel, int maxlevel) pfdHashSpaceSetLevels;
889 +alias void function(dSpaceID space, int* minlevel, int* maxlevel) pfdHashSpaceGetLevels;
890 +alias void function(dSpaceID space, int mode) pfdSpaceSetCleanup;
891 +alias int function(dSpaceID space) pfdSpaceGetCleanup;
892 +alias void function(dSpaceID, dGeomID) pfdSpaceAdd;
893 +alias void function(dSpaceID, dGeomID) pfdSpaceRemove;
894 +alias int function(dSpaceID, dGeomID) pfdSpaceQuery;
895 +alias void function(dSpaceID) pfdSpaceClean;
896 +alias int function(dSpaceID) pfdSpaceGetNumGeoms;
897 +alias dGeomID function(dSpaceID, int i) pfdSpaceGetGeom;
898 +}
900 -typedef dSpaceID function(dSpaceID space) pfdHashSpaceCreate;
901 +pfdSimpleSpaceCreate dSimpleSpaceCreate;
902 pfdHashSpaceCreate dHashSpaceCreate;
903 -
904 -typedef dSpaceID function(dSpaceID space, dVector3 Center, dVector3 Extents, int Depth) pfdQuadTreeSpaceCreate;
905 pfdQuadTreeSpaceCreate dQuadTreeSpaceCreate;
906 -
907 -typedef void function(dSpaceID space) pfdSpaceDestroy;
908 pfdSpaceDestroy dSpaceDestroy;
909 -
910 -typedef void function(dSpaceID space, int minlevel, int maxlevel) pfdHashSpaceSetLevels;
911 pfdHashSpaceSetLevels dHashSpaceSetLevels;
912 -
913 -typedef void function(dSpaceID space, int* minlevel, int* maxlevel) pfdHashSpaceGetLevels;
914 pfdHashSpaceGetLevels dHashSpaceGetLevels;
915 -
916 -typedef void function(dSpaceID space, int mode) pfdSpaceSetCleanup;
917 pfdSpaceSetCleanup dSpaceSetCleanup;
918 -
919 -typedef int function(dSpaceID space) pfdSpaceGetCleanup;
920 pfdSpaceGetCleanup dSpaceGetCleanup;
921 -
922 -typedef void function(dSpaceID, dGeomID) pfdSpaceAdd;
923 pfdSpaceAdd dSpaceAdd;
924 -
925 -typedef void function(dSpaceID, dGeomID) pfdSpaceRemove;
926 pfdSpaceRemove dSpaceRemove;
927 -
928 -typedef int function(dSpaceID, dGeomID) pfdSpaceQuery;
929 pfdSpaceQuery dSpaceQuery;
930 -
931 -typedef void function(dSpaceID) pfdSpaceClean;
932 pfdSpaceClean dSpaceClean;
933 -
934 -typedef int function(dSpaceID) pfdSpaceGetNumGeoms;
935 pfdSpaceGetNumGeoms dSpaceGetNumGeoms;
936 -
937 -typedef dGeomID function(dSpaceID, int i) pfdSpaceGetGeom;
938 pfdSpaceGetGeom dSpaceGetGeom;
939 -
940 Index: DerelictODE/derelict/ode/memory.d
941 ===================================================================
942 --- DerelictODE/derelict/ode/memory.d (revision 318)
943 +++ DerelictODE/derelict/ode/memory.d (working copy)
944 @@ -44,35 +44,37 @@
945 * should not return.
946 */
947 /* function types to allocate and free memory */
948 -typedef void* function(size_t size) dAllocFunction;
949 -typedef void* function(void* ptr, size_t oldsize, size_t newsize) dReallocFunction;
950 -typedef void function (void* ptr, size_t size) dFreeFunction;
951 +alias void* function(size_t size) dAllocFunction;
952 +alias void* function(void* ptr, size_t oldsize, size_t newsize) dReallocFunction;
953 +alias void function (void* ptr, size_t size) dFreeFunction;
955 -extern(C):
956 +extern(C) {
958 /*
959 * set new memory management functions. if fn is 0, the default handlers are
960 * used.
961 */
962 -typedef void function(dAllocFunction*) pfdSetAllocHandler;
963 -typedef void function(dReallocFunction*) pfdSetReallocHandler;
964 -typedef void function(dFreeFunction*) pfdSetFreeHandler;
965 +alias void function(dAllocFunction*) pfdSetAllocHandler;
966 +alias void function(dReallocFunction*) pfdSetReallocHandler;
967 +alias void function(dFreeFunction*) pfdSetFreeHandler;
968 +
969 +/* get current memory management functions */
970 +alias dAllocFunction* function() pfdGetAllocHandler;
971 +alias dReallocFunction* function() pfdGetReallocHandler;
972 +alias dFreeFunction* function() pfdGetFreeHandler;
973 +
974 +/* allocate and free memory. */
975 +alias void* function(size_t size) pfdAlloc;
976 +alias void* function(void* ptr, size_t oldsize, size_t newsize) pfdRealloc;
977 +alias void function(void *ptr, size_t size) pfdFree;
978 +}
979 +
980 pfdSetAllocHandler dSetAllocHandler;
981 pfdSetReallocHandler dSetReallocHandler;
982 pfdSetFreeHandler dSetFreeHandler;
983 -
984 -/* get current memory management functions */
985 -typedef dAllocFunction* function() pfdGetAllocHandler;
986 -typedef dReallocFunction* function() pfdGetReallocHandler;
987 -typedef dFreeFunction* function() pfdGetFreeHandler;
988 pfdGetAllocHandler dGetAllocHandler;
989 pfdGetReallocHandler dGetReallocHandler;
990 pfdGetFreeHandler dGetFreeHandler;
991 -
992 -/* allocate and free memory. */
993 -typedef void* function(size_t size) pfdAlloc;
994 -typedef void* function(void* ptr, size_t oldsize, size_t newsize) pfdRealloc;
995 -typedef void function(void *ptr, size_t size) pfdFree;
996 pfdAlloc dAlloc;
997 pfdRealloc dRealloc;
998 pfdFree dFree;
999 Index: DerelictODE/derelict/ode/timer.d
1000 ===================================================================
1001 --- DerelictODE/derelict/ode/timer.d (revision 318)
1002 +++ DerelictODE/derelict/ode/timer.d (working copy)
1003 @@ -57,44 +57,46 @@
1004 //==============================================================================
1005 // FUNCTIONS
1006 //==============================================================================
1007 -extern(C):
1008 +extern(C) {
1010 /* set a vector/matrix of size n to all zeros, or to a specific value. */
1011 -typedef void function(dStopwatch*) pfdStopwatchReset;
1012 -typedef void function(dStopwatch*) pfdStopwatchStart;
1013 -typedef void function(dStopwatch*) pfdStopwatchStop;
1014 -typedef void function(dStopwatch*) pfdStopwatchTime;
1015 -pfdStopwatchReset dStopwatchReset;
1016 -pfdStopwatchStart dStopwatchStart;
1017 -pfdStopwatchStop dStopwatchStop;
1018 -pfdStopwatchTime dStopwatchTime; /* returns total time in secs */
1019 +alias void function(dStopwatch*) pfdStopwatchReset;
1020 +alias void function(dStopwatch*) pfdStopwatchStart;
1021 +alias void function(dStopwatch*) pfdStopwatchStop;
1022 +alias void function(dStopwatch*) pfdStopwatchTime;
1024 /* code timers */
1025 -typedef void function(char* description) pfdTimerStart;
1026 -typedef void function(char* description) pfdTimerNow;
1027 -typedef void function() pfdTimerEnd;
1028 -pfdTimerStart dTimerStart; /* pass a static string here */
1029 -pfdTimerNow dTimerNow; /* pass a static string here */
1030 -pfdTimerEnd dTimerEnd; /* pass a static string here */
1031 +alias void function(char* description) pfdTimerStart;
1032 +alias void function(char* description) pfdTimerNow;
1033 +alias void function() pfdTimerEnd;
1035 /* print out a timer report. if `average' is nonzero, print out the average
1036 * time for each slot (this is only meaningful if the same start-now-end
1037 * calls are being made repeatedly.
1038 */
1039 -typedef void function(FILE* fout, int average) pfdTimerReport;
1040 -pfdTimerReport dTimerReport;
1041 +alias void function(FILE* fout, int average) pfdTimerReport;
1043 /* resolution */
1044 /* returns the timer ticks per second implied by the timing hardware or API.
1045 * the actual timer resolution may not be this great.
1046 */
1047 -typedef double function() pfdTimerTicksPerSecond;
1048 -pfdTimerTicksPerSecond dTimerTicksPerSecond;
1049 +alias double function() pfdTimerTicksPerSecond;
1051 /* returns an estimate of the actual timer resolution, in seconds. this may
1052 * be greater than 1/ticks_per_second.
1053 */
1054 -typedef double function() pfdTimerResolution;
1055 +alias double function() pfdTimerResolution;
1056 +}
1057 +
1058 +pfdStopwatchReset dStopwatchReset;
1059 +pfdStopwatchStart dStopwatchStart;
1060 +pfdStopwatchStop dStopwatchStop;
1061 +pfdStopwatchTime dStopwatchTime; /* returns total time in secs */
1062 +pfdTimerStart dTimerStart; /* pass a static string here */
1063 +pfdTimerNow dTimerNow; /* pass a static string here */
1064 +pfdTimerEnd dTimerEnd; /* pass a static string here */
1065 +pfdTimerReport dTimerReport;
1066 +pfdTimerTicksPerSecond dTimerTicksPerSecond;
1067 pfdTimerResolution dTimerResolution;
1070 Index: DerelictODE/derelict/ode/odemath.d
1071 ===================================================================
1072 --- DerelictODE/derelict/ode/odemath.d (revision 318)
1073 +++ DerelictODE/derelict/ode/odemath.d (working copy)
1074 @@ -100,15 +100,13 @@
1075 /* all user defined error functions have this type. error and debug functions
1076 * should not return.
1077 */
1078 -extern(C):
1079 +extern(C) {
1081 /*
1082 * normalize 3x1 and 4x1 vectors (i.e. scale them to unit length)
1083 */
1084 -typedef void function(dVector3 a) pfdNormalize3;
1085 -pfdNormalize3 dNormalize3;
1086 -typedef void function(dVector4 a) pfdNormalize4;
1087 -pfdNormalize4 dNormalize4;
1088 +alias void function(dVector3 a) pfdNormalize3;
1089 +alias void function(dVector4 a) pfdNormalize4;
1091 /*
1092 * given a unit length "normal" vector n, generate vectors p and q vectors
1093 @@ -117,7 +115,11 @@
1094 * q will equal n x p. if n is not unit length then p will be unit length but
1095 * q wont be.
1096 */
1097 -typedef void function(dVector3 n, dVector3 p, dVector3 q) pfdPlaneSpace;
1098 +alias void function(dVector3 n, dVector3 p, dVector3 q) pfdPlaneSpace;
1099 +}
1100 +
1101 +pfdNormalize3 dNormalize3;
1102 +pfdNormalize4 dNormalize4;
1103 pfdPlaneSpace dPlaneSpace;
1106 Index: DerelictODE/derelict/ode/collision_trimesh.d
1107 ===================================================================
1108 --- DerelictODE/derelict/ode/collision_trimesh.d (revision 318)
1109 +++ DerelictODE/derelict/ode/collision_trimesh.d (working copy)
1110 @@ -45,97 +45,76 @@
1111 * Data storage for triangle meshes.
1112 */
1113 struct dxTriMeshData {}
1114 -typedef dxTriMeshData* dTriMeshDataID;
1115 +alias dxTriMeshData* dTriMeshDataID;
1117 enum {
1118 TRIMESH_FACE_NORMALS
1119 }
1121 -extern(C):
1122 +extern(C) {
1124 /*
1125 * These dont make much sense now, but they will later when we add more
1126 * features.
1127 */
1128 -typedef dTriMeshDataID function() pfdGeomTriMeshDataCreate;
1129 -pfdGeomTriMeshDataCreate dGeomTriMeshDataCreate;
1130 +alias dTriMeshDataID function() pfdGeomTriMeshDataCreate;
1131 +alias void function(dTriMeshDataID g) pfdGeomTriMeshDataDestroy;
1132 +alias void function(dTriMeshDataID g, int data_id, void* in_data) pfdGeomTriMeshDataSet;
1133 +alias void* function(dTriMeshDataID g, int data_id) pfdGeomTriMeshDataGet;
1135 -typedef void function(dTriMeshDataID g) pfdGeomTriMeshDataDestroy;
1136 -pfdGeomTriMeshDataDestroy dGeomTriMeshDataDestroy;
1137 -
1138 -typedef void function(dTriMeshDataID g, int data_id, void* in_data) pfdGeomTriMeshDataSet;
1139 -pfdGeomTriMeshDataSet dGeomTriMeshDataSet;
1140 -typedef void* function(dTriMeshDataID g, int data_id) pfdGeomTriMeshDataGet;
1141 -pfdGeomTriMeshDataGet dGeomTriMeshDataGet;
1142 -
1143 /**
1144 * We need to set the last transform after each time step for
1145 * accurate collision response. These functions get and set that transform.
1146 * It is stored per geom instance, rather than per dTriMeshDataID.
1147 */
1148 -typedef void function(dGeomID g, dMatrix4 last_trans) pfdGeomTriMeshSetLastTransform;
1149 -pfdGeomTriMeshSetLastTransform dGeomTriMeshSetLastTransform;
1150 -typedef dReal* function(dGeomID g) pfdGeomTriMeshGetLastTransform;
1151 -pfdGeomTriMeshGetLastTransform dGeomTriMeshGetLastTransform;
1152 +alias void function(dGeomID g, dMatrix4 last_trans) pfdGeomTriMeshSetLastTransform;
1153 +alias dReal* function(dGeomID g) pfdGeomTriMeshGetLastTransform;
1155 /*
1156 * Build TriMesh data with single pricision used in vertex data .
1157 */
1158 -typedef void function(dTriMeshDataID g, void* Vertices, int VertexStride, int VertexCount, void* Indices, int IndexCount, int TriStride) pfdGeomTriMeshDataBuildSingle;
1159 -pfdGeomTriMeshDataBuildSingle dGeomTriMeshDataBuildSingle;
1160 +alias void function(dTriMeshDataID g, void* Vertices, int VertexStride, int VertexCount, void* Indices, int IndexCount, int TriStride) pfdGeomTriMeshDataBuildSingle;
1161 /* same again with a normals array (used as trimesh-trimesh optimization) */
1162 -typedef void function(dTriMeshDataID g, void* Vertices, int VertexStride, int VertexCount, void* Indices, int IndexCount, int TriStride, void* Normals) pfdGeomTriMeshDataBuildSingle1;
1163 -pfdGeomTriMeshDataBuildSingle1 dGeomTriMeshDataBuildSingle1;
1164 +alias void function(dTriMeshDataID g, void* Vertices, int VertexStride, int VertexCount, void* Indices, int IndexCount, int TriStride, void* Normals) pfdGeomTriMeshDataBuildSingle1;
1165 /*
1166 * Build TriMesh data with double pricision used in vertex data .
1167 */
1168 -typedef void function(dTriMeshDataID g, void* Vertices, int VertexStride, int VertexCount, void* Indices, int IndexCount, int TriStride) pfdGeomTriMeshDataBuildDouble;
1169 -pfdGeomTriMeshDataBuildDouble dGeomTriMeshDataBuildDouble;
1170 +alias void function(dTriMeshDataID g, void* Vertices, int VertexStride, int VertexCount, void* Indices, int IndexCount, int TriStride) pfdGeomTriMeshDataBuildDouble;
1171 /* same again with a normals array (used as trimesh-trimesh optimization) */
1172 -typedef void function(dTriMeshDataID g, void* Vertices, int VertexStride, int VertexCount, void* Indices, int IndexCount, int TriStride, void* Normals) pfdGeomTriMeshDataBuildDouble1;
1173 -pfdGeomTriMeshDataBuildDouble1 dGeomTriMeshDataBuildDouble1;
1174 +alias void function(dTriMeshDataID g, void* Vertices, int VertexStride, int VertexCount, void* Indices, int IndexCount, int TriStride, void* Normals) pfdGeomTriMeshDataBuildDouble1;
1176 /*
1177 * Simple build. Single/double precision based on dSINGLE/dDOUBLE!
1178 */
1179 -typedef void function(dTriMeshDataID g, dReal* Vertices, int VertexCount, int* Indices, int IndexCount) pfdGeomTriMeshDataBuildSimple;
1180 -pfdGeomTriMeshDataBuildSimple dGeomTriMeshDataBuildSimple;
1181 +alias void function(dTriMeshDataID g, dReal* Vertices, int VertexCount, int* Indices, int IndexCount) pfdGeomTriMeshDataBuildSimple;
1182 /* same again with a normals array (used as trimesh-trimesh optimization) */
1183 -typedef void function(dTriMeshDataID g, dReal* Vertices, int VertexCount, int* Indices, int IndexCount, int* Normals) pfdGeomTriMeshDataBuildSimple1;
1184 -pfdGeomTriMeshDataBuildSimple1 dGeomTriMeshDataBuildSimple1;
1185 +alias void function(dTriMeshDataID g, dReal* Vertices, int VertexCount, int* Indices, int IndexCount, int* Normals) pfdGeomTriMeshDataBuildSimple1;
1187 /* Preprocess the trimesh data to remove mark unnecessary edges and vertices */
1188 -typedef void function(dTriMeshDataID g) pfdGeomTriMeshDataPreprocess;
1189 -pfdGeomTriMeshDataPreprocess dGeomTriMeshDataPreprocess;
1190 +alias void function(dTriMeshDataID g) pfdGeomTriMeshDataPreprocess;
1192 /* Get and set the internal preprocessed trimesh data buffer, for loading and saving */
1193 -typedef void function(dTriMeshDataID g, ubyte** buf, int* bufLen) pfdGeomTriMeshDataGetBuffer;
1194 -pfdGeomTriMeshDataGetBuffer dGeomTriMeshDataGetBuffer;
1195 -typedef void function(dTriMeshDataID g, ubyte* buf) pfdGeomTriMeshDataSetBuffer;
1196 -pfdGeomTriMeshDataSetBuffer dGeomTriMeshDataSetBuffer;
1197 +alias void function(dTriMeshDataID g, ubyte** buf, int* bufLen) pfdGeomTriMeshDataGetBuffer;
1198 +alias void function(dTriMeshDataID g, ubyte* buf) pfdGeomTriMeshDataSetBuffer;
1201 /*
1202 * Per triangle callback. Allows the user to say if he wants a collision with
1203 * a particular triangle.
1204 */
1205 -typedef int function(dGeomID TriMesh, dGeomID RefObject, int TriangleIndex) dTriCallback;
1206 +alias int function(dGeomID TriMesh, dGeomID RefObject, int TriangleIndex) dTriCallback;
1208 -typedef void function(dGeomID g, dTriCallback* Callback) pfdGeomTriMeshSetCallback;
1209 -pfdGeomTriMeshSetCallback dGeomTriMeshSetCallback;
1210 -typedef dTriCallback* function(dGeomID g) pfdGeomTriMeshGetCallback;
1211 -pfdGeomTriMeshGetCallback dGeomTriMeshGetCallback;
1212 +alias void function(dGeomID g, dTriCallback* Callback) pfdGeomTriMeshSetCallback;
1213 +alias dTriCallback* function(dGeomID g) pfdGeomTriMeshGetCallback;
1215 /*
1216 * Per object callback. Allows the user to get the list of triangles in 1
1217 * shot. Maybe we should remove this one.
1218 */
1219 -typedef void function(dGeomID TriMesh, dGeomID RefObject, int* TriIndices, int TriCount) dTriArrayCallback;
1220 +alias void function(dGeomID TriMesh, dGeomID RefObject, int* TriIndices, int TriCount) dTriArrayCallback;
1222 -typedef void function(dGeomID g, dTriArrayCallback* ArrayCallback) pfdGeomTriMeshSetArrayCallback;
1223 -pfdGeomTriMeshSetArrayCallback dGeomTriMeshSetArrayCallback;
1224 -typedef dTriArrayCallback* function(dGeomID g) pfdGeomTriMeshGetArrayCallback;
1225 -pfdGeomTriMeshGetArrayCallback dGeomTriMeshGetArrayCallback;
1226 +alias void function(dGeomID g, dTriArrayCallback* ArrayCallback) pfdGeomTriMeshSetArrayCallback;
1227 +alias dTriArrayCallback* function(dGeomID g) pfdGeomTriMeshGetArrayCallback;
1229 /*
1230 * Ray callback.
1231 @@ -143,31 +122,24 @@
1232 * coords. The user can for example sample a texture with alpha transparency
1233 * to determine if a collision should occur.
1234 */
1235 -typedef int function(dGeomID TriMesh, dGeomID Ray, int TriangleIndex, dReal u, dReal v) dTriRayCallback;
1236 +alias int function(dGeomID TriMesh, dGeomID Ray, int TriangleIndex, dReal u, dReal v) dTriRayCallback;
1238 -typedef void function(dGeomID g, dTriRayCallback* Callback) pfdGeomTriMeshSetRayCallback;
1239 -pfdGeomTriMeshSetRayCallback dGeomTriMeshSetRayCallback;
1240 -typedef dTriRayCallback* function(dGeomID g) pfdGeomTriMeshGetRayCallback;
1241 -pfdGeomTriMeshGetRayCallback dGeomTriMeshGetRayCallback;
1242 +alias void function(dGeomID g, dTriRayCallback* Callback) pfdGeomTriMeshSetRayCallback;
1243 +alias dTriRayCallback* function(dGeomID g) pfdGeomTriMeshGetRayCallback;
1245 /*
1246 * Trimesh class
1247 * Construction. Callbacks are optional.
1248 */
1249 -typedef dGeomID function(dSpaceID space, dTriMeshDataID Data, dTriCallback* Callback, dTriArrayCallback* ArrayCallback, dTriRayCallback* RayCallback) pfdCreateTriMesh;
1250 -pfdCreateTriMesh dCreateTriMesh;
1251 +alias dGeomID function(dSpaceID space, dTriMeshDataID Data, dTriCallback* Callback, dTriArrayCallback* ArrayCallback, dTriRayCallback* RayCallback) pfdCreateTriMesh;
1253 -typedef void function(dGeomID g, dTriMeshDataID Data) pfdGeomTriMeshSetData;
1254 -pfdGeomTriMeshSetData dGeomTriMeshSetData;
1255 -typedef dTriMeshDataID function(dGeomID g) pfdGeomTriMeshGetData;
1256 -pfdGeomTriMeshGetData dGeomTriMeshGetData;
1257 +alias void function(dGeomID g, dTriMeshDataID Data) pfdGeomTriMeshSetData;
1258 +alias dTriMeshDataID function(dGeomID g) pfdGeomTriMeshGetData;
1261 // enable/disable/check temporal coherence
1262 -typedef void function(dGeomID g, int geomClass, int enable) pfdGeomTriMeshEnableTC;
1263 -pfdGeomTriMeshEnableTC dGeomTriMeshEnableTC;
1264 -typedef int function(dGeomID g, int geomClass) pfdGeomTriMeshIsTCEnabled;
1265 -pfdGeomTriMeshIsTCEnabled dGeomTriMeshIsTCEnabled;
1266 +alias void function(dGeomID g, int geomClass, int enable) pfdGeomTriMeshEnableTC;
1267 +alias int function(dGeomID g, int geomClass) pfdGeomTriMeshIsTCEnabled;
1269 /*
1270 * Clears the internal temporal coherence caches. When a geom has its
1271 @@ -175,28 +147,24 @@
1272 * With large worlds with lots of seperate objects this list could get huge.
1273 * We should be able to do this automagically.
1274 */
1275 -typedef void function(dGeomID g) pfdGeomTriMeshClearTCCache;
1276 -pfdGeomTriMeshClearTCCache dGeomTriMeshClearTCCache;
1277 +alias void function(dGeomID g) pfdGeomTriMeshClearTCCache;
1280 /*
1281 * returns the TriMeshDataID
1282 */
1283 -typedef dTriMeshDataID function(dGeomID g) pfdGeomTriMeshGetTriMeshDataID;
1284 -pfdGeomTriMeshGetTriMeshDataID dGeomTriMeshGetTriMeshDataID;
1285 +alias dTriMeshDataID function(dGeomID g) pfdGeomTriMeshGetTriMeshDataID;
1287 /*
1288 * Gets a triangle.
1289 */
1290 -typedef void function(dGeomID g, int Index, dVector3* v0, dVector3* v1, dVector3* v2) pfdGeomTriMeshGetTriangle;
1291 -pfdGeomTriMeshGetTriangle dGeomTriMeshGetTriangle;
1292 +alias void function(dGeomID g, int Index, dVector3* v0, dVector3* v1, dVector3* v2) pfdGeomTriMeshGetTriangle;
1294 /*
1295 * Gets the point on the requested triangle and the given barycentric
1296 * coordinates.
1297 */
1298 -typedef void function(dGeomID g, int Index, dReal u, dReal v, dVector3 Out) pfdGeomTriMeshGetPoint;
1299 -pfdGeomTriMeshGetPoint dGeomTriMeshGetPoint;
1300 +alias void function(dGeomID g, int Index, dReal u, dReal v, dVector3 Out) pfdGeomTriMeshGetPoint;
1302 /*
1304 @@ -217,9 +185,41 @@
1305 */
1308 -typedef int function(dGeomID g) pfdGeomTriMeshGetTriangleCount;
1309 +alias int function(dGeomID g) pfdGeomTriMeshGetTriangleCount;
1310 +
1311 +alias void function(dTriMeshDataID g) pfdGeomTriMeshDataUpdate;
1312 +}
1313 +
1314 +pfdGeomTriMeshDataCreate dGeomTriMeshDataCreate;
1315 +pfdGeomTriMeshDataDestroy dGeomTriMeshDataDestroy;
1316 +pfdGeomTriMeshDataSet dGeomTriMeshDataSet;
1317 +pfdGeomTriMeshDataGet dGeomTriMeshDataGet;
1318 +
1319 +pfdGeomTriMeshSetLastTransform dGeomTriMeshSetLastTransform;
1320 +pfdGeomTriMeshGetLastTransform dGeomTriMeshGetLastTransform;
1321 +pfdGeomTriMeshDataBuildSingle dGeomTriMeshDataBuildSingle;
1322 +pfdGeomTriMeshDataBuildSingle1 dGeomTriMeshDataBuildSingle1;
1323 +pfdGeomTriMeshDataBuildDouble dGeomTriMeshDataBuildDouble;
1324 +pfdGeomTriMeshDataBuildDouble1 dGeomTriMeshDataBuildDouble1;
1325 +pfdGeomTriMeshDataBuildSimple dGeomTriMeshDataBuildSimple;
1326 +pfdGeomTriMeshDataBuildSimple1 dGeomTriMeshDataBuildSimple1;
1327 +pfdGeomTriMeshDataPreprocess dGeomTriMeshDataPreprocess;
1328 +pfdGeomTriMeshDataGetBuffer dGeomTriMeshDataGetBuffer;
1329 +pfdGeomTriMeshDataSetBuffer dGeomTriMeshDataSetBuffer;
1330 +pfdGeomTriMeshSetCallback dGeomTriMeshSetCallback;
1331 +pfdGeomTriMeshGetCallback dGeomTriMeshGetCallback;
1332 +pfdGeomTriMeshSetArrayCallback dGeomTriMeshSetArrayCallback;
1333 +pfdGeomTriMeshGetArrayCallback dGeomTriMeshGetArrayCallback;
1334 +pfdGeomTriMeshSetRayCallback dGeomTriMeshSetRayCallback;
1335 +pfdGeomTriMeshGetRayCallback dGeomTriMeshGetRayCallback;
1336 +pfdCreateTriMesh dCreateTriMesh;
1337 +pfdGeomTriMeshSetData dGeomTriMeshSetData;
1338 +pfdGeomTriMeshGetData dGeomTriMeshGetData;
1339 +pfdGeomTriMeshEnableTC dGeomTriMeshEnableTC;
1340 +pfdGeomTriMeshIsTCEnabled dGeomTriMeshIsTCEnabled;
1341 +pfdGeomTriMeshClearTCCache dGeomTriMeshClearTCCache;
1342 +pfdGeomTriMeshGetTriMeshDataID dGeomTriMeshGetTriMeshDataID;
1343 +pfdGeomTriMeshGetTriangle dGeomTriMeshGetTriangle;
1344 +pfdGeomTriMeshGetPoint dGeomTriMeshGetPoint;
1345 pfdGeomTriMeshGetTriangleCount dGeomTriMeshGetTriangleCount;
1346 -
1347 -typedef void function(dTriMeshDataID g) pfdGeomTriMeshDataUpdate;
1348 pfdGeomTriMeshDataUpdate dGeomTriMeshDataUpdate;
1349 -
1350 Index: DerelictODE/derelict/ode/objects.d
1351 ===================================================================
1352 --- DerelictODE/derelict/ode/objects.d (revision 318)
1353 +++ DerelictODE/derelict/ode/objects.d (working copy)
1354 @@ -67,7 +67,7 @@
1355 * @return an identifier
1356 * @ingroup world
1357 */
1358 -typedef dWorldID function() pfdWorldCreate;
1359 +extern(C) alias dWorldID function() pfdWorldCreate;
1360 pfdWorldCreate dWorldCreate;
1362 /**
1363 @@ -79,7 +79,7 @@
1364 * @ingroup world
1365 * @param world the identifier for the world the be destroyed.
1366 */
1367 -typedef void function(dWorldID world) pfdWorldDestroy;
1368 +extern(C) alias void function(dWorldID world) pfdWorldDestroy;
1369 pfdWorldDestroy dWorldDestroy;
1372 @@ -91,7 +91,7 @@
1373 *
1374 * @ingroup world
1375 */
1376 -typedef void function(dWorldID, dReal x, dReal y, dReal z) pfdWorldSetGravity;
1377 +extern(C) alias void function(dWorldID, dReal x, dReal y, dReal z) pfdWorldSetGravity;
1378 pfdWorldSetGravity dWorldSetGravity;
1381 @@ -99,7 +99,7 @@
1382 * @brief Get the gravity vector for a given world.
1383 * @ingroup world
1384 */
1385 -typedef void function(dWorldID, dVector3 gravity) pfdWorldGetGravity;
1386 +extern(C) alias void function(dWorldID, dVector3 gravity) pfdWorldGetGravity;
1387 pfdWorldGetGravity dWorldGetGravity;
1390 @@ -110,7 +110,7 @@
1391 * @param dWorldID the identifier of the world.
1392 * @param erp Typical values are in the range 0.1--0.8. The default is 0.2.
1393 */
1394 -typedef void function(dWorldID, dReal erp) pfdWorldSetERP;
1395 +extern(C) alias void function(dWorldID, dReal erp) pfdWorldSetERP;
1396 pfdWorldSetERP dWorldSetERP;
1398 /**
1399 @@ -118,7 +118,7 @@
1400 * @ingroup world
1401 * @return ERP value
1402 */
1403 -typedef dReal function(dWorldID) pfdWorldGetERP;
1404 +extern(C) alias dReal function(dWorldID) pfdWorldGetERP;
1405 pfdWorldGetERP dWorldGetERP;
1408 @@ -129,7 +129,7 @@
1409 * The default is 10^-5 if single precision is being used, or 10^-10
1410 * if double precision is being used.
1411 */
1412 -typedef void function(dWorldID, dReal cfm) pfdWorldSetCFM;
1413 +extern(C) alias void function(dWorldID, dReal cfm) pfdWorldSetCFM;
1414 pfdWorldSetCFM dWorldSetCFM;
1416 /**
1417 @@ -137,7 +137,7 @@
1418 * @ingroup world
1419 * @return CFM value
1420 */
1421 -typedef dReal function(dWorldID) pfdWorldGetCFM;
1422 +extern(C) alias dReal function(dWorldID) pfdWorldGetCFM;
1423 pfdWorldGetCFM dWorldGetCFM;
1426 @@ -151,7 +151,7 @@
1427 * @ingroup world
1428 * @param stepsize The number of seconds that the simulation has to advance.
1429 */
1430 -typedef void function(dWorldID, dReal stepsize) pfdWorldStep;
1431 +extern(C) alias void function(dWorldID, dReal stepsize) pfdWorldStep;
1432 pfdWorldStep dWorldStep;
1435 @@ -169,7 +169,7 @@
1436 * computation may depend on integrator parameters that are set as
1437 * properties of the world.
1438 */
1439 -typedef void function(dWorldID, dReal stepsize, dReal ix, dReal iy, dReal iz, dVector3 force) pfdWorldImpulseToForce;
1440 +extern(C) alias void function(dWorldID, dReal stepsize, dReal ix, dReal iy, dReal iz, dVector3 force) pfdWorldImpulseToForce;
1441 pfdWorldImpulseToForce dWorldImpulseToForce;
1444 @@ -204,7 +204,7 @@
1445 * Increasing the number of QuickStep iterations may help a little bit, but
1446 * it is not going to help much if your system is really near singular.
1447 */
1448 -typedef void function(dWorldID w, dReal stepsize) pfdWorldQuickStep;
1449 +extern(C) alias void function(dWorldID w, dReal stepsize) pfdWorldQuickStep;
1450 pfdWorldQuickStep dWorldQuickStep;
1453 @@ -217,7 +217,7 @@
1454 * longer to compute.
1455 * @param num The default is 20 iterations.
1456 */
1457 -typedef void function(dWorldID, int num) pfdWorldSetQuickStepNumIterations;
1458 +extern(C) alias void function(dWorldID, int num) pfdWorldSetQuickStepNumIterations;
1459 pfdWorldSetQuickStepNumIterations dWorldSetQuickStepNumIterations;
1462 @@ -227,7 +227,7 @@
1463 * @ingroup world
1464 * @return nr of iterations
1465 */
1466 -typedef int function(dWorldID) pfdWorldGetQuickStepNumIterations;
1467 +extern(C) alias int function(dWorldID) pfdWorldGetQuickStepNumIterations;
1468 pfdWorldGetQuickStepNumIterations dWorldGetQuickStepNumIterations;
1470 /**
1471 @@ -235,7 +235,7 @@
1472 * @ingroup world
1473 * @param over_relaxation value to use by SOR
1474 */
1475 -typedef void function(dWorldID, dReal over_relaxation) pfdWorldSetQuickStepW;
1476 +extern(C) alias void function(dWorldID, dReal over_relaxation) pfdWorldSetQuickStepW;
1477 pfdWorldSetQuickStepW dWorldSetQuickStepW;
1479 /**
1480 @@ -243,7 +243,7 @@
1481 * @ingroup world
1482 * @returns the over-relaxation setting
1483 */
1484 -typedef dReal function(dWorldID) pfdWorldGetQuickStepW;
1485 +extern(C) alias dReal function(dWorldID) pfdWorldGetQuickStepW;
1486 pfdWorldGetQuickStepW dWorldGetQuickStepW;
1488 /* World contact parameter functions */
1489 @@ -256,7 +256,7 @@
1490 * @remarks
1491 * Reducing this value can help prevent "popping" of deeply embedded objects.
1492 */
1493 -typedef void function(dWorldID, dReal vel) pfdWorldSetContactMaxCorrectingVel;
1494 +extern(C) alias void function(dWorldID, dReal vel) pfdWorldSetContactMaxCorrectingVel;
1495 pfdWorldSetContactMaxCorrectingVel dWorldSetContactMaxCorrectingVel;
1497 /**
1498 @@ -264,7 +264,7 @@
1499 * to generated.
1500 * @ingroup world
1501 */
1502 -typedef dReal function(dWorldID) pfdWorldGetContactMaxCorrectingVel;
1503 +extern(C) alias dReal function(dWorldID) pfdWorldGetContactMaxCorrectingVel;
1504 pfdWorldGetContactMaxCorrectingVel dWorldGetContactMaxCorrectingVel;
1506 /**
1507 @@ -278,7 +278,7 @@
1508 * Increasing this to some small value (e.g. 0.001) can help prevent
1509 * jittering problems due to contacts being repeatedly made and broken.
1510 */
1511 -typedef void function(dWorldID, dReal depth) pfdWorldSetContactSurfaceLayer;
1512 +extern(C) alias void function(dWorldID, dReal depth) pfdWorldSetContactSurfaceLayer;
1513 pfdWorldSetContactSurfaceLayer dWorldSetContactSurfaceLayer;
1515 /**
1516 @@ -286,7 +286,7 @@
1517 * @ingroup world
1518 * @returns the depth
1519 */
1520 -typedef dReal function(dWorldID) pfdWorldGetContactSurfaceLayer;
1521 +extern(C) alias dReal function(dWorldID) pfdWorldGetContactSurfaceLayer;
1522 pfdWorldGetContactSurfaceLayer dWorldGetContactSurfaceLayer;
1524 /* StepFast1 functions */
1525 @@ -297,7 +297,7 @@
1526 * @param maxiterations The number of iterations to perform.
1527 * @ingroup world
1528 */
1529 -typedef void function(dWorldID, dReal stepsize, int maxiterations) pfdWorldStepFast1;
1530 +extern(C) alias void function(dWorldID, dReal stepsize, int maxiterations) pfdWorldStepFast1;
1531 pfdWorldStepFast1 dWorldStepFast1;
1534 @@ -336,14 +336,14 @@
1535 * @brief Set the AutoEnableDepth parameter used by the StepFast1 algorithm.
1536 * @ingroup disable
1537 */
1538 -typedef void function(dWorldID, int autoEnableDepth) pfdWorldSetAutoEnableDepthSF1;
1539 +extern(C) alias void function(dWorldID, int autoEnableDepth) pfdWorldSetAutoEnableDepthSF1;
1540 pfdWorldSetAutoEnableDepthSF1 dWorldSetAutoEnableDepthSF1;
1542 /**
1543 * @brief Get the AutoEnableDepth parameter used by the StepFast1 algorithm.
1544 * @ingroup disable
1545 */
1546 -typedef int function(dWorldID) pfdWorldGetAutoEnableDepthSF1;
1547 +extern(C) alias int function(dWorldID) pfdWorldGetAutoEnableDepthSF1;
1548 pfdWorldGetAutoEnableDepthSF1 dWorldGetAutoEnableDepthSF1;
1550 /**
1551 @@ -351,7 +351,7 @@
1552 * @ingroup disable
1553 * @return the threshold
1554 */
1555 -typedef dReal function(dWorldID) pfdWorldGetAutoDisableLinearThreshold;
1556 +extern(C) alias dReal function(dWorldID) pfdWorldGetAutoDisableLinearThreshold;
1557 pfdWorldGetAutoDisableLinearThreshold dWorldGetAutoDisableLinearThreshold;
1559 /**
1560 @@ -359,7 +359,7 @@
1561 * @param linear_threshold default is 0.01
1562 * @ingroup disable
1563 */
1564 -typedef void function(dWorldID, dReal linear_threshold) pfdWorldSetAutoDisableLinearThreshold;
1565 +extern(C) alias void function(dWorldID, dReal linear_threshold) pfdWorldSetAutoDisableLinearThreshold;
1566 pfdWorldSetAutoDisableLinearThreshold dWorldSetAutoDisableLinearThreshold;
1568 /**
1569 @@ -367,7 +367,7 @@
1570 * @ingroup disable
1571 * @return the threshold
1572 */
1573 -typedef dReal function(dWorldID) pfdWorldGetAutoDisableAngularThreshold;
1574 +extern(C) alias dReal function(dWorldID) pfdWorldGetAutoDisableAngularThreshold;
1575 pfdWorldGetAutoDisableAngularThreshold dWorldGetAutoDisableAngularThreshold;
1577 /**
1578 @@ -375,7 +375,7 @@
1579 * @ingroup disable
1580 * @return the threshold
1581 */
1582 -typedef dReal function(dWorldID) pfdWorldGetAutoDisableLinearAverageThreshold;
1583 +extern(C) alias dReal function(dWorldID) pfdWorldGetAutoDisableLinearAverageThreshold;
1584 pfdWorldGetAutoDisableLinearAverageThreshold dWorldGetAutoDisableLinearAverageThreshold;
1586 /**
1587 @@ -383,7 +383,7 @@
1588 * @param linear_average_threshold default is 0.01
1589 * @ingroup disable
1590 */
1591 -typedef void function(dWorldID, dReal linear_average_threshold) pfdWorldSetAutoDisableLinearAverageThreshold;
1592 +extern(C) alias void function(dWorldID, dReal linear_average_threshold) pfdWorldSetAutoDisableLinearAverageThreshold;
1593 pfdWorldSetAutoDisableLinearAverageThreshold dWorldSetAutoDisableLinearAverageThreshold;
1595 /**
1596 @@ -391,7 +391,7 @@
1597 * @ingroup disable
1598 * @return the threshold
1599 */
1600 -typedef dReal function(dWorldID) pfdWorldGetAutoDisableAngularAverageThreshold;
1601 +extern(C) alias dReal function(dWorldID) pfdWorldGetAutoDisableAngularAverageThreshold;
1602 pfdWorldGetAutoDisableAngularAverageThreshold dWorldGetAutoDisableAngularAverageThreshold;
1604 /**
1605 @@ -399,7 +399,7 @@
1606 * @param linear_average_threshold default is 0.01
1607 * @ingroup disable
1608 */
1609 -typedef void function(dWorldID, dReal angular_average_threshold) pfdWorldSetAutoDisableAngularAverageThreshold;
1610 +extern(C) alias void function(dWorldID, dReal angular_average_threshold) pfdWorldSetAutoDisableAngularAverageThreshold;
1611 pfdWorldSetAutoDisableAngularAverageThreshold dWorldSetAutoDisableAngularAverageThreshold;
1613 /**
1614 @@ -407,7 +407,7 @@
1615 * @ingroup disable
1616 * @return number of samples used
1617 */
1618 -typedef int function(dWorldID) pfdWorldGetAutoDisableAverageSamplesCount;
1619 +extern(C) alias int function(dWorldID) pfdWorldGetAutoDisableAverageSamplesCount;
1620 pfdWorldGetAutoDisableAverageSamplesCount dWorldGetAutoDisableAverageSamplesCount;
1622 /**
1623 @@ -416,7 +416,7 @@
1624 * @param average_samples_count Default is 1, meaning only instantaneous velocity is used.
1625 * Set to zero to disable sampling and thus prevent any body from auto-disabling.
1626 */
1627 -typedef void function(dWorldID, uint average_samples_count) pfdWorldSetAutoDisableAverageSamplesCount;
1628 +extern(C) alias void function(dWorldID, uint average_samples_count) pfdWorldSetAutoDisableAverageSamplesCount;
1629 pfdWorldSetAutoDisableAverageSamplesCount dWorldSetAutoDisableAverageSamplesCount;
1631 /**
1632 @@ -424,7 +424,7 @@
1633 * @param linear_threshold default is 0.01
1634 * @ingroup disable
1635 */
1636 -typedef void function(dWorldID, dReal angular_threshold) pfdWorldSetAutoDisableAngularThreshold;
1637 +extern(C) alias void function(dWorldID, dReal angular_threshold) pfdWorldSetAutoDisableAngularThreshold;
1638 pfdWorldSetAutoDisableAngularThreshold dWorldSetAutoDisableAngularThreshold;
1640 /**
1641 @@ -432,7 +432,7 @@
1642 * @ingroup disable
1643 * @return nr of steps
1644 */
1645 -typedef int function(dWorldID) pfdWorldGetAutoDisableSteps;
1646 +extern(C) alias int function(dWorldID) pfdWorldGetAutoDisableSteps;
1647 pfdWorldGetAutoDisableSteps dWorldGetAutoDisableSteps;
1649 /**
1650 @@ -440,7 +440,7 @@
1651 * @ingroup disable
1652 * @param steps default is 10
1653 */
1654 -typedef void function(dWorldID, int steps) pfdWorldSetAutoDisableSteps;
1655 +extern(C) alias void function(dWorldID, int steps) pfdWorldSetAutoDisableSteps;
1656 pfdWorldSetAutoDisableSteps dWorldSetAutoDisableSteps;
1658 /**
1659 @@ -448,7 +448,7 @@
1660 * @ingroup disable
1661 * @return nr of seconds
1662 */
1663 -typedef dReal function(dWorldID) pfdWorldGetAutoDisableTime;
1664 +extern(C) alias dReal function(dWorldID) pfdWorldGetAutoDisableTime;
1665 pfdWorldGetAutoDisableTime dWorldGetAutoDisableTime;
1667 /**
1668 @@ -456,7 +456,7 @@
1669 * @ingroup disable
1670 * @param time default is 0 seconds
1671 */
1672 -typedef void function(dWorldID, dReal time) pfdWorldSetAutoDisableTime;
1673 +extern(C) alias void function(dWorldID, dReal time) pfdWorldSetAutoDisableTime;
1674 pfdWorldSetAutoDisableTime dWorldSetAutoDisableTime;
1676 /**
1677 @@ -464,7 +464,7 @@
1678 * @ingroup disable
1679 * @return 0 or 1
1680 */
1681 -typedef int function(dWorldID) pfdWorldGetAutoDisableFlag;
1682 +extern(C) alias int function(dWorldID) pfdWorldGetAutoDisableFlag;
1683 pfdWorldGetAutoDisableFlag dWorldGetAutoDisableFlag;
1685 /**
1686 @@ -472,7 +472,7 @@
1687 * @ingroup disable
1688 * @param do_auto_disable default is false.
1689 */
1690 -typedef void function(dWorldID, int do_auto_disable) pfdWorldSetAutoDisableFlag;
1691 +extern(C) alias void function(dWorldID, int do_auto_disable) pfdWorldSetAutoDisableFlag;
1692 pfdWorldSetAutoDisableFlag dWorldSetAutoDisableFlag;
1695 @@ -515,7 +515,7 @@
1696 * @ingroup bodies
1697 * @return the threshold
1698 */
1699 -typedef dReal function(dBodyID) pfdBodyGetAutoDisableLinearThreshold;
1700 +extern(C) alias dReal function(dBodyID) pfdBodyGetAutoDisableLinearThreshold;
1701 pfdBodyGetAutoDisableLinearThreshold dBodyGetAutoDisableLinearThreshold;
1703 /**
1704 @@ -523,7 +523,7 @@
1705 * @ingroup bodies
1706 * @return the threshold
1707 */
1708 -typedef void function(dBodyID, dReal linear_average_threshold) pfdBodySetAutoDisableLinearThreshold;
1709 +extern(C) alias void function(dBodyID, dReal linear_average_threshold) pfdBodySetAutoDisableLinearThreshold;
1710 pfdBodySetAutoDisableLinearThreshold dBodySetAutoDisableLinearThreshold;
1712 /**
1713 @@ -531,7 +531,7 @@
1714 * @ingroup bodies
1715 * @return the threshold
1716 */
1717 -typedef dReal function(dBodyID) pfdBodyGetAutoDisableAngularThreshold;
1718 +extern(C) alias dReal function(dBodyID) pfdBodyGetAutoDisableAngularThreshold;
1719 pfdBodyGetAutoDisableAngularThreshold dBodyGetAutoDisableAngularThreshold;
1721 /**
1722 @@ -539,7 +539,7 @@
1723 * @ingroup bodies
1724 * @return the threshold
1725 */
1726 -typedef void function(dBodyID, dReal angular_average_threshold) pfdBodySetAutoDisableAngularThreshold;
1727 +extern(C) alias void function(dBodyID, dReal angular_average_threshold) pfdBodySetAutoDisableAngularThreshold;
1728 pfdBodySetAutoDisableAngularThreshold dBodySetAutoDisableAngularThreshold;
1730 /**
1731 @@ -547,7 +547,7 @@
1732 * @ingroup bodies
1733 * @return the nr of steps/size.
1734 */
1735 -typedef int function(dBodyID) pfdBodyGetAutoDisableAverageSamplesCount;
1736 +extern(C) alias int function(dBodyID) pfdBodyGetAutoDisableAverageSamplesCount;
1737 pfdBodyGetAutoDisableAverageSamplesCount dBodyGetAutoDisableAverageSamplesCount;
1739 /**
1740 @@ -555,7 +555,7 @@
1741 * @ingroup bodies
1742 * @param average_samples_count the nr of samples to review.
1743 */
1744 -typedef void function(dBodyID, uint average_samples_count) pfdBodySetAutoDisableAverageSamplesCount;
1745 +extern(C) alias void function(dBodyID, uint average_samples_count) pfdBodySetAutoDisableAverageSamplesCount;
1746 pfdBodySetAutoDisableAverageSamplesCount dBodySetAutoDisableAverageSamplesCount;
1748 /**
1749 @@ -563,7 +563,7 @@
1750 * @ingroup bodies
1751 * @return the nr of steps
1752 */
1753 -typedef int function(dBodyID) pfdBodyGetAutoDisableSteps;
1754 +extern(C) alias int function(dBodyID) pfdBodyGetAutoDisableSteps;
1755 pfdBodyGetAutoDisableSteps dBodyGetAutoDisableSteps;
1757 /**
1758 @@ -571,7 +571,7 @@
1759 * @ingroup bodies
1760 * @param steps the nr of steps.
1761 */
1762 -typedef void function(dBodyID, int steps) pfdBodySetAutoDisableSteps;
1763 +extern(C) alias void function(dBodyID, int steps) pfdBodySetAutoDisableSteps;
1764 pfdBodySetAutoDisableSteps dBodySetAutoDisableSteps;
1766 /**
1767 @@ -579,7 +579,7 @@
1768 * @ingroup bodies
1769 * @return nr of seconds
1770 */
1771 -typedef dReal function(dBodyID) pfdBodyGetAutoDisableTime;
1772 +extern(C) alias dReal function(dBodyID) pfdBodyGetAutoDisableTime;
1773 pfdBodyGetAutoDisableTime dBodyGetAutoDisableTime;
1775 /**
1776 @@ -587,7 +587,7 @@
1777 * @ingroup bodies
1778 * @param time nr of seconds.
1779 */
1780 -typedef void function(dBodyID, dReal time) pfdBodySetAutoDisableTime;
1781 +extern(C) alias void function(dBodyID, dReal time) pfdBodySetAutoDisableTime;
1782 pfdBodySetAutoDisableTime dBodySetAutoDisableTime;
1784 /**
1785 @@ -595,7 +595,7 @@
1786 * @ingroup bodies
1787 * @return 0 or 1
1788 */
1789 -typedef int function(dBodyID) pfdBodyGetAutoDisableFlag;
1790 +extern(C) alias int function(dBodyID) pfdBodyGetAutoDisableFlag;
1791 pfdBodyGetAutoDisableFlag dBodyGetAutoDisableFlag;
1793 /**
1794 @@ -603,7 +603,7 @@
1795 * @ingroup bodies
1796 * @param do_auto_disable 0 or 1
1797 */
1798 -typedef void function(dBodyID, int do_auto_disable) pfdBodySetAutoDisableFlag;
1799 +extern(C) alias void function(dBodyID, int do_auto_disable) pfdBodySetAutoDisableFlag;
1800 pfdBodySetAutoDisableFlag dBodySetAutoDisableFlag;
1802 /**
1803 @@ -612,7 +612,7 @@
1804 * Set the values for the body to those set as default for the world.
1805 * @ingroup bodies
1806 */
1807 -typedef void function(dBodyID) pfdBodySetAutoDisableDefaults;
1808 +extern(C) alias void function(dBodyID) pfdBodySetAutoDisableDefaults;
1809 pfdBodySetAutoDisableDefaults dBodySetAutoDisableDefaults;
1811 /**
1812 @@ -621,7 +621,7 @@
1813 *
1814 * @ingroup bodies
1815 */
1816 -typedef dWorldID function(dBodyID) pfdBodyGetWorld;
1817 +extern(C) alias dWorldID function(dBodyID) pfdBodyGetWorld;
1818 pfdBodyGetWorld dBodyGetWorld;
1821 @@ -631,7 +631,7 @@
1822 * Default mass parameters are at position (0,0,0).
1823 * @ingroup bodies
1824 */
1825 -typedef dBodyID function(dWorldID) pfdBodyCreate;
1826 +extern(C) alias dBodyID function(dWorldID) pfdBodyCreate;
1827 pfdBodyCreate dBodyCreate;
1829 /**
1830 @@ -642,7 +642,7 @@
1831 * deleted.
1832 * @ingroup bodies
1833 */
1834 -typedef void function(dBodyID) pfdBodyDestroy;
1835 +extern(C) alias void function(dBodyID) pfdBodyDestroy;
1836 pfdBodyDestroy dBodyDestroy;
1838 /**
1839 @@ -650,7 +650,7 @@
1840 * @ingroup bodies
1841 * @param data arbitraty pointer
1842 */
1843 -typedef void function(dBodyID, void *data) pfdBodySetData;
1844 +extern(C) alias void function(dBodyID, void *data) pfdBodySetData;
1845 pfdBodySetData dBodySetData;
1847 /**
1848 @@ -658,7 +658,7 @@
1849 * @ingroup bodies
1850 * @return a pointer to the user's data.
1851 */
1852 -typedef void* function(dBodyID) pfdBodyGetData;
1853 +extern(C) alias void* function(dBodyID) pfdBodyGetData;
1854 pfdBodyGetData dBodyGetData;
1856 /**
1857 @@ -669,7 +669,7 @@
1858 * that are present.
1859 * @ingroup bodies
1860 */
1861 -typedef void function(dBodyID, dReal x, dReal y, dReal z) pfdBodySetPosition;
1862 +extern(C) alias void function(dBodyID, dReal x, dReal y, dReal z) pfdBodySetPosition;
1863 pfdBodySetPosition dBodySetPosition;
1865 /**
1866 @@ -680,7 +680,7 @@
1867 * if the new configuration is inconsistent with the joints/constraints
1868 * that are present.
1869 */
1870 -typedef void function(dBodyID, dMatrix3 R) pfdBodySetRotation;
1871 +extern(C) alias void function(dBodyID, dMatrix3 R) pfdBodySetRotation;
1872 pfdBodySetRotation dBodySetRotation;
1874 /**
1875 @@ -691,21 +691,21 @@
1876 * if the new configuration is inconsistent with the joints/constraints
1877 * that are present.
1878 */
1879 -typedef void function(dBodyID, dQuaternion q) pfdBodySetQuaternion;
1880 +extern(C) alias void function(dBodyID, dQuaternion q) pfdBodySetQuaternion;
1881 pfdBodySetQuaternion dBodySetQuaternion;
1883 /**
1884 * @brief Set the linear velocity of a body.
1885 * @ingroup bodies
1886 */
1887 -typedef void function(dBodyID, dReal x, dReal y, dReal z) pfdBodySetLinearVel;
1888 +extern(C) alias void function(dBodyID, dReal x, dReal y, dReal z) pfdBodySetLinearVel;
1889 pfdBodySetLinearVel dBodySetLinearVel;
1891 /**
1892 * @brief Set the angular velocity of a body.
1893 * @ingroup bodies
1894 */
1895 -typedef void function(dBodyID, dReal x, dReal y, dReal z) pfdBodySetAngularVel;
1896 +extern(C) alias void function(dBodyID, dReal x, dReal y, dReal z) pfdBodySetAngularVel;
1897 pfdBodySetAngularVel dBodySetAngularVel;
1899 /**
1900 @@ -717,7 +717,7 @@
1901 * system structure.
1902 * @sa dBodyCopyPosition
1903 */
1904 -typedef dReal* function(dBodyID) pfdBodyGetPosition;
1905 +extern(C) alias dReal* function(dBodyID) pfdBodyGetPosition;
1906 pfdBodyGetPosition dBodyGetPosition;
1909 @@ -728,7 +728,7 @@
1910 * @param pos a copy of the body position
1911 * @sa dBodyGetPosition
1912 */
1913 -typedef void function(dBodyID bodyid, dVector3 pos) pfdBodyCopyPosition;
1914 +extern(C) alias void function(dBodyID bodyid, dVector3 pos) pfdBodyCopyPosition;
1915 pfdBodyCopyPosition dBodyCopyPosition;
1918 @@ -737,7 +737,7 @@
1919 * @ingroup bodies
1920 * @return pointer to a 4x3 rotation matrix.
1921 */
1922 -typedef dReal* function(dBodyID) pfdBodyGetRotation;
1923 +extern(C) alias dReal* function(dBodyID) pfdBodyGetRotation;
1924 pfdBodyGetRotation dBodyGetRotation;
1926 /**
1927 @@ -747,7 +747,7 @@
1928 * @param R a copy of the rotation matrix
1929 * @sa dBodyGetRotation
1930 */
1931 -typedef void function(dBodyID, dMatrix3 R) pfdBodyCopyRotation;
1932 +extern(C) alias void function(dBodyID, dMatrix3 R) pfdBodyCopyRotation;
1933 pfdBodyCopyRotation dBodyCopyRotation;
1935 /**
1936 @@ -755,7 +755,7 @@
1937 * @ingroup bodies
1938 * @return pointer to 4 scalars that represent the quaternion.
1939 */
1940 -typedef dReal* function(dBodyID) pfdBodyGetQuaternion;
1941 +extern(C) alias dReal* function(dBodyID) pfdBodyGetQuaternion;
1942 pfdBodyGetQuaternion dBodyGetQuaternion;
1945 @@ -766,7 +766,7 @@
1946 * @param quat a copy of the orientation quaternion
1947 * @sa dBodyGetQuaternion
1948 */
1949 -typedef void function(dBodyID bodyid, dQuaternion quat) pfdBodyCopyQuaternion;
1950 +extern(C) alias void function(dBodyID bodyid, dQuaternion quat) pfdBodyCopyQuaternion;
1951 pfdBodyCopyQuaternion dBodyCopyQuaternion;
1954 @@ -774,84 +774,84 @@
1955 * @brief Get the linear velocity of a body.
1956 * @ingroup bodies
1957 */
1958 -typedef dReal* function(dBodyID) pfdBodyGetLinearVel;
1959 +extern(C) alias dReal* function(dBodyID) pfdBodyGetLinearVel;
1960 pfdBodyGetLinearVel dBodyGetLinearVel;
1962 /**
1963 * @brief Get the angular velocity of a body.
1964 * @ingroup bodies
1965 */
1966 -typedef dReal* function(dBodyID) pfdBodyGetAngularVel;
1967 +extern(C) alias dReal* function(dBodyID) pfdBodyGetAngularVel;
1968 pfdBodyGetAngularVel dBodyGetAngularVel;
1970 /**
1971 * @brief Set the mass of a body.
1972 * @ingroup bodies
1973 */
1974 -typedef void function(dBodyID, dMass* mass) pfdBodySetMass;
1975 +extern(C) alias void function(dBodyID, dMass* mass) pfdBodySetMass;
1976 pfdBodySetMass dBodySetMass;
1978 /**
1979 * @brief Get the mass of a body.
1980 * @ingroup bodies
1981 */
1982 -typedef void function(dBodyID, dMass* mass) pfdBodyGetMass;
1983 +extern(C) alias void function(dBodyID, dMass* mass) pfdBodyGetMass;
1984 pfdBodyGetMass dBodyGetMass;
1986 /**
1987 * @brief Add force at centre of mass of body in absolute coordinates.
1988 * @ingroup bodies
1989 */
1990 -typedef void function(dBodyID, dReal fx, dReal fy, dReal fz) pfdBodyAddForce;
1991 +extern(C) alias void function(dBodyID, dReal fx, dReal fy, dReal fz) pfdBodyAddForce;
1992 pfdBodyAddForce dBodyAddForce;
1994 /**
1995 * @brief Add torque at centre of mass of body in absolute coordinates.
1996 * @ingroup bodies
1997 */
1998 -typedef void function(dBodyID, dReal fx, dReal fy, dReal fz) pfdBodyAddTorque;
1999 +extern(C) alias void function(dBodyID, dReal fx, dReal fy, dReal fz) pfdBodyAddTorque;
2000 pfdBodyAddTorque dBodyAddTorque;
2002 /**
2003 * @brief Add force at centre of mass of body in coordinates relative to body.
2004 * @ingroup bodies
2005 */
2006 -typedef void function(dBodyID, dReal fx, dReal fy, dReal fz) pfdBodyAddRelForce;
2007 +extern(C) alias void function(dBodyID, dReal fx, dReal fy, dReal fz) pfdBodyAddRelForce;
2008 pfdBodyAddRelForce dBodyAddRelForce;
2010 /**
2011 * @brief Add torque at centre of mass of body in coordinates relative to body.
2012 * @ingroup bodies
2013 */
2014 -typedef void function(dBodyID, dReal fx, dReal fy, dReal fz) pfdBodyAddRelTorque;
2015 +extern(C) alias void function(dBodyID, dReal fx, dReal fy, dReal fz) pfdBodyAddRelTorque;
2016 pfdBodyAddRelTorque dBodyAddRelTorque;
2018 /**
2019 * @brief Add force at specified point in body in global coordinates.
2020 * @ingroup bodies
2021 */
2022 -typedef void function(dBodyID, dReal fx, dReal fy, dReal fz, dReal px, dReal py, dReal pz) pfdBodyAddForceAtPos;
2023 +extern(C) alias void function(dBodyID, dReal fx, dReal fy, dReal fz, dReal px, dReal py, dReal pz) pfdBodyAddForceAtPos;
2024 pfdBodyAddForceAtPos dBodyAddForceAtPos;
2026 /**
2027 * @brief Add force at specified point in body in local coordinates.
2028 * @ingroup bodies
2029 */
2030 -typedef void function(dBodyID, dReal fx, dReal fy, dReal fz, dReal px, dReal py, dReal pz) pfdBodyAddForceAtRelPos;
2031 +extern(C) alias void function(dBodyID, dReal fx, dReal fy, dReal fz, dReal px, dReal py, dReal pz) pfdBodyAddForceAtRelPos;
2032 pfdBodyAddForceAtRelPos dBodyAddForceAtRelPos;
2034 /**
2035 * @brief Add force at specified point in body in global coordinates.
2036 * @ingroup bodies
2037 */
2038 -typedef void function(dBodyID, dReal fx, dReal fy, dReal fz, dReal px, dReal py, dReal pz) pfdBodyAddRelForceAtPos;
2039 +extern(C) alias void function(dBodyID, dReal fx, dReal fy, dReal fz, dReal px, dReal py, dReal pz) pfdBodyAddRelForceAtPos;
2040 pfdBodyAddRelForceAtPos dBodyAddRelForceAtPos;
2042 /**
2043 * @brief Add force at specified point in body in local coordinates.
2044 * @ingroup bodies
2045 */
2046 -typedef void function(dBodyID, dReal fx, dReal fy, dReal fz, dReal px, dReal py, dReal pz) pfdBodyAddRelForceAtRelPos;
2047 +extern(C) alias void function(dBodyID, dReal fx, dReal fy, dReal fz, dReal px, dReal py, dReal pz) pfdBodyAddRelForceAtRelPos;
2048 pfdBodyAddRelForceAtRelPos dBodyAddRelForceAtRelPos;
2050 /**
2051 @@ -863,7 +863,7 @@
2052 * body system.
2053 * @ingroup bodies
2054 */
2055 -typedef dReal* function(dBodyID) pfdBodyGetForce;
2056 +extern(C) alias dReal* function(dBodyID) pfdBodyGetForce;
2057 pfdBodyGetForce dBodyGetForce;
2059 /**
2060 @@ -875,7 +875,7 @@
2061 * body system.
2062 * @ingroup bodies
2063 */
2064 -typedef dReal* function(dBodyID) pfdBodyGetTorque;
2065 +extern(C) alias dReal* function(dBodyID) pfdBodyGetTorque;
2066 pfdBodyGetTorque dBodyGetTorque;
2068 /**
2069 @@ -886,7 +886,7 @@
2070 * were called on them while they were deactivated.
2071 * @ingroup bodies
2072 */
2073 -typedef void function(dBodyID b, dReal x, dReal y, dReal z) pfdBodySetForce;
2074 +extern(C) alias void function(dBodyID b, dReal x, dReal y, dReal z) pfdBodySetForce;
2075 pfdBodySetForce dBodySetForce;
2077 /**
2078 @@ -897,7 +897,7 @@
2079 * were called on them while they were deactivated.
2080 * @ingroup bodies
2081 */
2082 -typedef void function(dBodyID b, dReal x, dReal y, dReal z) pfdBodySetTorque;
2083 +extern(C) alias void function(dBodyID b, dReal x, dReal y, dReal z) pfdBodySetTorque;
2084 pfdBodySetTorque dBodySetTorque;
2086 /**
2087 @@ -905,7 +905,7 @@
2088 * @ingroup bodies
2089 * @param result will contain the result.
2090 */
2091 -typedef void function(dBodyID, dReal px, dReal py, dReal pz, dVector3 result) pfdBodyGetRelPointPos;
2092 +extern(C) alias void function(dBodyID, dReal px, dReal py, dReal pz, dVector3 result) pfdBodyGetRelPointPos;
2093 pfdBodyGetRelPointPos dBodyGetRelPointPos;
2095 /**
2096 @@ -913,7 +913,7 @@
2097 * @ingroup bodies
2098 * @param result will contain the result.
2099 */
2100 -typedef void function(dBodyID, dReal px, dReal py, dReal pz, dVector3 result) pfdBodyGetRelPointVel;
2101 +extern(C) alias void function(dBodyID, dReal px, dReal py, dReal pz, dVector3 result) pfdBodyGetRelPointVel;
2102 pfdBodyGetRelPointVel dBodyGetRelPointVel;
2104 /**
2105 @@ -922,7 +922,7 @@
2106 * @ingroup bodies
2107 * @param result will contain the result.
2108 */
2109 -typedef void function(dBodyID, dReal px, dReal py, dReal pz, dVector3 result) pfdBodyGetPointVel;
2110 +extern(C) alias void function(dBodyID, dReal px, dReal py, dReal pz, dVector3 result) pfdBodyGetPointVel;
2111 pfdBodyGetPointVel dBodyGetPointVel;
2113 /**
2114 @@ -933,7 +933,7 @@
2115 * @ingroup bodies
2116 * @param result will contain the result.
2117 */
2118 -typedef void function(dBodyID, dReal px, dReal py, dReal pz, dVector3 result) pfdBodyGetPosRelPoint;
2119 +extern(C) alias void function(dBodyID, dReal px, dReal py, dReal pz, dVector3 result) pfdBodyGetPosRelPoint;
2120 pfdBodyGetPosRelPoint dBodyGetPosRelPoint;
2122 /**
2123 @@ -941,7 +941,7 @@
2124 * @ingroup bodies
2125 * @param result will contain the result.
2126 */
2127 -typedef void function(dBodyID, dReal px, dReal py, dReal pz, dVector3 result) pfdBodyVectorToWorld;
2128 +extern(C) alias void function(dBodyID, dReal px, dReal py, dReal pz, dVector3 result) pfdBodyVectorToWorld;
2129 pfdBodyVectorToWorld dBodyVectorToWorld;
2131 /**
2132 @@ -949,7 +949,7 @@
2133 * @ingroup bodies
2134 * @param result will contain the result.
2135 */
2136 -typedef void function(dBodyID, dReal px, dReal py, dReal pz, dVector3 result) pfdBodyVectorFromWorld;
2137 +extern(C) alias void function(dBodyID, dReal px, dReal py, dReal pz, dVector3 result) pfdBodyVectorFromWorld;
2138 pfdBodyVectorFromWorld dBodyVectorFromWorld;
2140 /**
2141 @@ -969,7 +969,7 @@
2142 * error in a simulation, and the finite mode will only fix one of those
2143 * sources of error.
2144 */
2145 -typedef void function(dBodyID, int mode) pfdBodySetFiniteRotationMode;
2146 +extern(C) alias void function(dBodyID, int mode) pfdBodySetFiniteRotationMode;
2147 pfdBodySetFiniteRotationMode dBodySetFiniteRotationMode;
2149 /**
2150 @@ -988,7 +988,7 @@
2151 * you can call this function with the wheel's hinge axis as the argument to
2152 * try and improve its behavior.
2153 */
2154 -typedef void function(dBodyID, dReal x, dReal y, dReal z) pfdBodySetFiniteRotationAxis;
2155 +extern(C) alias void function(dBodyID, dReal x, dReal y, dReal z) pfdBodySetFiniteRotationAxis;
2156 pfdBodySetFiniteRotationAxis dBodySetFiniteRotationAxis;
2158 /**
2159 @@ -996,7 +996,7 @@
2160 * @ingroup bodies
2161 * @return the mode 0 (infitesimal) or 1 (finite).
2162 */
2163 -typedef int function(dBodyID) pfdBodyGetFiniteRotationMode;
2164 +extern(C) alias int function(dBodyID) pfdBodyGetFiniteRotationMode;
2165 pfdBodyGetFiniteRotationMode dBodyGetFiniteRotationMode;
2167 /**
2168 @@ -1004,7 +1004,7 @@
2169 * @param result will contain the axis.
2170 * @ingroup bodies
2171 */
2172 -typedef void function(dBodyID, dVector3 result) pfdBodyGetFiniteRotationAxis;
2173 +extern(C) alias void function(dBodyID, dVector3 result) pfdBodyGetFiniteRotationAxis;
2174 pfdBodyGetFiniteRotationAxis dBodyGetFiniteRotationAxis;
2176 /**
2177 @@ -1012,7 +1012,7 @@
2178 * @ingroup bodies
2179 * @return nr of joints
2180 */
2181 -typedef int function(dBodyID b) pfdBodyGetNumJoints;
2182 +extern(C) alias int function(dBodyID b) pfdBodyGetNumJoints;
2183 pfdBodyGetNumJoints dBodyGetNumJoints;
2185 /**
2186 @@ -1021,7 +1021,7 @@
2187 * @param index valid range is 0 to n-1 where n is the value returned by
2188 * dBodyGetNumJoints().
2189 */
2190 -typedef dJointID function(dBodyID, int index) pfdBodyGetJoint;
2191 +extern(C) alias dJointID function(dBodyID, int index) pfdBodyGetJoint;
2192 pfdBodyGetJoint dBodyGetJoint;
2194 /**
2195 @@ -1029,7 +1029,7 @@
2196 * @param dBodyID identification of body.
2197 * @ingroup bodies
2198 */
2199 -typedef void function(dBodyID) pfdBodyEnable;
2200 +extern(C) alias void function(dBodyID) pfdBodyEnable;
2201 pfdBodyEnable dBodyEnable;
2203 /**
2204 @@ -1039,7 +1039,7 @@
2205 * A disabled body that is connected through a joint to an enabled body will
2206 * be automatically re-enabled at the next simulation step.
2207 */
2208 -typedef void function(dBodyID) pfdBodyDisable;
2209 +extern(C) alias void function(dBodyID) pfdBodyDisable;
2210 pfdBodyDisable dBodyDisable;
2212 /**
2213 @@ -1047,7 +1047,7 @@
2214 * @ingroup bodies
2215 * @return 1 if a body is currently enabled or 0 if it is disabled.
2216 */
2217 -typedef int function(dBodyID) pfdBodyIsEnabled;
2218 +extern(C) alias int function(dBodyID) pfdBodyIsEnabled;
2219 pfdBodyIsEnabled dBodyIsEnabled;
2221 /**
2222 @@ -1057,7 +1057,7 @@
2223 * @remarks
2224 * Newly created bodies are always influenced by the world's gravity.
2225 */
2226 -typedef void function(dBodyID b, int mode) pfdBodySetGravityMode;
2227 +extern(C) alias void function(dBodyID b, int mode) pfdBodySetGravityMode;
2228 pfdBodySetGravityMode dBodySetGravityMode;
2230 /**
2231 @@ -1065,7 +1065,7 @@
2232 * @ingroup bodies
2233 * @return nonzero means gravity affects this body.
2234 */
2235 -typedef int function(dBodyID b) pfdBodyGetGravityMode;
2236 +extern(C) alias int function(dBodyID b) pfdBodyGetGravityMode;
2237 pfdBodyGetGravityMode dBodyGetGravityMode;
2240 @@ -1145,7 +1145,7 @@
2241 * @param dJointGroupID set to 0 to allocate the joint normally.
2242 * If it is nonzero the joint is allocated in the given joint group.
2243 */
2244 -typedef dJointID function(dWorldID, dJointGroupID) pfdJointCreateBall;
2245 +extern(C) alias dJointID function(dWorldID, dJointGroupID) pfdJointCreateBall;
2246 pfdJointCreateBall dJointCreateBall;
2248 /**
2249 @@ -1154,7 +1154,7 @@
2250 * @param dJointGroupID set to 0 to allocate the joint normally.
2251 * If it is nonzero the joint is allocated in the given joint group.
2252 */
2253 -typedef dJointID function(dWorldID, dJointGroupID) pfdJointCreateHinge;
2254 +extern(C) alias dJointID function(dWorldID, dJointGroupID) pfdJointCreateHinge;
2255 pfdJointCreateHinge dJointCreateHinge;
2257 /**
2258 @@ -1163,7 +1163,7 @@
2259 * @param dJointGroupID set to 0 to allocate the joint normally.
2260 * If it is nonzero the joint is allocated in the given joint group.
2261 */
2262 -typedef dJointID function(dWorldID, dJointGroupID) pfdJointCreateSlider;
2263 +extern(C) alias dJointID function(dWorldID, dJointGroupID) pfdJointCreateSlider;
2264 pfdJointCreateSlider dJointCreateSlider;
2266 /**
2267 @@ -1172,7 +1172,7 @@
2268 * @param dJointGroupID set to 0 to allocate the joint normally.
2269 * If it is nonzero the joint is allocated in the given joint group.
2270 */
2271 -typedef dJointID function(dWorldID, dJointGroupID, dContact*) pfdJointCreateContact;
2272 +extern(C) alias dJointID function(dWorldID, dJointGroupID, dContact*) pfdJointCreateContact;
2273 pfdJointCreateContact dJointCreateContact;
2275 /**
2276 @@ -1181,7 +1181,7 @@
2277 * @param dJointGroupID set to 0 to allocate the joint normally.
2278 * If it is nonzero the joint is allocated in the given joint group.
2279 */
2280 -typedef dJointID function(dWorldID, dJointGroupID) pfdJointCreateHinge2;
2281 +extern(C) alias dJointID function(dWorldID, dJointGroupID) pfdJointCreateHinge2;
2282 pfdJointCreateHinge2 dJointCreateHinge2;
2284 /**
2285 @@ -1190,7 +1190,7 @@
2286 * @param dJointGroupID set to 0 to allocate the joint normally.
2287 * If it is nonzero the joint is allocated in the given joint group.
2288 */
2289 -typedef dJointID function(dWorldID, dJointGroupID) pfdJointCreateUniversal;
2290 +extern(C) alias dJointID function(dWorldID, dJointGroupID) pfdJointCreateUniversal;
2291 pfdJointCreateUniversal dJointCreateUniversal;
2293 /**
2294 @@ -1199,7 +1199,7 @@
2295 * @param dJointGroupID set to 0 to allocate the joint normally.
2296 * If it is nonzero the joint is allocated in the given joint group.
2297 */
2298 -typedef dJointID function(dWorldID, dJointGroupID) pfdJointCreatePR;
2299 +extern(C) alias dJointID function(dWorldID, dJointGroupID) pfdJointCreatePR;
2300 pfdJointCreatePR dJointCreatePR;
2302 /**
2303 @@ -1208,10 +1208,10 @@
2304 * @param dJointGroupID set to 0 to allocate the joint normally.
2305 * If it is nonzero the joint is allocated in the given joint group.
2306 */
2307 -typedef dJointID function(dWorldID, dJointGroupID) pfdJointCreateFixed;
2308 +extern(C) alias dJointID function(dWorldID, dJointGroupID) pfdJointCreateFixed;
2309 pfdJointCreateFixed dJointCreateFixed;
2311 -typedef dJointID function(dWorldID, dJointGroupID) pfdJointCreateNull;
2312 +extern(C) alias dJointID function(dWorldID, dJointGroupID) pfdJointCreateNull;
2313 pfdJointCreateNull dJointCreateNull;
2315 /**
2316 @@ -1220,7 +1220,7 @@
2317 * @param dJointGroupID set to 0 to allocate the joint normally.
2318 * If it is nonzero the joint is allocated in the given joint group.
2319 */
2320 -typedef dJointID function(dWorldID, dJointGroupID) pfdJointCreateAMotor;
2321 +extern(C) alias dJointID function(dWorldID, dJointGroupID) pfdJointCreateAMotor;
2322 pfdJointCreateAMotor dJointCreateAMotor;
2324 /**
2325 @@ -1229,7 +1229,7 @@
2326 * @param dJointGroupID set to 0 to allocate the joint normally.
2327 * If it is nonzero the joint is allocated in the given joint group.
2328 */
2329 -typedef dJointID function(dWorldID, dJointGroupID) pfdJointCreateLMotor;
2330 +extern(C) alias dJointID function(dWorldID, dJointGroupID) pfdJointCreateLMotor;
2331 pfdJointCreateLMotor dJointCreateLMotor;
2333 /**
2334 @@ -1238,7 +1238,7 @@
2335 * @param dJointGroupID set to 0 to allocate the joint normally.
2336 * If it is nonzero the joint is allocated in the given joint group.
2337 */
2338 -typedef dJointID function(dWorldID, dJointGroupID) pfdJointCreatePlane2D;
2339 +extern(C) alias dJointID function(dWorldID, dJointGroupID) pfdJointCreatePlane2D;
2340 pfdJointCreatePlane2D dJointCreatePlane2D;
2342 /**
2343 @@ -1249,7 +1249,7 @@
2344 * However, if the joint is a member of a group then this function has no
2345 * effect - to destroy that joint the group must be emptied or destroyed.
2346 */
2347 -typedef void function(dJointID) pfdJointDestroy;
2348 +extern(C) alias void function(dJointID) pfdJointDestroy;
2349 pfdJointDestroy dJointDestroy;
2352 @@ -1258,7 +1258,7 @@
2353 * @ingroup joints
2354 * @param max_size deprecated. Set to 0.
2355 */
2356 -typedef dJointGroupID function(int max_size) pfdJointGroupCreate;
2357 +extern(C) alias dJointGroupID function(int max_size) pfdJointGroupCreate;
2358 pfdJointGroupCreate dJointGroupCreate;
2360 /**
2361 @@ -1267,7 +1267,7 @@
2362 *
2363 * All joints in the joint group will be destroyed.
2364 */
2365 -typedef void function(dJointGroupID) pfdJointGroupDestroy;
2366 +extern(C) alias void function(dJointGroupID) pfdJointGroupDestroy;
2367 pfdJointGroupDestroy dJointGroupDestroy;
2369 /**
2370 @@ -1277,7 +1277,7 @@
2371 * All joints in the joint group will be destroyed,
2372 * but the joint group itself will not be destroyed.
2373 */
2374 -typedef void function(dJointGroupID) pfdJointGroupEmpty;
2375 +extern(C) alias void function(dJointGroupID) pfdJointGroupEmpty;
2376 pfdJointGroupEmpty dJointGroupEmpty;
2378 /**
2379 @@ -1293,21 +1293,21 @@
2380 * @remarks
2381 * Some joints, like hinge-2 need to be attached to two bodies to work.
2382 */
2383 -typedef void function(dJointID, dBodyID body1, dBodyID body2) pfdJointAttach;
2384 +extern(C) alias void function(dJointID, dBodyID body1, dBodyID body2) pfdJointAttach;
2385 pfdJointAttach dJointAttach;
2387 /**
2388 * @brief Set the user-data pointer
2389 * @ingroup joints
2390 */
2391 -typedef void function(dJointID, void *data) pfdJointSetData;
2392 +extern(C) alias void function(dJointID, void *data) pfdJointSetData;
2393 pfdJointSetData dJointSetData;
2395 /**
2396 * @brief Get the user-data pointer
2397 * @ingroup joints
2398 */
2399 -typedef void* function(dJointID) pfdJointGetData;
2400 +extern(C) alias void* function(dJointID) pfdJointGetData;
2401 pfdJointGetData dJointGetData;
2403 /**
2404 @@ -1324,7 +1324,7 @@
2405 * \li JointTypeAMotor
2406 * \li JointTypeLMotor
2407 */
2408 -typedef int function(dJointID) pfdJointGetType;
2409 +extern(C) alias int function(dJointID) pfdJointGetType;
2410 pfdJointGetType dJointGetType;
2412 /**
2413 @@ -1337,7 +1337,7 @@
2414 * If both body IDs are zero, the joint is in ``limbo'' and has no effect on
2415 * the simulation.
2416 */
2417 -typedef dBodyID function(dJointID, int index) pfdJointGetBody;
2418 +extern(C) alias dBodyID function(dJointID, int index) pfdJointGetBody;
2419 pfdJointGetBody dJointGetBody;
2421 /**
2422 @@ -1347,14 +1347,14 @@
2423 * much force an individual joint exerts.
2424 * @ingroup joints
2425 */
2426 -typedef void function(dJointID, dJointFeedback *) pfdJointSetFeedback;
2427 +extern(C) alias void function(dJointID, dJointFeedback *) pfdJointSetFeedback;
2428 pfdJointSetFeedback dJointSetFeedback;
2430 /**
2431 * @brief Gets the datastructure that is to receive the feedback.
2432 * @ingroup joints
2433 */
2434 -typedef dJointFeedback* function(dJointID) pfdJointGetFeedback;
2435 +extern(C) alias dJointFeedback* function(dJointID) pfdJointGetFeedback;
2436 pfdJointGetFeedback dJointGetFeedback;
2438 /**
2439 @@ -1364,38 +1364,38 @@
2440 * The joint will try to keep this point on each body
2441 * together. The input is specified in world coordinates.
2442 */
2443 -typedef void function(dJointID, dReal x, dReal y, dReal z) pfdJointSetBallAnchor;
2444 +extern(C) alias void function(dJointID, dReal x, dReal y, dReal z) pfdJointSetBallAnchor;
2445 pfdJointSetBallAnchor dJointSetBallAnchor;
2447 /**
2448 * @brief Set the joint anchor point.
2449 * @ingroup joints
2450 */
2451 -typedef void function(dJointID, dReal x, dReal y, dReal z) pfdJointSetBallAnchor2;
2452 +extern(C) alias void function(dJointID, dReal x, dReal y, dReal z) pfdJointSetBallAnchor2;
2453 pfdJointSetBallAnchor2 dJointSetBallAnchor2;
2455 /**
2456 * @brief Set hinge anchor parameter.
2457 * @ingroup joints
2458 */
2459 -typedef void function(dJointID, dReal x, dReal y, dReal z) pfdJointSetHingeAnchor;
2460 +extern(C) alias void function(dJointID, dReal x, dReal y, dReal z) pfdJointSetHingeAnchor;
2461 pfdJointSetHingeAnchor dJointSetHingeAnchor;
2463 -typedef void function(dJointID, dReal x, dReal y, dReal z, dReal ax, dReal ay, dReal az) pfdJointSetHingeAnchorDelta;
2464 +extern(C) alias void function(dJointID, dReal x, dReal y, dReal z, dReal ax, dReal ay, dReal az) pfdJointSetHingeAnchorDelta;
2465 pfdJointSetHingeAnchorDelta dJointSetHingeAnchorDelta;
2467 /**
2468 * @brief Set hinge axis.
2469 * @ingroup joints
2470 */
2471 -typedef void function(dJointID, dReal x, dReal y, dReal z) pfdJointSetHingeAxis;
2472 +extern(C) alias void function(dJointID, dReal x, dReal y, dReal z) pfdJointSetHingeAxis;
2473 pfdJointSetHingeAxis dJointSetHingeAxis;
2475 /**
2476 * @brief set joint parameter
2477 * @ingroup joints
2478 */
2479 -typedef void function(dJointID, int parameter, dReal value) pfdJointSetHingeParam;
2480 +extern(C) alias void function(dJointID, int parameter, dReal value) pfdJointSetHingeParam;
2481 pfdJointSetHingeParam dJointSetHingeParam;
2483 /**
2484 @@ -1406,27 +1406,27 @@
2485 * direction to body 2. This function is just a wrapper for dBodyAddTorque()}
2486 * @ingroup joints
2487 */
2488 -typedef void function(dJointID joint, dReal torque) pfdJointAddHingeTorque;
2489 +extern(C) alias void function(dJointID joint, dReal torque) pfdJointAddHingeTorque;
2490 pfdJointAddHingeTorque dJointAddHingeTorque;
2492 /**
2493 * @brief set the joint axis
2494 * @ingroup joints
2495 */
2496 -typedef void function(dJointID, dReal x, dReal y, dReal z) pfdJointSetSliderAxis;
2497 +extern(C) alias void function(dJointID, dReal x, dReal y, dReal z) pfdJointSetSliderAxis;
2498 pfdJointSetSliderAxis dJointSetSliderAxis;
2500 /**
2501 * @ingroup joints
2502 */
2503 -typedef void function(dJointID, dReal x, dReal y, dReal z, dReal ax, dReal ay, dReal az) pfdJointSetSliderAxisDelta;
2504 +extern(C) alias void function(dJointID, dReal x, dReal y, dReal z, dReal ax, dReal ay, dReal az) pfdJointSetSliderAxisDelta;
2505 pfdJointSetSliderAxisDelta dJointSetSliderAxisDelta;
2507 /**
2508 * @brief set joint parameter
2509 * @ingroup joints
2510 */
2511 -typedef void function(dJointID, int parameter, dReal value) pfdJointSetSliderParam;
2512 +extern(C) alias void function(dJointID, int parameter, dReal value) pfdJointSetSliderParam;
2513 pfdJointSetSliderParam dJointSetSliderParam;
2515 /**
2516 @@ -1437,35 +1437,35 @@
2517 * direction to body2. This function is just a wrapper for dBodyAddForce().
2518 * @ingroup joints
2519 */
2520 -typedef void function(dJointID joint, dReal force) pfdJointAddSliderForce;
2521 +extern(C) alias void function(dJointID joint, dReal force) pfdJointAddSliderForce;
2522 pfdJointAddSliderForce dJointAddSliderForce;
2524 /**
2525 * @brief set anchor
2526 * @ingroup joints
2527 */
2528 -typedef void function(dJointID, dReal x, dReal y, dReal z) pfdJointSetHinge2Anchor;
2529 +extern(C) alias void function(dJointID, dReal x, dReal y, dReal z) pfdJointSetHinge2Anchor;
2530 pfdJointSetHinge2Anchor dJointSetHinge2Anchor;
2532 /**
2533 * @brief set axis
2534 * @ingroup joints
2535 */
2536 -typedef void function(dJointID, dReal x, dReal y, dReal z) pfdJointSetHinge2Axis1;
2537 +extern(C) alias void function(dJointID, dReal x, dReal y, dReal z) pfdJointSetHinge2Axis1;
2538 pfdJointSetHinge2Axis1 dJointSetHinge2Axis1;
2540 /**
2541 * @brief set axis
2542 * @ingroup joints
2543 */
2544 -typedef void function(dJointID, dReal x, dReal y, dReal z) pfdJointSetHinge2Axis2;
2545 +extern(C) alias void function(dJointID, dReal x, dReal y, dReal z) pfdJointSetHinge2Axis2;
2546 pfdJointSetHinge2Axis2 dJointSetHinge2Axis2;
2548 /**
2549 * @brief set joint parameter
2550 * @ingroup joints
2551 */
2552 -typedef void function(dJointID, int parameter, dReal value) pfdJointSetHinge2Param;
2553 +extern(C) alias void function(dJointID, int parameter, dReal value) pfdJointSetHinge2Param;
2554 pfdJointSetHinge2Param dJointSetHinge2Param;
2556 /**
2557 @@ -1474,35 +1474,35 @@
2558 * @remarks This function is just a wrapper for dBodyAddTorque().
2559 * @ingroup joints
2560 */
2561 -typedef void function(dJointID joint, dReal torque1, dReal torque2) pfdJointAddHinge2Torques;
2562 +extern(C) alias void function(dJointID joint, dReal torque1, dReal torque2) pfdJointAddHinge2Torques;
2563 pfdJointAddHinge2Torques dJointAddHinge2Torques;
2565 /**
2566 * @brief set anchor
2567 * @ingroup joints
2568 */
2569 -typedef void function(dJointID, dReal x, dReal y, dReal z) pfdJointSetUniversalAnchor;
2570 +extern(C) alias void function(dJointID, dReal x, dReal y, dReal z) pfdJointSetUniversalAnchor;
2571 pfdJointSetUniversalAnchor dJointSetUniversalAnchor;
2573 /**
2574 * @brief set axis
2575 * @ingroup joints
2576 */
2577 -typedef void function(dJointID, dReal x, dReal y, dReal z) pfdJointSetUniversalAxis1;
2578 +extern(C) alias void function(dJointID, dReal x, dReal y, dReal z) pfdJointSetUniversalAxis1;
2579 pfdJointSetUniversalAxis1 dJointSetUniversalAxis1;
2581 /**
2582 * @brief set axis
2583 * @ingroup joints
2584 */
2585 -typedef void function(dJointID, dReal x, dReal y, dReal z) pfdJointSetUniversalAxis2;
2586 +extern(C) alias void function(dJointID, dReal x, dReal y, dReal z) pfdJointSetUniversalAxis2;
2587 pfdJointSetUniversalAxis2 dJointSetUniversalAxis2;
2589 /**
2590 * @brief set joint parameter
2591 * @ingroup joints
2592 */
2593 -typedef void function(dJointID, int parameter, dReal value) pfdJointSetUniversalParam;
2594 +extern(C) alias void function(dJointID, int parameter, dReal value) pfdJointSetUniversalParam;
2595 pfdJointSetUniversalParam dJointSetUniversalParam;
2597 /**
2598 @@ -1511,28 +1511,28 @@
2599 * @remarks This function is just a wrapper for dBodyAddTorque().
2600 * @ingroup joints
2601 */
2602 -typedef void function(dJointID joint, dReal torque1, dReal torque2) pfdJointAddUniversalTorques;
2603 +extern(C) alias void function(dJointID joint, dReal torque1, dReal torque2) pfdJointAddUniversalTorques;
2604 pfdJointAddUniversalTorques dJointAddUniversalTorques;
2606 /**
2607 * @brief set anchor
2608 * @ingroup joints
2609 */
2610 -typedef void function(dJointID, dReal x, dReal y, dReal z) pfdJointSetPRAnchor;
2611 +extern(C) alias void function(dJointID, dReal x, dReal y, dReal z) pfdJointSetPRAnchor;
2612 pfdJointSetPRAnchor dJointSetPRAnchor;
2614 /**
2615 * @brief set the axis for the prismatic articulation
2616 * @ingroup joints
2617 */
2618 -typedef void function(dJointID, dReal x, dReal y, dReal z) pfdJointSetPRAxis1;
2619 +extern(C) alias void function(dJointID, dReal x, dReal y, dReal z) pfdJointSetPRAxis1;
2620 pfdJointSetPRAxis1 dJointSetPRAxis1;
2622 /**
2623 * @brief set the axis for the rotoide articulation
2624 * @ingroup joints
2625 */
2626 -typedef void function(dJointID, dReal x, dReal y, dReal z) pfdJointSetPRAxis2;
2627 +extern(C) alias void function(dJointID, dReal x, dReal y, dReal z) pfdJointSetPRAxis2;
2628 pfdJointSetPRAxis2 dJointSetPRAxis2;
2630 /**
2631 @@ -1541,7 +1541,7 @@
2632 *
2633 * @note parameterX where X equal 2 refer to parameter for the rotoide articulation
2634 */
2635 -typedef void function(dJointID, int parameter, dReal value) pfdJointSetPRParam;
2636 +extern(C) alias void function(dJointID, int parameter, dReal value) pfdJointSetPRParam;
2637 pfdJointSetPRParam dJointSetPRParam;
2639 /**
2640 @@ -1552,7 +1552,7 @@
2641 * direction to body 2. This function is just a wrapper for dBodyAddTorque()}
2642 * @ingroup joints
2643 */
2644 -typedef void function(dJointID j, dReal torque) pfdJointAddPRTorque;
2645 +extern(C) alias void function(dJointID j, dReal torque) pfdJointAddPRTorque;
2646 pfdJointAddPRTorque dJointAddPRTorque;
2648 /**
2649 @@ -1561,7 +1561,7 @@
2650 * rotation between the bodies.
2651 * @ingroup joints
2652 */
2653 -typedef void function(dJointID) pfdJointSetFixed;
2654 +extern(C) alias void function(dJointID) pfdJointSetFixed;
2655 pfdJointSetFixed dJointSetFixed;
2657 /**
2658 @@ -1569,14 +1569,14 @@
2659 * @param num 0..3
2660 * @ingroup joints
2661 */
2662 -typedef void function(dJointID, int num) pfdJointSetAMotorNumAxes;
2663 +extern(C) alias void function(dJointID, int num) pfdJointSetAMotorNumAxes;
2664 pfdJointSetAMotorNumAxes dJointSetAMotorNumAxes;
2666 /**
2667 * @brief set axis
2668 * @ingroup joints
2669 */
2670 -typedef void function(dJointID, int anum, int rel, dReal x, dReal y, dReal z) pfdJointSetAMotorAxis;
2671 +extern(C) alias void function(dJointID, int anum, int rel, dReal x, dReal y, dReal z) pfdJointSetAMotorAxis;
2672 pfdJointSetAMotorAxis dJointSetAMotorAxis;
2674 /**
2675 @@ -1588,21 +1588,21 @@
2676 * but it is not needed for axis motors.
2677 * @ingroup joints
2678 */
2679 -typedef void function(dJointID, int anum, dReal angle) pfdJointSetAMotorAngle;
2680 +extern(C) alias void function(dJointID, int anum, dReal angle) pfdJointSetAMotorAngle;
2681 pfdJointSetAMotorAngle dJointSetAMotorAngle;
2683 /**
2684 * @brief set joint parameter
2685 * @ingroup joints
2686 */
2687 -typedef void function(dJointID, int parameter, dReal value) pfdJointSetAMotorParam;
2688 +extern(C) alias void function(dJointID, int parameter, dReal value) pfdJointSetAMotorParam;
2689 pfdJointSetAMotorParam dJointSetAMotorParam;
2691 /**
2692 * @brief set mode
2693 * @ingroup joints
2694 */
2695 -typedef void function(dJointID, int mode) pfdJointSetAMotorMode;
2696 +extern(C) alias void function(dJointID, int mode) pfdJointSetAMotorMode;
2697 pfdJointSetAMotorMode dJointSetAMotorMode;
2699 /**
2700 @@ -1613,7 +1613,7 @@
2701 * This function is just a wrapper for dBodyAddTorque().
2702 * @ingroup joints
2703 */
2704 -typedef void function(dJointID, dReal torque1, dReal torque2, dReal torque3) pfdJointAddAMotorTorques;
2705 +extern(C) alias void function(dJointID, dReal torque1, dReal torque2, dReal torque3) pfdJointAddAMotorTorques;
2706 pfdJointAddAMotorTorques dJointAddAMotorTorques;
2708 /**
2709 @@ -1621,7 +1621,7 @@
2710 * @param num can range from 0 (which effectively deactivates the joint) to 3.
2711 * @ingroup joints
2712 */
2713 -typedef void function(dJointID, int num) pfdJointSetLMotorNumAxes;
2714 +extern(C) alias void function(dJointID, int num) pfdJointSetLMotorNumAxes;
2715 pfdJointSetLMotorNumAxes dJointSetLMotorNumAxes;
2717 /**
2718 @@ -1635,32 +1635,32 @@
2719 * regardless of the setting of rel.
2720 * @ingroup joints
2721 */
2722 -typedef void function(dJointID, int anum, int rel, dReal x, dReal y, dReal z) pfdJointSetLMotorAxis;
2723 +extern(C) alias void function(dJointID, int anum, int rel, dReal x, dReal y, dReal z) pfdJointSetLMotorAxis;
2724 pfdJointSetLMotorAxis dJointSetLMotorAxis;
2726 /**
2727 * @brief set joint parameter
2728 * @ingroup joints
2729 */
2730 -typedef void function(dJointID, int parameter, dReal value) pfdJointSetLMotorParam;
2731 +extern(C) alias void function(dJointID, int parameter, dReal value) pfdJointSetLMotorParam;
2732 pfdJointSetLMotorParam dJointSetLMotorParam;
2734 /**
2735 * @ingroup joints
2736 */
2737 -typedef void function(dJointID, int parameter, dReal value) pfdJointSetPlane2DXParam;
2738 +extern(C) alias void function(dJointID, int parameter, dReal value) pfdJointSetPlane2DXParam;
2739 pfdJointSetPlane2DXParam dJointSetPlane2DXParam;
2741 /**
2742 * @ingroup joints
2743 */
2744 -typedef void function(dJointID, int parameter, dReal value) pfdJointSetPlane2DYParam;
2745 +extern(C) alias void function(dJointID, int parameter, dReal value) pfdJointSetPlane2DYParam;
2746 pfdJointSetPlane2DYParam dJointSetPlane2DYParam;
2748 /**
2749 * @ingroup joints
2750 */
2751 -typedef void function(dJointID, int parameter, dReal value) pfdJointSetPlane2DAngleParam;
2752 +extern(C) alias void function(dJointID, int parameter, dReal value) pfdJointSetPlane2DAngleParam;
2753 pfdJointSetPlane2DAngleParam dJointSetPlane2DAngleParam;
2755 /**
2756 @@ -1669,7 +1669,7 @@
2757 * This returns the point on body 1. If the joint is perfectly satisfied,
2758 * this will be the same as the point on body 2.
2759 */
2760 -typedef void function(dJointID, dVector3 result) pfdJointGetBallAnchor;
2761 +extern(C) alias void function(dJointID, dVector3 result) pfdJointGetBallAnchor;
2762 pfdJointGetBallAnchor dJointGetBallAnchor;
2764 /**
2765 @@ -1682,7 +1682,7 @@
2766 * within roundoff errors. dJointGetBallAnchor2() can be used, along with
2767 * dJointGetBallAnchor(), to see how far the joint has come apart.
2768 */
2769 -typedef void function(dJointID, dVector3 result) pfdJointGetBallAnchor2;
2770 +extern(C) alias void function(dJointID, dVector3 result) pfdJointGetBallAnchor2;
2771 pfdJointGetBallAnchor2 dJointGetBallAnchor2;
2773 /**
2774 @@ -1692,7 +1692,7 @@
2775 * this will be the same as the point on body 2.
2776 * @ingroup joints
2777 */
2778 -typedef void function(dJointID, dVector3 result) pfdJointGetHingeAnchor;
2779 +extern(C) alias void function(dJointID, dVector3 result) pfdJointGetHingeAnchor;
2780 pfdJointGetHingeAnchor dJointGetHingeAnchor;
2782 /**
2783 @@ -1703,21 +1703,21 @@
2784 * This can be used, for example, to see how far the joint has come apart.
2785 * @ingroup joints
2786 */
2787 -typedef void function(dJointID, dVector3 result) pfdJointGetHingeAnchor2;
2788 +extern(C) alias void function(dJointID, dVector3 result) pfdJointGetHingeAnchor2;
2789 pfdJointGetHingeAnchor2 dJointGetHingeAnchor2;
2791 /**
2792 * @brief get axis
2793 * @ingroup joints
2794 */
2795 -typedef void function(dJointID, dVector3 result) pfdJointGetHingeAxis;
2796 +extern(C) alias void function(dJointID, dVector3 result) pfdJointGetHingeAxis;
2797 pfdJointGetHingeAxis dJointGetHingeAxis;
2799 /**
2800 * @brief get joint parameter
2801 * @ingroup joints
2802 */
2803 -typedef dReal function(dJointID, int parameter) pfdJointGetHingeParam;
2804 +extern(C) alias dReal function(dJointID, int parameter) pfdJointGetHingeParam;
2805 pfdJointGetHingeParam dJointGetHingeParam;
2807 /**
2808 @@ -1730,14 +1730,14 @@
2809 * bodies is examined and that position will be the zero angle.
2810 * @ingroup joints
2811 */
2812 -typedef dReal function(dJointID) pfdJointGetHingeAngle;
2813 +extern(C) alias dReal function(dJointID) pfdJointGetHingeAngle;
2814 pfdJointGetHingeAngle dJointGetHingeAngle;
2816 /**
2817 * @brief Get the hinge angle time derivative.
2818 * @ingroup joints
2819 */
2820 -typedef dReal function(dJointID) pfdJointGetHingeAngleRate;
2821 +extern(C) alias dReal function(dJointID) pfdJointGetHingeAngleRate;
2822 pfdJointGetHingeAngleRate dJointGetHingeAngleRate;
2824 /**
2825 @@ -1747,28 +1747,28 @@
2826 * examined and that position will be the zero position.
2827 * @ingroup joints
2828 */
2829 -typedef dReal function(dJointID) pfdJointGetSliderPosition;
2830 +extern(C) alias dReal function(dJointID) pfdJointGetSliderPosition;
2831 pfdJointGetSliderPosition dJointGetSliderPosition;
2833 /**
2834 * @brief Get the slider linear position's time derivative.
2835 * @ingroup joints
2836 */
2837 -typedef dReal function(dJointID) pfdJointGetSliderPositionRate;
2838 +extern(C) alias dReal function(dJointID) pfdJointGetSliderPositionRate;
2839 pfdJointGetSliderPositionRate dJointGetSliderPositionRate;
2841 /**
2842 * @brief Get the slider axis
2843 * @ingroup joints
2844 */
2845 -typedef void function(dJointID, dVector3 result) pfdJointGetSliderAxis;
2846 +extern(C) alias void function(dJointID, dVector3 result) pfdJointGetSliderAxis;
2847 pfdJointGetSliderAxis dJointGetSliderAxis;
2849 /**
2850 * @brief get joint parameter
2851 * @ingroup joints
2852 */
2853 -typedef dReal function(dJointID, int parameter) pfdJointGetSliderParam;
2854 +extern(C) alias dReal function(dJointID, int parameter) pfdJointGetSliderParam;
2855 pfdJointGetSliderParam dJointGetSliderParam;
2857 /**
2858 @@ -1777,7 +1777,7 @@
2859 * this will be the same as the point on body 2.
2860 * @ingroup joints
2861 */
2862 -typedef void function(dJointID, dVector3 result) pfdJointGetHinge2Anchor;
2863 +extern(C) alias void function(dJointID, dVector3 result) pfdJointGetHinge2Anchor;
2864 pfdJointGetHinge2Anchor dJointGetHinge2Anchor;
2866 /**
2867 @@ -1788,49 +1788,49 @@
2868 * This can be used, for example, to see how far the joint has come apart.
2869 * @ingroup joints
2870 */
2871 -typedef void function(dJointID, dVector3 result) pfdJointGetHinge2Anchor2;
2872 +extern(C) alias void function(dJointID, dVector3 result) pfdJointGetHinge2Anchor2;
2873 pfdJointGetHinge2Anchor2 dJointGetHinge2Anchor2;
2875 /**
2876 * @brief Get joint axis
2877 * @ingroup joints
2878 */
2879 -typedef void function(dJointID, dVector3 result) pfdJointGetHinge2Axis1;
2880 +extern(C) alias void function(dJointID, dVector3 result) pfdJointGetHinge2Axis1;
2881 pfdJointGetHinge2Axis1 dJointGetHinge2Axis1;
2883 /**
2884 * @brief Get joint axis
2885 * @ingroup joints
2886 */
2887 -typedef void function(dJointID, dVector3 result) pfdJointGetHinge2Axis2;
2888 +extern(C) alias void function(dJointID, dVector3 result) pfdJointGetHinge2Axis2;
2889 pfdJointGetHinge2Axis2 dJointGetHinge2Axis2;
2891 /**
2892 * @brief get joint parameter
2893 * @ingroup joints
2894 */
2895 -typedef dReal function(dJointID, int parameter) pfdJointGetHinge2Param;
2896 +extern(C) alias dReal function(dJointID, int parameter) pfdJointGetHinge2Param;
2897 pfdJointGetHinge2Param dJointGetHinge2Param;
2899 /**
2900 * @brief Get angle
2901 * @ingroup joints
2902 */
2903 -typedef dReal function(dJointID) pfdJointGetHinge2Angle1;
2904 +extern(C) alias dReal function(dJointID) pfdJointGetHinge2Angle1;
2905 pfdJointGetHinge2Angle1 dJointGetHinge2Angle1;
2907 /**
2908 * @brief Get time derivative of angle
2909 * @ingroup joints
2910 */
2911 -typedef dReal function(dJointID) pfdJointGetHinge2Angle1Rate;
2912 +extern(C) alias dReal function(dJointID) pfdJointGetHinge2Angle1Rate;
2913 pfdJointGetHinge2Angle1Rate dJointGetHinge2Angle1Rate;
2915 /**
2916 * @brief Get time derivative of angle
2917 * @ingroup joints
2918 */
2919 -typedef dReal function(dJointID) pfdJointGetHinge2Angle2Rate;
2920 +extern(C) alias dReal function(dJointID) pfdJointGetHinge2Angle2Rate;
2921 pfdJointGetHinge2Angle2Rate dJointGetHinge2Angle2Rate;
2923 /**
2924 @@ -1839,7 +1839,7 @@
2925 * this will be the same as the point on body 2.
2926 * @ingroup joints
2927 */
2928 -typedef void function(dJointID, dVector3 result) pfdJointGetUniversalAnchor;
2929 +extern(C) alias void function(dJointID, dVector3 result) pfdJointGetUniversalAnchor;
2930 pfdJointGetUniversalAnchor dJointGetUniversalAnchor;
2932 /**
2933 @@ -1855,21 +1855,21 @@
2934 * dJointGetUniversalAnchor(), to see how far the joint has come apart.
2935 * @ingroup joints
2936 */
2937 -typedef void function(dJointID, dVector3 result) pfdJointGetUniversalAnchor2;
2938 +extern(C) alias void function(dJointID, dVector3 result) pfdJointGetUniversalAnchor2;
2939 pfdJointGetUniversalAnchor2 dJointGetUniversalAnchor2;
2941 /**
2942 * @brief Get axis
2943 * @ingroup joints
2944 */
2945 -typedef void function(dJointID, dVector3 result) pfdJointGetUniversalAxis1;
2946 +extern(C) alias void function(dJointID, dVector3 result) pfdJointGetUniversalAxis1;
2947 pfdJointGetUniversalAxis1 dJointGetUniversalAxis1;
2949 /**
2950 * @brief Get axis
2951 * @ingroup joints
2952 */
2953 -typedef void function(dJointID, dVector3 result) pfdJointGetUniversalAxis2;
2954 +extern(C) alias void function(dJointID, dVector3 result) pfdJointGetUniversalAxis2;
2955 pfdJointGetUniversalAxis2 dJointGetUniversalAxis2;
2958 @@ -1877,7 +1877,7 @@
2959 * @brief get joint parameter
2960 * @ingroup joints
2961 */
2962 -typedef dReal function(dJointID, int parameter) pfdJointGetUniversalParam;
2963 +extern(C) alias dReal function(dJointID, int parameter) pfdJointGetUniversalParam;
2964 pfdJointGetUniversalParam dJointGetUniversalParam;
2966 /**
2967 @@ -1891,35 +1891,35 @@
2968 * @note This function combine getUniversalAngle1 and getUniversalAngle2 together
2969 * and try to avoid redundant calculation
2970 */
2971 -typedef void function(dJointID, dReal *angle1, dReal *angle2) pfdJointGetUniversalAngles;
2972 +extern(C) alias void function(dJointID, dReal *angle1, dReal *angle2) pfdJointGetUniversalAngles;
2973 pfdJointGetUniversalAngles dJointGetUniversalAngles;
2975 /**
2976 * @brief Get angle
2977 * @ingroup joints
2978 */
2979 -typedef dReal function(dJointID) pfdJointGetUniversalAngle1;
2980 +extern(C) alias dReal function(dJointID) pfdJointGetUniversalAngle1;
2981 pfdJointGetUniversalAngle1 dJointGetUniversalAngle1;
2983 /**
2984 * @brief Get angle
2985 * @ingroup joints
2986 */
2987 -typedef dReal function(dJointID) pfdJointGetUniversalAngle2;
2988 +extern(C) alias dReal function(dJointID) pfdJointGetUniversalAngle2;
2989 pfdJointGetUniversalAngle2 dJointGetUniversalAngle2;
2991 /**
2992 * @brief Get time derivative of angle
2993 * @ingroup joints
2994 */
2995 -typedef dReal function(dJointID) pfdJointGetUniversalAngle1Rate;
2996 +extern(C) alias dReal function(dJointID) pfdJointGetUniversalAngle1Rate;
2997 pfdJointGetUniversalAngle1Rate dJointGetUniversalAngle1Rate;
2999 /**
3000 * @brief Get time derivative of angle
3001 * @ingroup joints
3002 */
3003 -typedef dReal function(dJointID) pfdJointGetUniversalAngle2Rate;
3004 +extern(C) alias dReal function(dJointID) pfdJointGetUniversalAngle2Rate;
3005 pfdJointGetUniversalAngle2Rate dJointGetUniversalAngle2Rate;
3007 /**
3008 @@ -1928,7 +1928,7 @@
3009 * this will be the same as the point on body 2.
3010 * @ingroup joints
3011 */
3012 -typedef void function(dJointID, dVector3 result) pfdJointGetPRAnchor;
3013 +extern(C) alias void function(dJointID, dVector3 result) pfdJointGetPRAnchor;
3014 pfdJointGetPRAnchor dJointGetPRAnchor;
3016 /**
3017 @@ -1942,7 +1942,7 @@
3018 *
3019 * @ingroup joints
3020 */
3021 -typedef dReal function(dJointID) pfdJointGetPRPosition;
3022 +extern(C) alias dReal function(dJointID) pfdJointGetPRPosition;
3023 pfdJointGetPRPosition dJointGetPRPosition;
3025 /**
3026 @@ -1950,7 +1950,7 @@
3027 *
3028 * @ingroup joints
3029 */
3030 -typedef dReal function(dJointID) pfdJointGetPRPositionRate;
3031 +extern(C) alias dReal function(dJointID) pfdJointGetPRPositionRate;
3032 pfdJointGetPRPositionRate dJointGetPRPositionRate;
3035 @@ -1958,21 +1958,21 @@
3036 * @brief Get the prismatic axis
3037 * @ingroup joints
3038 */
3039 -typedef void function(dJointID, dVector3 result) pfdJointGetPRAxis1;
3040 +extern(C) alias void function(dJointID, dVector3 result) pfdJointGetPRAxis1;
3041 pfdJointGetPRAxis1 dJointGetPRAxis1;
3043 /**
3044 * @brief Get the Rotoide axis
3045 * @ingroup joints
3046 */
3047 -typedef void function(dJointID, dVector3 result) pfdJointGetPRAxis2;
3048 +extern(C) alias void function(dJointID, dVector3 result) pfdJointGetPRAxis2;
3049 pfdJointGetPRAxis2 dJointGetPRAxis2;
3051 /**
3052 * @brief get joint parameter
3053 * @ingroup joints
3054 */
3055 -typedef dReal function(dJointID, int parameter) pfdJointGetPRParam;
3056 +extern(C) alias dReal function(dJointID, int parameter) pfdJointGetPRParam;
3057 pfdJointGetPRParam dJointGetPRParam;
3059 /**
3060 @@ -1983,7 +1983,7 @@
3061 * This is automatically set to 3 in dAMotorEuler mode.
3062 * @ingroup joints
3063 */
3064 -typedef int function(dJointID) pfdJointGetAMotorNumAxes;
3065 +extern(C) alias int function(dJointID) pfdJointGetAMotorNumAxes;
3066 pfdJointGetAMotorNumAxes dJointGetAMotorNumAxes;
3068 /**
3069 @@ -1995,7 +1995,7 @@
3070 * \li 2: The axis is anchored to the second body.
3071 * @ingroup joints
3072 */
3073 -typedef void function(dJointID, int anum, dVector3 result) pfdJointGetAMotorAxis;
3074 +extern(C) alias void function(dJointID, int anum, dVector3 result) pfdJointGetAMotorAxis;
3075 pfdJointGetAMotorAxis dJointGetAMotorAxis;
3077 /**
3078 @@ -2014,7 +2014,7 @@
3079 to the second body.
3080 * @ingroup joints
3081 */
3082 -typedef int function(dJointID, int anum) pfdJointGetAMotorAxisRel;
3083 +extern(C) alias int function(dJointID, int anum) pfdJointGetAMotorAxisRel;
3084 pfdJointGetAMotorAxisRel dJointGetAMotorAxisRel;
3086 /**
3087 @@ -2025,7 +2025,7 @@
3088 * In dAMotorEuler mode this is the corresponding euler angle.
3089 * @ingroup joints
3090 */
3091 -typedef dReal function(dJointID, int anum) pfdJointGetAMotorAngle;
3092 +extern(C) alias dReal function(dJointID, int anum) pfdJointGetAMotorAngle;
3093 pfdJointGetAMotorAngle dJointGetAMotorAngle;
3095 /**
3096 @@ -2036,14 +2036,14 @@
3097 * In dAMotorEuler mode this is the corresponding euler angle rate.
3098 * @ingroup joints
3099 */
3100 -typedef dReal function(dJointID, int anum) pfdJointGetAMotorAngleRate;
3101 +extern(C) alias dReal function(dJointID, int anum) pfdJointGetAMotorAngleRate;
3102 pfdJointGetAMotorAngleRate dJointGetAMotorAngleRate;
3104 /**
3105 * @brief get joint parameter
3106 * @ingroup joints
3107 */
3108 -typedef dReal function(dJointID, int parameter) pfdJointGetAMotorParam;
3109 +extern(C) alias dReal function(dJointID, int parameter) pfdJointGetAMotorParam;
3110 pfdJointGetAMotorParam dJointGetAMotorParam;
3112 /**
3113 @@ -2059,41 +2059,41 @@
3114 * of the bodies will correspond to all euler angles at zero.
3115 * @ingroup joints
3116 */
3117 -typedef int function(dJointID) pfdJointGetAMotorMode;
3118 +extern(C) alias int function(dJointID) pfdJointGetAMotorMode;
3119 pfdJointGetAMotorMode dJointGetAMotorMode;
3121 /**
3122 * @brief Get nr of axes.
3123 * @ingroup joints
3124 */
3125 -typedef int function(dJointID) pfdJointGetLMotorNumAxes;
3126 +extern(C) alias int function(dJointID) pfdJointGetLMotorNumAxes;
3127 pfdJointGetLMotorNumAxes dJointGetLMotorNumAxes;
3129 /**
3130 * @brief Get axis.
3131 * @ingroup joints
3132 */
3133 -typedef void function(dJointID, int anum, dVector3 result) pfdJointGetLMotorAxis;
3134 +extern(C) alias void function(dJointID, int anum, dVector3 result) pfdJointGetLMotorAxis;
3135 pfdJointGetLMotorAxis dJointGetLMotorAxis;
3137 /**
3138 * @brief get joint parameter
3139 * @ingroup joints
3140 */
3141 -typedef dReal function(dJointID, int parameter) pfdJointGetLMotorParam;
3142 +extern(C) alias dReal function(dJointID, int parameter) pfdJointGetLMotorParam;
3143 pfdJointGetLMotorParam dJointGetLMotorParam;
3146 /**
3147 * @ingroup joints
3148 */
3149 -typedef dJointID function(dBodyID, dBodyID) pfdConnectingJoint;
3150 +extern(C) alias dJointID function(dBodyID, dBodyID) pfdConnectingJoint;
3151 pfdConnectingJoint dConnectingJoint;
3153 /**
3154 * @ingroup joints
3155 */
3156 -typedef int function(dBodyID, dBodyID, dJointID*) pfdConnectingJointList;
3157 +extern(C) alias int function(dBodyID, dBodyID, dJointID*) pfdConnectingJointList;
3158 pfdConnectingJointList dConnectingJointList;
3160 /**
3161 @@ -2102,7 +2102,7 @@
3162 * a joint, otherwise return 0.
3163 * @ingroup joints
3164 */
3165 -typedef int function(dBodyID, dBodyID) pfdAreConnected;
3166 +extern(C) alias int function(dBodyID, dBodyID) pfdAreConnected;
3167 pfdAreConnected dAreConnected;
3169 /**
3170 @@ -2118,6 +2118,6 @@
3171 * bodies that already have contacts.
3172 * @ingroup joints
3173 */
3174 -typedef int function(dBodyID body1, dBodyID body2, int joint_type) pfdAreConnectedExcluding;
3175 +extern(C) alias int function(dBodyID body1, dBodyID body2, int joint_type) pfdAreConnectedExcluding;
3176 pfdAreConnectedExcluding dAreConnectedExcluding;
3178 Index: DerelictODE/derelict/ode/error.d
3179 ===================================================================
3180 --- DerelictODE/derelict/ode/error.d (revision 318)
3181 +++ DerelictODE/derelict/ode/error.d (working copy)
3182 @@ -54,35 +54,37 @@
3183 /* all user defined error functions have this type. error and debug functions
3184 * should not return.
3185 */
3186 -//typedef void function(int, char*, ...) dMessageFunction;
3187 -typedef void function(int, char*, va_list ap) dMessageFunction;
3188 +//alias void function(int, char*, ...) dMessageFunction;
3189 +alias void function(int, char*, va_list ap) dMessageFunction;
3191 -extern(C):
3192 +extern(C) {
3194 /* set a new error, debug or warning handler. if fn is 0, the default handlers
3195 * are used.
3196 */
3197 -typedef void function(dMessageFunction*) pfdSetErrorHandler;
3198 -typedef void function(dMessageFunction*) pfdSetDebugHandler;
3199 -typedef void function(dMessageFunction*) pfdSetMessageHandler;
3200 -pfdSetErrorHandler dSetErrorHandler;
3201 -pfdSetDebugHandler dSetDebugHandler;
3202 -pfdSetMessageHandler dSetMessageHandler;
3203 +alias void function(dMessageFunction*) pfdSetErrorHandler;
3204 +alias void function(dMessageFunction*) pfdSetDebugHandler;
3205 +alias void function(dMessageFunction*) pfdSetMessageHandler;
3207 /* return the current error, debug or warning handler. if the return value is
3208 * 0, the default handlers are in place.
3209 */
3210 -typedef dMessageFunction* function() pfdGetErrorHandler;
3211 -typedef dMessageFunction* function() pfdGetDebugHandler;
3212 -typedef dMessageFunction* function() pfdGetMessageHandler;
3213 +alias dMessageFunction* function() pfdGetErrorHandler;
3214 +alias dMessageFunction* function() pfdGetDebugHandler;
3215 +alias dMessageFunction* function() pfdGetMessageHandler;
3216 +
3217 +/* generate a fatal error, debug trap or a message. */
3218 +alias void function(int, char*, ...) pfdError;
3219 +alias void function(int, char*, ...) pfdDebug;
3220 +alias void function(int, char*, ...) pfdMessage;
3221 +}
3222 +
3223 +pfdSetErrorHandler dSetErrorHandler;
3224 +pfdSetDebugHandler dSetDebugHandler;
3225 +pfdSetMessageHandler dSetMessageHandler;
3226 pfdGetErrorHandler dGetErrorHandler;
3227 pfdGetDebugHandler dGetDebugHandler;
3228 pfdGetMessageHandler dGetMessageHandler;
3229 -
3230 -/* generate a fatal error, debug trap or a message. */
3231 -typedef void function(int, char*, ...) pfdError;
3232 -typedef void function(int, char*, ...) pfdDebug;
3233 -typedef void function(int, char*, ...) pfdMessage;
3234 pfdError dError;
3235 pfdDebug dDebug;
3236 pfdMessage dMessage;
3237 Index: DerelictODE/derelict/ode/misc.d
3238 ===================================================================
3239 --- DerelictODE/derelict/ode/misc.d (revision 318)
3240 +++ DerelictODE/derelict/ode/misc.d (working copy)
3241 @@ -54,56 +54,58 @@
3242 // FUNCTIONS
3243 //==============================================================================
3245 -extern(C):
3246 +extern(C) {
3248 /* return 1 if the random number generator is working. */
3249 -typedef int function() pfdTestRand;
3250 -pfdTestRand dTestRand;
3251 +alias int function() pfdTestRand;
3253 /* return next 32 bit random number. this uses a not-very-random linear
3254 * congruential method.
3255 */
3256 -typedef ulong function() pfdRand;
3257 -pfdRand dRand;
3258 +alias ulong function() pfdRand;
3260 /* get and set the current random number seed. */
3261 -typedef ulong function() pfdRandGetSeed;
3262 -pfdRandGetSeed dRandGetSeed;
3263 -typedef void function(ulong s) pfdRandSetSeed;
3264 -pfdRandSetSeed dRandSetSeed;
3265 +alias ulong function() pfdRandGetSeed;
3266 +alias void function(ulong s) pfdRandSetSeed;
3268 /* return a random integer between 0..n-1. the distribution will get worse
3269 * as n approaches 2^32.
3270 */
3271 -typedef int function(int n) pfdRandInt;
3272 -pfdRandInt dRandInt;
3273 +alias int function(int n) pfdRandInt;
3275 /* return a random real number between 0..1 */
3276 -typedef dReal function() pfdRandReal;
3277 -pfdRandReal dRandReal;
3278 +alias dReal function() pfdRandReal;
3280 /* print out a matrix */
3281 -typedef void function(dReal *A, int n, int m, char *fmt, FILE *f) pfdPrintMatrix;
3282 -pfdPrintMatrix dPrintMatrix;
3283 +alias void function(dReal *A, int n, int m, char *fmt, FILE *f) pfdPrintMatrix;
3285 /* make a random vector with entries between +/- range. A has n elements. */
3286 -typedef void function(dReal *A, int n, dReal range) pfdMakeRandomVector;
3287 -pfdMakeRandomVector dMakeRandomVector;
3288 +alias void function(dReal *A, int n, dReal range) pfdMakeRandomVector;
3290 /* make a random matrix with entries between +/- range. A has size n*m. */
3291 -typedef void function(dReal *A, int n, int m, dReal range) pfdMakeRandomMatrix;
3292 -pfdMakeRandomMatrix dMakeRandomMatrix;
3293 +alias void function(dReal *A, int n, int m, dReal range) pfdMakeRandomMatrix;
3295 /* clear the upper triangle of a square matrix */
3296 -typedef void function(dReal *A, int n) pfdClearUpperTriangle;
3297 -pfdClearUpperTriangle dClearUpperTriangle;
3298 +alias void function(dReal *A, int n) pfdClearUpperTriangle;
3300 /* return the maximum element difference between the two n*m matrices */
3301 -typedef dReal function(dReal *A, dReal *B, int n, int m) pfdMaxDifference;
3302 -pfdMaxDifference dMaxDifference;
3303 +alias dReal function(dReal *A, dReal *B, int n, int m) pfdMaxDifference;
3305 /* return the maximum element difference between the lower triangle of two
3306 * n*n matrices */
3307 -typedef dReal function(dReal *A, dReal *B, int n) pfdMaxDifferenceLowerTriangle;
3308 +alias dReal function(dReal *A, dReal *B, int n) pfdMaxDifferenceLowerTriangle;
3309 +}
3310 +
3311 +pfdTestRand dTestRand;
3312 +pfdRand dRand;
3313 +pfdRandGetSeed dRandGetSeed;
3314 +pfdRandSetSeed dRandSetSeed;
3315 +pfdRandInt dRandInt;
3316 +pfdRandReal dRandReal;
3317 +pfdPrintMatrix dPrintMatrix;
3318 +pfdMakeRandomVector dMakeRandomVector;
3319 +pfdMakeRandomMatrix dMakeRandomMatrix;
3320 +pfdClearUpperTriangle dClearUpperTriangle;
3321 +pfdMaxDifference dMaxDifference;
3322 pfdMaxDifferenceLowerTriangle dMaxDifferenceLowerTriangle;
3324 Index: DerelictODE/derelict/ode/collision.d
3325 ===================================================================
3326 --- DerelictODE/derelict/ode/collision.d (revision 318)
3327 +++ DerelictODE/derelict/ode/collision.d (working copy)
3328 @@ -97,7 +97,7 @@
3329 //==============================================================================
3330 // FUNCTIONS
3331 //==============================================================================
3332 -extern(C):
3333 +// extern(C):
3335 /**
3336 * @defgroup collide Collision Detection
3337 @@ -130,7 +130,7 @@
3338 * @param geom the geom to be destroyed.
3339 * @ingroup collide
3340 */
3341 -typedef void function(dGeomID geom) pfdGeomDestroy;
3342 +extern(C) alias void function(dGeomID geom) pfdGeomDestroy;
3343 pfdGeomDestroy dGeomDestroy;
3346 @@ -141,7 +141,7 @@
3347 * @param data the data pointer to be stored
3348 * @ingroup collide
3349 */
3350 -typedef void function(dGeomID geom, void* data) pfdGeomSetData;
3351 +extern(C) alias void function(dGeomID geom, void* data) pfdGeomSetData;
3352 pfdGeomSetData dGeomSetData;
3355 @@ -151,7 +151,7 @@
3356 * @param geom the geom containing the data
3357 * @ingroup collide
3358 */
3359 -typedef void* function(dGeomID geom) pfdGeomGetData;
3360 +extern(C) alias void* function(dGeomID geom) pfdGeomGetData;
3361 pfdGeomGetData dGeomGetData;
3364 @@ -173,7 +173,7 @@
3365 * @param body the body to attach to the geom
3366 * @ingroup collide
3367 */
3368 -typedef void function(dGeomID geom, dBodyID bodyid) pfdGeomSetBody;
3369 +extern(C) alias void function(dGeomID geom, dBodyID bodyid) pfdGeomSetBody;
3370 pfdGeomSetBody dGeomSetBody;
3373 @@ -183,7 +183,7 @@
3374 * @sa dGeomSetBody
3375 * @ingroup collide
3376 */
3377 -typedef dBodyID function(dGeomID geom) pfdGeomGetBody;
3378 +extern(C) alias dBodyID function(dGeomID geom) pfdGeomGetBody;
3379 pfdGeomGetBody dGeomGetBody;
3382 @@ -201,7 +201,7 @@
3383 * @sa dBodySetPosition
3384 * @ingroup collide
3385 */
3386 -typedef void function(dGeomID geom, dReal x, dReal y, dReal z) pfdGeomSetPosition;
3387 +extern(C) alias void function(dGeomID geom, dReal x, dReal y, dReal z) pfdGeomSetPosition;
3388 pfdGeomSetPosition dGeomSetPosition;
3391 @@ -217,7 +217,7 @@
3392 * @sa dBodySetRotation
3393 * @ingroup collide
3394 */
3395 -typedef void function(dGeomID geom, dMatrix3 R) pfdGeomSetRotation;
3396 +extern(C) alias void function(dGeomID geom, dMatrix3 R) pfdGeomSetRotation;
3397 pfdGeomSetRotation dGeomSetRotation;
3400 @@ -234,7 +234,7 @@
3401 * @sa dBodySetQuaternion
3402 * @ingroup collide
3403 */
3404 -typedef void function(dGeomID geom, dQuaternion Q) pfdGeomSetQuaternion;
3405 +extern(C) alias void function(dGeomID geom, dQuaternion Q) pfdGeomSetQuaternion;
3406 pfdGeomSetQuaternion dGeomSetQuaternion;
3409 @@ -254,7 +254,7 @@
3410 * @sa dBodyGetPosition
3411 * @ingroup collide
3412 */
3413 -typedef dReal* function(dGeomID geom) pfdGeomGetPosition;
3414 +extern(C) alias dReal* function(dGeomID geom) pfdGeomGetPosition;
3415 pfdGeomGetPosition dGeomGetPosition;
3417 /**
3418 @@ -264,7 +264,7 @@
3419 * @param pos a copy of the geom position
3420 * @sa dGeomGetPosition
3421 */
3422 -typedef void function(dGeomID geom, dVector3 pos) pfdGeomCopyPosition;
3423 +extern(C) alias void function(dGeomID geom, dVector3 pos) pfdGeomCopyPosition;
3424 pfdGeomCopyPosition dGeomCopyPosition;
3426 /**
3427 @@ -283,7 +283,7 @@
3428 * @sa dBodyGetRotation
3429 * @ingroup collide
3430 */
3431 -typedef dReal* function(dGeomID geom) pfdGeomGetRotation;
3432 +extern(C) alias dReal* function(dGeomID geom) pfdGeomGetRotation;
3433 pfdGeomGetRotation dGeomGetRotation;
3435 /**
3436 @@ -299,7 +299,7 @@
3437 * @sa dGeomGetRotation
3438 * @ingroup collide
3439 */
3440 -typedef void function(dGeomID geom, dMatrix3 R) pfdGeomCopyRotation;
3441 +extern(C) alias void function(dGeomID geom, dMatrix3 R) pfdGeomCopyRotation;
3442 pfdGeomCopyRotation dGeomCopyRotation;
3444 /**
3445 @@ -315,7 +315,7 @@
3446 * @sa dBodyGetQuaternion
3447 * @ingroup collide
3448 */
3449 -typedef void function(dGeomID geom, dQuaternion result) pfdGeomGetQuaternion;
3450 +extern(C) alias void function(dGeomID geom, dQuaternion result) pfdGeomGetQuaternion;
3451 pfdGeomGetQuaternion dGeomGetQuaternion;
3454 @@ -335,7 +335,7 @@
3455 * @param aabb the returned bounding box
3456 * @ingroup collide
3457 */
3458 -typedef void function(dGeomID geom, dReal aabb[6]) pfdGeomGetAABB;
3459 +extern(C) alias void function(dGeomID geom, dReal aabb[6]) pfdGeomGetAABB;
3460 pfdGeomGetAABB dGeomGetAABB;
3463 @@ -345,7 +345,7 @@
3464 * @returns Non-zero if the geom is a space, zero otherwise.
3465 * @ingroup collide
3466 */
3467 -typedef int function(dGeomID geom) pfdGeomIsSpace;
3468 +extern(C) alias int function(dGeomID geom) pfdGeomIsSpace;
3469 pfdGeomIsSpace dGeomIsSpace;
3472 @@ -356,7 +356,7 @@
3473 * not contained by a space.
3474 * @ingroup collide
3475 */
3476 -typedef dSpaceID function(dGeomID) pfdGeomGetSpace;
3477 +extern(C) alias dSpaceID function(dGeomID) pfdGeomGetSpace;
3478 pfdGeomGetSpace dGeomGetSpace;
3481 @@ -384,7 +384,7 @@
3482 * @returns The geom class ID.
3483 * @ingroup collide
3484 */
3485 -typedef int function(dGeomID geom) pfdGeomGetClass;
3486 +extern(C) alias int function(dGeomID geom) pfdGeomGetClass;
3487 pfdGeomGetClass dGeomGetClass;
3490 @@ -400,7 +400,7 @@
3491 * @param bits the new bitfield value
3492 * @ingroup collide
3493 */
3494 -typedef void function(dGeomID geom, ulong bits) pfdGeomSetCategoryBits;
3495 +extern(C) alias void function(dGeomID geom, ulong bits) pfdGeomSetCategoryBits;
3496 pfdGeomSetCategoryBits dGeomSetCategoryBits;
3499 @@ -416,7 +416,7 @@
3500 * @param bits the new bitfield value
3501 * @ingroup collide
3502 */
3503 -typedef void function(dGeomID geom, ulong bits) pfdGeomSetCollideBits;
3504 +extern(C) alias void function(dGeomID geom, ulong bits) pfdGeomSetCollideBits;
3505 pfdGeomSetCollideBits dGeomSetCollideBits;
3508 @@ -428,7 +428,7 @@
3509 * @sa dGeomSetCategoryBits
3510 * @ingroup collide
3511 */
3512 -typedef ulong function(dGeomID) pfdGeomGetCategoryBits;
3513 +extern(C) alias ulong function(dGeomID) pfdGeomGetCategoryBits;
3514 pfdGeomGetCategoryBits dGeomGetCategoryBits;
3517 @@ -440,7 +440,7 @@
3518 * @sa dGeomSetCollideBits
3519 * @ingroup collide
3520 */
3521 -typedef ulong function(dGeomID) pfdGeomGetCollideBits;
3522 +extern(C) alias ulong function(dGeomID) pfdGeomGetCollideBits;
3523 pfdGeomGetCollideBits dGeomGetCollideBits;
3526 @@ -456,7 +456,7 @@
3527 * @sa dGeomIsEnabled
3528 * @ingroup collide
3529 */
3530 -typedef void function(dGeomID geom) pfdGeomEnable;
3531 +extern(C) alias void function(dGeomID geom) pfdGeomEnable;
3532 pfdGeomEnable dGeomEnable;
3535 @@ -472,7 +472,7 @@
3536 * @sa dGeomIsEnabled
3537 * @ingroup collide
3538 */
3539 -typedef void function(dGeomID geom) pfdGeomDisable;
3540 +extern(C) alias void function(dGeomID geom) pfdGeomDisable;
3541 pfdGeomDisable dGeomDisable;
3544 @@ -489,7 +489,7 @@
3545 * @sa dGeomIsEnabled
3546 * @ingroup collide
3547 */
3548 -typedef int function(dGeomID geom) pfdGeomIsEnabled;
3549 +extern(C) alias int function(dGeomID geom) pfdGeomIsEnabled;
3550 pfdGeomIsEnabled dGeomIsEnabled;
3552 /* ************************************************************************ */
3553 @@ -510,7 +510,7 @@
3554 * @param z the new Z coordinate.
3555 * @ingroup collide
3556 */
3557 -typedef void function(dGeomID geom, dReal x, dReal y, dReal z) pfdGeomSetOffsetPosition;
3558 +extern(C) alias void function(dGeomID geom, dReal x, dReal y, dReal z) pfdGeomSetOffsetPosition;
3559 pfdGeomSetOffsetPosition dGeomSetOffsetPosition;
3562 @@ -527,7 +527,7 @@
3563 * @param R the new rotation matrix.
3564 * @ingroup collide
3565 */
3566 -typedef void function(dGeomID geom, dMatrix3 R) pfdGeomSetOffsetRotation;
3567 +extern(C) alias void function(dGeomID geom, dMatrix3 R) pfdGeomSetOffsetRotation;
3568 pfdGeomSetOffsetRotation dGeomSetOffsetRotation;
3571 @@ -544,7 +544,7 @@
3572 * @param Q the new rotation.
3573 * @ingroup collide
3574 */
3575 -typedef void function(dGeomID geom, dQuaternion Q) pfdGeomSetOffsetQuaternion;
3576 +extern(C) alias void function(dGeomID geom, dQuaternion Q) pfdGeomSetOffsetQuaternion;
3577 pfdGeomSetOffsetQuaternion dGeomSetOffsetQuaternion;
3580 @@ -564,7 +564,7 @@
3581 * @param z the new Z coordinate.
3582 * @ingroup collide
3583 */
3584 -typedef void function(dGeomID geom, dReal x, dReal y, dReal z) pfdGeomSetOffsetWorldPosition;
3585 +extern(C) alias void function(dGeomID geom, dReal x, dReal y, dReal z) pfdGeomSetOffsetWorldPosition;
3586 pfdGeomSetOffsetWorldPosition dGeomSetOffsetWorldPosition;
3589 @@ -582,7 +582,7 @@
3590 * @param R the new rotation matrix.
3591 * @ingroup collide
3592 */
3593 -typedef void function(dGeomID geom, dMatrix3 R) pfdGeomSetOffsetWorldRotation;
3594 +extern(C) alias void function(dGeomID geom, dMatrix3 R) pfdGeomSetOffsetWorldRotation;
3595 pfdGeomSetOffsetWorldRotation dGeomSetOffsetWorldRotation;
3598 @@ -600,7 +600,7 @@
3599 * @param Q the new rotation.
3600 * @ingroup collide
3601 */
3602 -typedef void function(dGeomID geom, dQuaternion) pfdGeomSetOffsetWorldQuaternion;
3603 +extern(C) alias void function(dGeomID geom, dQuaternion) pfdGeomSetOffsetWorldQuaternion;
3604 pfdGeomSetOffsetWorldQuaternion dGeomSetOffsetWorldQuaternion;
3607 @@ -617,7 +617,7 @@
3608 * @param geom the geom to have its offset destroyed.
3609 * @ingroup collide
3610 */
3611 -typedef void function(dGeomID geom) pfdGeomClearOffset;
3612 +extern(C) alias void function(dGeomID geom) pfdGeomClearOffset;
3613 pfdGeomClearOffset dGeomClearOffset;
3616 @@ -636,7 +636,7 @@
3617 * @returns Non-zero if the geom has an offset, zero otherwise.
3618 * @ingroup collide
3619 */
3620 -typedef int function(dGeomID geom) pfdGeomIsOffset;
3621 +extern(C) alias int function(dGeomID geom) pfdGeomIsOffset;
3622 pfdGeomIsOffset dGeomIsOffset;
3624 /**
3625 @@ -652,7 +652,7 @@
3626 * to the geom.
3627 * @ingroup collide
3628 */
3629 -typedef dReal* function(dGeomID geom) pfdGeomGetOffsetPosition;
3630 +extern(C) alias dReal* function(dGeomID geom) pfdGeomGetOffsetPosition;
3631 pfdGeomGetOffsetPosition dGeomGetOffsetPosition;
3633 /**
3634 @@ -665,7 +665,7 @@
3635 * @param pos returns the offset position
3636 * @ingroup collide
3637 */
3638 -typedef void function(dGeomID geom, dVector3 pos) pfdGeomCopyOffsetPosition;
3639 +extern(C) alias void function(dGeomID geom, dVector3 pos) pfdGeomCopyOffsetPosition;
3640 pfdGeomCopyOffsetPosition dGeomCopyOffsetPosition;
3642 /**
3643 @@ -681,7 +681,7 @@
3644 * to the geom.
3645 * @ingroup collide
3646 */
3647 -typedef dReal* function(dGeomID geom) pfdGeomGetOffsetRotation;
3648 +extern(C) alias dReal* function(dGeomID geom) pfdGeomGetOffsetRotation;
3649 pfdGeomGetOffsetRotation dGeomGetOffsetRotation;
3651 /**
3652 @@ -695,7 +695,7 @@
3653 * @param R returns the rotation matrix.
3654 * @ingroup collide
3655 */
3656 -typedef void function(dGeomID geom, dMatrix3 R) pfdGeomCopyOffsetRotation;
3657 +extern(C) alias void function(dGeomID geom, dMatrix3 R) pfdGeomCopyOffsetRotation;
3658 pfdGeomCopyOffsetRotation dGeomCopyOffsetRotation;
3660 /**
3661 @@ -708,7 +708,7 @@
3662 * @param result a copy of the rotation quaternion.
3663 * @ingroup collide
3664 */
3665 -typedef void function(dGeomID geom, dQuaternion result) pfdGeomGetOffsetQuaternion;
3666 +extern(C) alias void function(dGeomID geom, dQuaternion result) pfdGeomGetOffsetQuaternion;
3667 pfdGeomGetOffsetQuaternion dGeomGetOffsetQuaternion;
3669 /* ************************************************************************ */
3670 @@ -760,7 +760,7 @@
3671 *
3672 * @ingroup collide
3673 */
3674 -typedef int function(dGeomID o1, dGeomID o2, int flags, dContactGeom* contact, int skip) pfdCollide;
3675 +extern(C) alias int function(dGeomID o1, dGeomID o2, int flags, dContactGeom* contact, int skip) pfdCollide;
3676 pfdCollide dCollide;
3678 /**
3679 @@ -790,7 +790,7 @@
3680 * @sa dSpaceCollide2
3681 * @ingroup collide
3682 */
3683 -typedef void function(dSpaceID space, void* data, dNearCallback* callback) pfdSpaceCollide;
3684 +extern(C) alias void function(dSpaceID space, void* data, dNearCallback* callback) pfdSpaceCollide;
3685 pfdSpaceCollide dSpaceCollide;
3688 @@ -828,7 +828,7 @@
3689 * @sa dSpaceCollide
3690 * @ingroup collide
3691 */
3692 -typedef void function(dGeomID space1, dGeomID space2, void* data, dNearCallback* callback) pfdSpaceCollide2;
3693 +extern(C) alias void function(dGeomID space1, dGeomID space2, void* data, dNearCallback* callback) pfdSpaceCollide2;
3694 pfdSpaceCollide2 dSpaceCollide2;
3697 @@ -851,7 +851,7 @@
3698 * @sa dGeomSphereSetRadius
3699 * @ingroup collide_sphere
3700 */
3701 -typedef dGeomID function(dSpaceID space, dReal radius) pfdCreateSphere;
3702 +extern(C) alias dGeomID function(dSpaceID space, dReal radius) pfdCreateSphere;
3703 pfdCreateSphere dCreateSphere;
3706 @@ -864,7 +864,7 @@
3707 * @sa dGeomSphereGetRadius
3708 * @ingroup collide_sphere
3709 */
3710 -typedef void function(dGeomID space, dReal radius) pfdGeomSphereSetRadius;
3711 +extern(C) alias void function(dGeomID space, dReal radius) pfdGeomSphereSetRadius;
3712 pfdGeomSphereSetRadius dGeomSphereSetRadius;
3715 @@ -876,7 +876,7 @@
3716 * @sa dGeomSphereSetRadius
3717 * @ingroup collide_sphere
3718 */
3719 -typedef dReal function(dGeomID sphere) pfdGeomSphereGetRadius;
3720 +extern(C) alias dReal function(dGeomID sphere) pfdGeomSphereGetRadius;
3721 pfdGeomSphereGetRadius dGeomSphereGetRadius;
3724 @@ -894,15 +894,15 @@
3725 *
3726 * @ingroup collide_sphere
3727 */
3728 -typedef dReal function(dGeomID sphere, dReal x, dReal y, dReal z) pfdGeomSpherePointDepth;
3729 +extern(C) alias dReal function(dGeomID sphere, dReal x, dReal y, dReal z) pfdGeomSpherePointDepth;
3730 pfdGeomSpherePointDepth dGeomSpherePointDepth;
3733 //--> Convex Functions
3734 -typedef dGeomID function(dSpaceID space, dReal* _planes, uint _planecount, dReal* _points, uint _pointcount, uint* _polygons) pfdCreateConvex;
3735 +extern(C) alias dGeomID function(dSpaceID space, dReal* _planes, uint _planecount, dReal* _points, uint _pointcount, uint* _polygons) pfdCreateConvex;
3736 pfdCreateConvex dCreateConvex;
3738 -typedef void function(dGeomID g, dReal *_planes, uint _count, dReal *_points, uint _pointcount, uint *_polygons) pfdGeomSetConvex;
3739 +extern(C) alias void function(dGeomID g, dReal *_planes, uint _count, dReal *_points, uint _pointcount, uint *_polygons) pfdGeomSetConvex;
3740 pfdGeomSetConvex dGeomSetConvex;
3741 //<-- Convex Functions
3743 @@ -927,7 +927,7 @@
3744 * @sa dGeomBoxSetLengths
3745 * @ingroup collide_box
3746 */
3747 -typedef dGeomID function(dSpaceID space, dReal lx, dReal ly, dReal lz) pfdCreateBox;
3748 +extern(C) alias dGeomID function(dSpaceID space, dReal lx, dReal ly, dReal lz) pfdCreateBox;
3749 pfdCreateBox dCreateBox;
3752 @@ -942,7 +942,7 @@
3753 * @sa dGeomBoxGetLengths
3754 * @ingroup collide_box
3755 */
3756 -typedef void function(dGeomID box, dReal lx, dReal ly, dReal lz) pfdGeomBoxSetLengths;
3757 +extern(C) alias void function(dGeomID box, dReal lx, dReal ly, dReal lz) pfdGeomBoxSetLengths;
3758 pfdGeomBoxSetLengths dGeomBoxSetLengths;
3761 @@ -955,7 +955,7 @@
3762 * @sa dGeomBoxSetLengths
3763 * @ingroup collide_box
3764 */
3765 -typedef void function(dGeomID box, dVector3 result) pfdGeomBoxGetLengths;
3766 +extern(C) alias void function(dGeomID box, dVector3 result) pfdGeomBoxGetLengths;
3767 pfdGeomBoxGetLengths dGeomBoxGetLengths;
3770 @@ -971,32 +971,32 @@
3771 * positive depth, points outside it will have a negative depth, and points
3772 * on the surface will have a depth of zero.
3773 */
3774 -typedef dReal function(dGeomID box, dReal x, dReal y, dReal z) pfdGeomBoxPointDepth;
3775 +extern(C) alias dReal function(dGeomID box, dReal x, dReal y, dReal z) pfdGeomBoxPointDepth;
3776 pfdGeomBoxPointDepth dGeomBoxPointDepth;
3779 -typedef dGeomID function(dSpaceID space, dReal a, dReal b, dReal c, dReal d) pfdCreatePlane;
3780 +extern(C) alias dGeomID function(dSpaceID space, dReal a, dReal b, dReal c, dReal d) pfdCreatePlane;
3781 pfdCreatePlane dCreatePlane;
3783 -typedef void function(dGeomID plane, dReal a, dReal b, dReal c, dReal d) pfdGeomPlaneSetParams;
3784 +extern(C) alias void function(dGeomID plane, dReal a, dReal b, dReal c, dReal d) pfdGeomPlaneSetParams;
3785 pfdGeomPlaneSetParams dGeomPlaneSetParams;
3787 -typedef void function(dGeomID plane, dVector4 result) pfdGeomPlaneGetParams;
3788 +extern(C) alias void function(dGeomID plane, dVector4 result) pfdGeomPlaneGetParams;
3789 pfdGeomPlaneGetParams dGeomPlaneGetParams;
3791 -typedef dReal function(dGeomID plane, dReal x, dReal y, dReal z) pfdGeomPlanePointDepth;
3792 +extern(C) alias dReal function(dGeomID plane, dReal x, dReal y, dReal z) pfdGeomPlanePointDepth;
3793 pfdGeomPlanePointDepth dGeomPlanePointDepth;
3795 -typedef dGeomID function(dSpaceID space, dReal radius, dReal length) pfdCreateCapsule;
3796 +extern(C) alias dGeomID function(dSpaceID space, dReal radius, dReal length) pfdCreateCapsule;
3797 pfdCreateCapsule dCreateCapsule;
3799 -typedef void function(dGeomID ccylinder, dReal radius, dReal length) pfdGeomCapsuleSetParams;
3800 +extern(C) alias void function(dGeomID ccylinder, dReal radius, dReal length) pfdGeomCapsuleSetParams;
3801 pfdGeomCapsuleSetParams dGeomCapsuleSetParams;
3803 -typedef void function(dGeomID ccylinder, dReal* radius, dReal* length) pfdGeomCapsuleGetParams;
3804 +extern(C) alias void function(dGeomID ccylinder, dReal* radius, dReal* length) pfdGeomCapsuleGetParams;
3805 pfdGeomCapsuleGetParams dGeomCapsuleGetParams;
3807 -typedef dReal function(dGeomID ccylinder, dReal x, dReal y, dReal z) pfdGeomCapsulePointDepth;
3808 +extern(C) alias dReal function(dGeomID ccylinder, dReal x, dReal y, dReal z) pfdGeomCapsulePointDepth;
3809 pfdGeomCapsulePointDepth dGeomCapsulePointDepth;
3811 // For now we want to have a backwards compatible C-API, note: C++ API is not.
3812 @@ -1006,28 +1006,28 @@
3813 alias dGeomCapsulePointDepth dGeomCCylinderPointDepth;
3814 alias dCapsuleClass dCCylinderClass;
3816 -typedef dGeomID function(dSpaceID space, dReal radius, dReal length) pfdCreateCylinder;
3817 +extern(C) alias dGeomID function(dSpaceID space, dReal radius, dReal length) pfdCreateCylinder;
3818 pfdCreateCylinder dCreateCylinder;
3820 -typedef void function(dGeomID cylinder, dReal radius, dReal length) pfdGeomCylinderSetParams;
3821 +extern(C) alias void function(dGeomID cylinder, dReal radius, dReal length) pfdGeomCylinderSetParams;
3822 pfdGeomCylinderSetParams dGeomCylinderSetParams;
3824 -typedef void function(dGeomID cylinder, dReal* radius, dReal* length) pfdGeomCylinderGetParams;
3825 +extern(C) alias void function(dGeomID cylinder, dReal* radius, dReal* length) pfdGeomCylinderGetParams;
3826 pfdGeomCylinderGetParams dGeomCylinderGetParams;
3828 -typedef dGeomID function(dSpaceID space, dReal length) pfdCreateRay;
3829 +extern(C) alias dGeomID function(dSpaceID space, dReal length) pfdCreateRay;
3830 pfdCreateRay dCreateRay;
3832 -typedef void function(dGeomID ray, dReal length) pfdGeomRaySetLength;
3833 +extern(C) alias void function(dGeomID ray, dReal length) pfdGeomRaySetLength;
3834 pfdGeomRaySetLength dGeomRaySetLength;
3836 -typedef dReal function(dGeomID ray) pfdGeomRayGetLength;
3837 +extern(C) alias dReal function(dGeomID ray) pfdGeomRayGetLength;
3838 pfdGeomRayGetLength dGeomRayGetLength;
3840 -typedef void function(dGeomID ray, dReal px, dReal py, dReal pz, dReal dx, dReal dy, dReal dz) pfdGeomRaySet;
3841 +extern(C) alias void function(dGeomID ray, dReal px, dReal py, dReal pz, dReal dx, dReal dy, dReal dz) pfdGeomRaySet;
3842 pfdGeomRaySet dGeomRaySet;
3844 -typedef void function(dGeomID ray, dVector3 start, dVector3 dir) pfdGeomRayGet;
3845 +extern(C) alias void function(dGeomID ray, dVector3 start, dVector3 dir) pfdGeomRayGet;
3846 pfdGeomRayGet dGeomRayGet;
3848 /*
3849 @@ -1035,38 +1035,38 @@
3850 * These flags are currently only noticed by the trimesh collider, because
3851 * they can make a major differences there.
3852 */
3853 -typedef void function(dGeomID g, int FirstContact, int BackfaceCull) pfdGeomRaySetParams;
3854 +extern(C) alias void function(dGeomID g, int FirstContact, int BackfaceCull) pfdGeomRaySetParams;
3855 pfdGeomRaySetParams dGeomRaySetParams;
3857 -typedef void function(dGeomID g, int* FirstContact, int* BackfaceCull) pfdGeomRayGetParams;
3858 +extern(C) alias void function(dGeomID g, int* FirstContact, int* BackfaceCull) pfdGeomRayGetParams;
3859 pfdGeomRayGetParams dGeomRayGetParams;
3861 -typedef void function(dGeomID g, int closestHit) pfdGeomRaySetClosestHit;
3862 +extern(C) alias void function(dGeomID g, int closestHit) pfdGeomRaySetClosestHit;
3863 pfdGeomRaySetClosestHit dGeomRaySetClosestHit;
3865 -typedef int function(dGeomID g) pfdGeomRayGetClosestHit;
3866 +extern(C) alias int function(dGeomID g) pfdGeomRayGetClosestHit;
3867 pfdGeomRayGetClosestHit dGeomRayGetClosestHit;
3870 -typedef dGeomID function(dSpaceID space) pfdCreateGeomTransform;
3871 +extern(C) alias dGeomID function(dSpaceID space) pfdCreateGeomTransform;
3872 pfdCreateGeomTransform dCreateGeomTransform;
3874 -typedef void function(dGeomID g, dGeomID obj) pfdGeomTransformSetGeom;
3875 +extern(C) alias void function(dGeomID g, dGeomID obj) pfdGeomTransformSetGeom;
3876 pfdGeomTransformSetGeom dGeomTransformSetGeom;
3878 -typedef dGeomID function(dGeomID g) pfdGeomTransformGetGeom;
3879 +extern(C) alias dGeomID function(dGeomID g) pfdGeomTransformGetGeom;
3880 pfdGeomTransformGetGeom dGeomTransformGetGeom;
3882 -typedef void function(dGeomID g, int mode) pfdGeomTransformSetCleanup;
3883 +extern(C) alias void function(dGeomID g, int mode) pfdGeomTransformSetCleanup;
3884 pfdGeomTransformSetCleanup dGeomTransformSetCleanup;
3886 -typedef int function(dGeomID g) pfdGeomTransformGetCleanup;
3887 +extern(C) alias int function(dGeomID g) pfdGeomTransformGetCleanup;
3888 pfdGeomTransformGetCleanup dGeomTransformGetCleanup;
3890 -typedef void function(dGeomID g, int mode) pfdGeomTransformSetInfo;
3891 +extern(C) alias void function(dGeomID g, int mode) pfdGeomTransformSetInfo;
3892 pfdGeomTransformSetInfo dGeomTransformSetInfo;
3894 -typedef int function(dGeomID g) pfdGeomTransformGetInfo;
3895 +extern(C) alias int function(dGeomID g) pfdGeomTransformGetInfo;
3896 pfdGeomTransformGetInfo dGeomTransformGetInfo;
3899 @@ -1076,7 +1076,7 @@
3901 // Data storage for heightfield data.
3902 private struct dxHeightfieldData {}
3903 -typedef dxHeightfieldData* dHeightfieldDataID;
3904 +alias dxHeightfieldData* dHeightfieldDataID;
3907 /**
3908 @@ -1096,7 +1096,7 @@
3909 *
3910 * @ingroup collide
3911 */
3912 -typedef dReal function( void* p_user_data, int x, int z ) dHeightfieldGetHeight;
3913 +extern(C) alias dReal function( void* p_user_data, int x, int z ) dHeightfieldGetHeight;
3917 @@ -1119,7 +1119,7 @@
3918 *
3919 * @ingroup collide
3920 */
3921 -typedef dGeomID function(dSpaceID space, dHeightfieldDataID data, int bPlaceable) pfdCreateHeightfield;
3922 +extern(C) alias dGeomID function(dSpaceID space, dHeightfieldDataID data, int bPlaceable) pfdCreateHeightfield;
3923 pfdCreateHeightfield dCreateHeightfield;
3926 @@ -1135,7 +1135,7 @@
3927 * dGeomHeightfieldDataBuildFloat.
3928 * @ingroup collide
3929 */
3930 -typedef dHeightfieldDataID function() pfdGeomHeightfieldDataCreate;
3931 +extern(C) alias dHeightfieldDataID function() pfdGeomHeightfieldDataCreate;
3932 pfdGeomHeightfieldDataCreate dGeomHeightfieldDataCreate;
3935 @@ -1147,7 +1147,7 @@
3936 * @param d A dHeightfieldDataID created by dGeomHeightfieldDataCreate
3937 * @ingroup collide
3938 */
3939 -typedef void function(dHeightfieldDataID d) pfdGeomHeightfieldDataDestroy;
3940 +extern(C) alias void function(dHeightfieldDataID d) pfdGeomHeightfieldDataDestroy;
3941 pfdGeomHeightfieldDataDestroy dGeomHeightfieldDataDestroy;
3944 @@ -1191,7 +1191,7 @@
3945 *
3946 * @ingroup collide
3947 */
3948 -typedef void function(dHeightfieldDataID d, void* pUserData, dHeightfieldGetHeight* pCallback, dReal width, dReal depth, int widthSamples, int depthSamples, dReal scale, dReal offset, dReal thickness, int bWrap) pfdGeomHeightfieldDataBuildCallback;
3949 +extern(C) alias void function(dHeightfieldDataID d, void* pUserData, dHeightfieldGetHeight* pCallback, dReal width, dReal depth, int widthSamples, int depthSamples, dReal scale, dReal offset, dReal thickness, int bWrap) pfdGeomHeightfieldDataBuildCallback;
3950 pfdGeomHeightfieldDataBuildCallback dGeomHeightfieldDataBuildCallback;
3952 /**
3953 @@ -1237,7 +1237,7 @@
3954 *
3955 * @ingroup collide
3956 */
3957 -typedef void function(dHeightfieldDataID d, ubyte* pHeightData, int bCopyHeightData, dReal width, dReal depth, int widthSamples, int depthSamples, dReal scale, dReal offset, dReal thickness, int bWrap) pfdGeomHeightfieldDataBuildByte;
3958 +extern(C) alias void function(dHeightfieldDataID d, ubyte* pHeightData, int bCopyHeightData, dReal width, dReal depth, int widthSamples, int depthSamples, dReal scale, dReal offset, dReal thickness, int bWrap) pfdGeomHeightfieldDataBuildByte;
3959 pfdGeomHeightfieldDataBuildByte dGeomHeightfieldDataBuildByte;
3961 /**
3962 @@ -1283,7 +1283,7 @@
3963 *
3964 * @ingroup collide
3965 */
3966 -typedef void function(dHeightfieldDataID d, short* pHeightData, int bCopyHeightData, dReal width, dReal depth, int widthSamples, int depthSamples, dReal scale, dReal offset, dReal thickness, int bWrap) pfdGeomHeightfieldDataBuildShort;
3967 +extern(C) alias void function(dHeightfieldDataID d, short* pHeightData, int bCopyHeightData, dReal width, dReal depth, int widthSamples, int depthSamples, dReal scale, dReal offset, dReal thickness, int bWrap) pfdGeomHeightfieldDataBuildShort;
3968 pfdGeomHeightfieldDataBuildShort dGeomHeightfieldDataBuildShort;
3970 /**
3971 @@ -1331,7 +1331,7 @@
3972 *
3973 * @ingroup collide
3974 */
3975 -typedef void function(dHeightfieldDataID d, float* pHeightData, int bCopyHeightData, dReal width, dReal depth, int widthSamples, int depthSamples, dReal scale, dReal offset, dReal thickness, int bWrap) pfdGeomHeightfieldDataBuildSingle;
3976 +extern(C) alias void function(dHeightfieldDataID d, float* pHeightData, int bCopyHeightData, dReal width, dReal depth, int widthSamples, int depthSamples, dReal scale, dReal offset, dReal thickness, int bWrap) pfdGeomHeightfieldDataBuildSingle;
3977 pfdGeomHeightfieldDataBuildSingle dGeomHeightfieldDataBuildSingle;
3979 /**
3980 @@ -1379,7 +1379,7 @@
3981 *
3982 * @ingroup collide
3983 */
3984 -typedef void function(dHeightfieldDataID d, double* pHeightData, int bCopyHeightData, dReal width, dReal depth, int widthSamples, int depthSamples, dReal scale, dReal offset, dReal thickness, int bWrap) pfdGeomHeightfieldDataBuildDouble;
3985 +extern(C) alias void function(dHeightfieldDataID d, double* pHeightData, int bCopyHeightData, dReal width, dReal depth, int widthSamples, int depthSamples, dReal scale, dReal offset, dReal thickness, int bWrap) pfdGeomHeightfieldDataBuildDouble;
3986 pfdGeomHeightfieldDataBuildDouble dGeomHeightfieldDataBuildDouble;
3988 /**
3989 @@ -1399,7 +1399,7 @@
3990 * @param max_height The new maximum height value. Scale and offset is then applied.
3991 * @ingroup collide
3992 */
3993 -typedef void function(dHeightfieldDataID d, dReal minHeight, dReal maxHeight) pfdGeomHeightfieldDataSetBounds;
3994 +extern(C) alias void function(dHeightfieldDataID d, dReal minHeight, dReal maxHeight) pfdGeomHeightfieldDataSetBounds;
3995 pfdGeomHeightfieldDataSetBounds dGeomHeightfieldDataSetBounds;
3998 @@ -1413,7 +1413,7 @@
3999 * @param d A dHeightfieldDataID created by dGeomHeightfieldDataCreate
4000 * @ingroup collide
4001 */
4002 -typedef void function(dGeomID g, dHeightfieldDataID d) pfdGeomHeightfieldSetHeightfieldData;
4003 +extern(C) alias void function(dGeomID g, dHeightfieldDataID d) pfdGeomHeightfieldSetHeightfieldData;
4004 pfdGeomHeightfieldSetHeightfieldData dGeomHeightfieldSetHeightfieldData;
4007 @@ -1426,38 +1426,38 @@
4008 * @return The dHeightfieldDataID which may be NULL if none was assigned.
4009 * @ingroup collide
4010 */
4011 -typedef dHeightfieldDataID function(dGeomID g) pfdGeomHeightfieldGetHeightfieldData;
4012 +extern(C) alias dHeightfieldDataID function(dGeomID g) pfdGeomHeightfieldGetHeightfieldData;
4013 pfdGeomHeightfieldGetHeightfieldData dGeomHeightfieldGetHeightfieldData;
4017 /* ************************************************************************ */
4018 /* utility functions */
4019 -typedef void function(dVector3 a1, dVector3 a2, dVector3 b1, dVector3 b2, dVector3 cp1, dVector3 cp2) pfdClosestLineSegmentPoints;
4020 +extern(C) alias void function(dVector3 a1, dVector3 a2, dVector3 b1, dVector3 b2, dVector3 cp1, dVector3 cp2) pfdClosestLineSegmentPoints;
4021 pfdClosestLineSegmentPoints dClosestLineSegmentPoints;
4023 -typedef int function(dVector3 _p1, dMatrix3 R1, dVector3 side1, dVector3 _p2, dMatrix3 R2, dVector3 side2) pfdBoxTouchesBox;
4024 +extern(C) alias int function(dVector3 _p1, dMatrix3 R1, dVector3 side1, dVector3 _p2, dMatrix3 R2, dVector3 side2) pfdBoxTouchesBox;
4025 pfdBoxTouchesBox dBoxTouchesBox;
4027 -typedef int function(dVector3 p1, dMatrix3 R1, dVector3 side1, dVector3 p2, dMatrix3 R2, dVector3 side2, dVector3 normal, dReal* depth, int* return_code, int maxc, dContactGeom* contact, int skip) pfdBoxBox;
4028 +extern(C) alias int function(dVector3 p1, dMatrix3 R1, dVector3 side1, dVector3 p2, dMatrix3 R2, dVector3 side2, dVector3 normal, dReal* depth, int* return_code, int maxc, dContactGeom* contact, int skip) pfdBoxBox;
4029 pfdBoxBox dBoxBox;
4031 -typedef void function(dGeomID geom, dReal aabb[6]) pfdInfiniteAABB;
4032 +extern(C) alias void function(dGeomID geom, dReal aabb[6]) pfdInfiniteAABB;
4033 pfdInfiniteAABB dInfiniteAABB;
4035 -typedef void function() pfdInitODE;
4036 +extern(C) alias void function() pfdInitODE;
4037 pfdInitODE dInitODE;
4039 -typedef void function() pfdCloseODE;
4040 +extern(C) alias void function() pfdCloseODE;
4041 pfdCloseODE dCloseODE;
4043 -typedef int function(dGeomClass* classptr) pfdCreateGeomClass;
4044 +extern(C) alias int function(dGeomClass* classptr) pfdCreateGeomClass;
4045 pfdCreateGeomClass dCreateGeomClass;
4047 -typedef void* function(dGeomID) pfdGeomGetClassData;
4048 +extern(C) alias void* function(dGeomID) pfdGeomGetClassData;
4049 pfdGeomGetClassData dGeomGetClassData;
4051 -typedef dGeomID function(int classnum) pfdCreateGeom;
4052 +extern(C) alias dGeomID function(int classnum) pfdCreateGeom;
4053 pfdCreateGeom dCreateGeom;
4056 Index: DerelictFT/derelict/freetype/ftfuncs.d
4057 ===================================================================
4058 --- DerelictFT/derelict/freetype/ftfuncs.d (revision 318)
4059 +++ DerelictFT/derelict/freetype/ftfuncs.d (working copy)
4060 @@ -349,300 +349,301 @@
4063 // C calling convention for BOTH linux and Windows
4064 -extern(C):
4065 +extern(C) {
4068 -//BEGIN Typedefs
4069 +//BEGIN aliass
4070 // freetype.h (FT_FREETYPE_H)
4071 -typedef FT_Error function( FT_Library *alibrary ) pfFT_Init_FreeType;
4072 -typedef FT_Error function( FT_Library library ) pfFT_Done_FreeType;
4073 -typedef FT_Error function( FT_Library library, char* filepathname, FT_Long face_index, FT_Face *aface ) pfFT_New_Face;
4074 -typedef FT_Error function( FT_Library library, FT_Byte* file_base, FT_Long file_size, FT_Long face_index, FT_Face *aface ) pfFT_New_Memory_Face;
4075 -typedef FT_Error function( FT_Library library, FT_Open_Args* args, FT_Long face_index, FT_Face *aface ) pfFT_Open_Face;
4076 -typedef FT_Error function( FT_Face face, char* filepathname ) pfFT_Attach_File;
4077 -typedef FT_Error function( FT_Face face, FT_Open_Args* parameters ) pfFT_Attach_Stream;
4078 -typedef FT_Error function( FT_Face face ) pfFT_Done_Face;
4079 -typedef FT_Error function( FT_Face face, FT_Int strike_index ) pfFT_Select_Size;
4080 -typedef FT_Error function( FT_Face face, FT_Size_Request req ) pfFT_Request_Size;
4081 -typedef FT_Error function( FT_Face face, FT_F26Dot6 char_width, FT_F26Dot6 char_height, FT_UInt horz_resolution, FT_UInt vert_resolution ) pfFT_Set_Char_Size;
4082 -typedef FT_Error function( FT_Face face, FT_UInt pixel_width, FT_UInt pixel_height ) pfFT_Set_Pixel_Sizes;
4083 -typedef FT_Error function( FT_Face face, FT_UInt glyph_index, FT_Int32 load_flags ) pfFT_Load_Glyph;
4084 -typedef FT_Error function( FT_Face face, FT_ULong char_code, FT_Int32 load_flags ) pfFT_Load_Char;
4085 -typedef void function( FT_Face face, FT_Matrix* matrix, FT_Vector* delta ) pfFT_Set_Transform;
4086 -typedef FT_Error function( FT_GlyphSlot slot, FT_Render_Mode render_mode ) pfFT_Render_Glyph;
4087 -typedef FT_Error function( FT_Face face, FT_UInt left_glyph, FT_UInt right_glyph, FT_UInt kern_mode, FT_Vector *akerning ) pfFT_Get_Kerning;
4088 -typedef FT_Error function( FT_Face face, FT_Fixed point_size, FT_Int degree, FT_Fixed* akerning ) pfFT_Get_Track_Kerning;
4089 -typedef FT_Error function( FT_Face face, FT_UInt glyph_index, FT_Pointer buffer, FT_UInt buffer_max ) pfFT_Get_Glyph_Name;
4090 -typedef char* function( FT_Face face ) pfFT_Get_Postscript_Name;
4091 -typedef FT_Error function( FT_Face face, FT_Encoding encoding ) pfFT_Select_Charmap;
4092 -typedef FT_Error function( FT_Face face, FT_CharMap charmap ) pfFT_Set_Charmap;
4093 -typedef FT_Int function( FT_CharMap charmap ) pfFT_Get_Charmap_Index;
4094 -typedef FT_UInt function( FT_Face face, FT_ULong charcode ) pfFT_Get_Char_Index;
4095 -typedef FT_ULong function( FT_Face face, FT_UInt *agindex ) pfFT_Get_First_Char;
4096 -typedef FT_ULong function( FT_Face face, FT_ULong char_code, FT_UInt *agindex ) pfFT_Get_Next_Char;
4097 -typedef FT_UInt function( FT_Face face, FT_String* glyph_name ) pfFT_Get_Name_Index;
4098 -typedef FT_Long function( FT_Long a, FT_Long b, FT_Long c ) pfFT_MulDiv;
4099 -typedef FT_Long function( FT_Long a, FT_Long b ) pfFT_MulFix;
4100 -typedef FT_Long function( FT_Long a, FT_Long b ) pfFT_DivFix;
4101 -typedef FT_Fixed function( FT_Fixed a ) pfFT_RoundFix;
4102 -typedef FT_Fixed function( FT_Fixed a ) pfFT_CeilFix;
4103 -typedef FT_Fixed function( FT_Fixed a ) pfFT_FloorFix;
4104 -typedef void function( FT_Vector* vec, FT_Matrix* matrix ) pfFT_Vector_Transform;
4105 -typedef void function( FT_Library library, FT_Int *amajor, FT_Int *aminor, FT_Int *apatch ) pfFT_Library_Version;
4106 -typedef FT_Bool function( FT_Face face ) pfFT_Face_CheckTrueTypePatents;
4107 -typedef FT_Bool function( FT_Face face, FT_Bool value ) pfFT_Face_SetUnpatentedHinting;
4108 +alias FT_Error function( FT_Library *alibrary ) pfFT_Init_FreeType;
4109 +alias FT_Error function( FT_Library library ) pfFT_Done_FreeType;
4110 +alias FT_Error function( FT_Library library, char* filepathname, FT_Long face_index, FT_Face *aface ) pfFT_New_Face;
4111 +alias FT_Error function( FT_Library library, FT_Byte* file_base, FT_Long file_size, FT_Long face_index, FT_Face *aface ) pfFT_New_Memory_Face;
4112 +alias FT_Error function( FT_Library library, FT_Open_Args* args, FT_Long face_index, FT_Face *aface ) pfFT_Open_Face;
4113 +alias FT_Error function( FT_Face face, char* filepathname ) pfFT_Attach_File;
4114 +alias FT_Error function( FT_Face face, FT_Open_Args* parameters ) pfFT_Attach_Stream;
4115 +alias FT_Error function( FT_Face face ) pfFT_Done_Face;
4116 +alias FT_Error function( FT_Face face, FT_Int strike_index ) pfFT_Select_Size;
4117 +alias FT_Error function( FT_Face face, FT_Size_Request req ) pfFT_Request_Size;
4118 +alias FT_Error function( FT_Face face, FT_F26Dot6 char_width, FT_F26Dot6 char_height, FT_UInt horz_resolution, FT_UInt vert_resolution ) pfFT_Set_Char_Size;
4119 +alias FT_Error function( FT_Face face, FT_UInt pixel_width, FT_UInt pixel_height ) pfFT_Set_Pixel_Sizes;
4120 +alias FT_Error function( FT_Face face, FT_UInt glyph_index, FT_Int32 load_flags ) pfFT_Load_Glyph;
4121 +alias FT_Error function( FT_Face face, FT_ULong char_code, FT_Int32 load_flags ) pfFT_Load_Char;
4122 +alias void function( FT_Face face, FT_Matrix* matrix, FT_Vector* delta ) pfFT_Set_Transform;
4123 +alias FT_Error function( FT_GlyphSlot slot, FT_Render_Mode render_mode ) pfFT_Render_Glyph;
4124 +alias FT_Error function( FT_Face face, FT_UInt left_glyph, FT_UInt right_glyph, FT_UInt kern_mode, FT_Vector *akerning ) pfFT_Get_Kerning;
4125 +alias FT_Error function( FT_Face face, FT_Fixed point_size, FT_Int degree, FT_Fixed* akerning ) pfFT_Get_Track_Kerning;
4126 +alias FT_Error function( FT_Face face, FT_UInt glyph_index, FT_Pointer buffer, FT_UInt buffer_max ) pfFT_Get_Glyph_Name;
4127 +alias char* function( FT_Face face ) pfFT_Get_Postscript_Name;
4128 +alias FT_Error function( FT_Face face, FT_Encoding encoding ) pfFT_Select_Charmap;
4129 +alias FT_Error function( FT_Face face, FT_CharMap charmap ) pfFT_Set_Charmap;
4130 +alias FT_Int function( FT_CharMap charmap ) pfFT_Get_Charmap_Index;
4131 +alias FT_UInt function( FT_Face face, FT_ULong charcode ) pfFT_Get_Char_Index;
4132 +alias FT_ULong function( FT_Face face, FT_UInt *agindex ) pfFT_Get_First_Char;
4133 +alias FT_ULong function( FT_Face face, FT_ULong char_code, FT_UInt *agindex ) pfFT_Get_Next_Char;
4134 +alias FT_UInt function( FT_Face face, FT_String* glyph_name ) pfFT_Get_Name_Index;
4135 +alias FT_Long function( FT_Long a, FT_Long b, FT_Long c ) pfFT_MulDiv;
4136 +alias FT_Long function( FT_Long a, FT_Long b ) pfFT_MulFix;
4137 +alias FT_Long function( FT_Long a, FT_Long b ) pfFT_DivFix;
4138 +alias FT_Fixed function( FT_Fixed a ) pfFT_RoundFix;
4139 +alias FT_Fixed function( FT_Fixed a ) pfFT_CeilFix;
4140 +alias FT_Fixed function( FT_Fixed a ) pfFT_FloorFix;
4141 +alias void function( FT_Vector* vec, FT_Matrix* matrix ) pfFT_Vector_Transform;
4142 +alias void function( FT_Library library, FT_Int *amajor, FT_Int *aminor, FT_Int *apatch ) pfFT_Library_Version;
4143 +alias FT_Bool function( FT_Face face ) pfFT_Face_CheckTrueTypePatents;
4144 +alias FT_Bool function( FT_Face face, FT_Bool value ) pfFT_Face_SetUnpatentedHinting;
4146 // ftlist.h (FT_LIST_H)
4147 -typedef FT_ListNode function( FT_List list, void* data ) pfFT_List_Find;
4148 -typedef void function( FT_List list, FT_ListNode node ) pfFT_List_Add;
4149 -typedef void function( FT_List list, FT_ListNode node ) pfFT_List_Insert;
4150 -typedef void function( FT_List list, FT_ListNode node ) pfFT_List_Remove;
4151 -typedef void function( FT_List list, FT_ListNode node ) pfFT_List_Up;
4152 -typedef FT_Error function( FT_List list, FT_List_Iterator iterator, void* user ) pfFT_List_Iterate;
4153 -typedef void function( FT_List list, FT_List_Destructor destroy, FT_Memory memory, void* user ) pfFT_List_Finalize;
4154 +alias FT_ListNode function( FT_List list, void* data ) pfFT_List_Find;
4155 +alias void function( FT_List list, FT_ListNode node ) pfFT_List_Add;
4156 +alias void function( FT_List list, FT_ListNode node ) pfFT_List_Insert;
4157 +alias void function( FT_List list, FT_ListNode node ) pfFT_List_Remove;
4158 +alias void function( FT_List list, FT_ListNode node ) pfFT_List_Up;
4159 +alias FT_Error function( FT_List list, FT_List_Iterator iterator, void* user ) pfFT_List_Iterate;
4160 +alias void function( FT_List list, FT_List_Destructor destroy, FT_Memory memory, void* user ) pfFT_List_Finalize;
4162 // ftoutln.h (FT_OUTLINE_H, FT_STROKER_H)
4163 -typedef FT_Error function( FT_Outline* outline, FT_Outline_Funcs* func_interface, void* user ) pfFT_Outline_Decompose;
4164 -typedef FT_Error function( FT_Library library, FT_UInt numPoints, FT_Int numContours, FT_Outline *anoutline ) pfFT_Outline_New;
4165 -typedef FT_Error function( FT_Memory memory, FT_UInt numPoints, FT_Int numContours, FT_Outline *anoutline ) pfFT_Outline_New_Internal;
4166 -typedef FT_Error function( FT_Library library, FT_Outline* outline ) pfFT_Outline_Done;
4167 -typedef FT_Error function( FT_Memory memory, FT_Outline* outline ) pfFT_Outline_Done_Internal;
4168 -typedef FT_Error function( FT_Outline* outline ) pfFT_Outline_Check;
4169 -typedef void function( FT_Outline* outline, FT_BBox *acbox ) pfFT_Outline_Get_CBox;
4170 -typedef void function( FT_Outline* outline, FT_Pos xOffset, FT_Pos yOffset ) pfFT_Outline_Translate;
4171 -typedef FT_Error function( FT_Outline* source, FT_Outline *target ) pfFT_Outline_Copy;
4172 -typedef void function( FT_Outline* outline, FT_Matrix* matrix ) pfFT_Outline_Transform;
4173 -typedef FT_Error function( FT_Outline* outline, FT_Pos strength ) pfFT_Outline_Embolden;
4174 -typedef void function( FT_Outline* outline ) pfFT_Outline_Reverse;
4175 -typedef FT_Error function( FT_Library library, FT_Outline* outline, FT_Bitmap *abitmap ) pfFT_Outline_Get_Bitmap;
4176 -typedef FT_Error function( FT_Library library, FT_Outline* outline, FT_Raster_Params* params ) pfFT_Outline_Render;
4177 -typedef FT_Orientation function( FT_Outline* outline ) pfFT_Outline_Get_Orientation;
4178 +alias FT_Error function( FT_Outline* outline, FT_Outline_Funcs* func_interface, void* user ) pfFT_Outline_Decompose;
4179 +alias FT_Error function( FT_Library library, FT_UInt numPoints, FT_Int numContours, FT_Outline *anoutline ) pfFT_Outline_New;
4180 +alias FT_Error function( FT_Memory memory, FT_UInt numPoints, FT_Int numContours, FT_Outline *anoutline ) pfFT_Outline_New_Internal;
4181 +alias FT_Error function( FT_Library library, FT_Outline* outline ) pfFT_Outline_Done;
4182 +alias FT_Error function( FT_Memory memory, FT_Outline* outline ) pfFT_Outline_Done_Internal;
4183 +alias FT_Error function( FT_Outline* outline ) pfFT_Outline_Check;
4184 +alias void function( FT_Outline* outline, FT_BBox *acbox ) pfFT_Outline_Get_CBox;
4185 +alias void function( FT_Outline* outline, FT_Pos xOffset, FT_Pos yOffset ) pfFT_Outline_Translate;
4186 +alias FT_Error function( FT_Outline* source, FT_Outline *target ) pfFT_Outline_Copy;
4187 +alias void function( FT_Outline* outline, FT_Matrix* matrix ) pfFT_Outline_Transform;
4188 +alias FT_Error function( FT_Outline* outline, FT_Pos strength ) pfFT_Outline_Embolden;
4189 +alias void function( FT_Outline* outline ) pfFT_Outline_Reverse;
4190 +alias FT_Error function( FT_Library library, FT_Outline* outline, FT_Bitmap *abitmap ) pfFT_Outline_Get_Bitmap;
4191 +alias FT_Error function( FT_Library library, FT_Outline* outline, FT_Raster_Params* params ) pfFT_Outline_Render;
4192 +alias FT_Orientation function( FT_Outline* outline ) pfFT_Outline_Get_Orientation;
4194 // ftsizes.h (FT_SIZES_H)
4195 -typedef FT_Error function( FT_Face face, FT_Size* size ) pfFT_New_Size;
4196 -typedef FT_Error function( FT_Size size ) pfFT_Done_Size;
4197 -typedef FT_Error function( FT_Size size ) pfFT_Activate_Size;
4198 +alias FT_Error function( FT_Face face, FT_Size* size ) pfFT_New_Size;
4199 +alias FT_Error function( FT_Size size ) pfFT_Done_Size;
4200 +alias FT_Error function( FT_Size size ) pfFT_Activate_Size;
4202 // ftmodapi.h (FT_MODULE_H, FT_RENDER_H)
4203 -typedef FT_Error function( FT_Library library, FT_Module_Class* clazz ) pfFT_Add_Module;
4204 -typedef FT_Module function( FT_Library library, char* module_name ) pfFT_Get_Module;
4205 -typedef FT_Error function( FT_Library library, FT_Module mod ) pfFT_Remove_Module;
4206 -typedef FT_Error function( FT_Memory memory, FT_Library *alibrary ) pfFT_New_Library;
4207 -typedef FT_Error function( FT_Library library ) pfFT_Done_Library;
4208 -typedef void function( FT_Library library, FT_UInt hook_index, FT_DebugHook_Func debug_hook ) pfFT_Set_Debug_Hook;
4209 -typedef void function( FT_Library library ) pfFT_Add_Default_Modules;
4210 -typedef FT_TrueTypeEngineType function( FT_Library library ) pfFT_Get_TrueType_Engine_Type;
4211 +alias FT_Error function( FT_Library library, FT_Module_Class* clazz ) pfFT_Add_Module;
4212 +alias FT_Module function( FT_Library library, char* module_name ) pfFT_Get_Module;
4213 +alias FT_Error function( FT_Library library, FT_Module mod ) pfFT_Remove_Module;
4214 +alias FT_Error function( FT_Memory memory, FT_Library *alibrary ) pfFT_New_Library;
4215 +alias FT_Error function( FT_Library library ) pfFT_Done_Library;
4216 +alias void function( FT_Library library, FT_UInt hook_index, FT_DebugHook_Func debug_hook ) pfFT_Set_Debug_Hook;
4217 +alias void function( FT_Library library ) pfFT_Add_Default_Modules;
4218 +alias FT_TrueTypeEngineType function( FT_Library library ) pfFT_Get_TrueType_Engine_Type;
4220 // ftrender.h (FT_RENDER_H)
4221 -typedef FT_Renderer function( FT_Library library, FT_Glyph_Format format ) pfFT_Get_Renderer;
4222 -typedef FT_Error function( FT_Library library, FT_Renderer renderer, FT_UInt num_params, FT_Parameter* parameters ) pfFT_Set_Renderer;
4223 +alias FT_Renderer function( FT_Library library, FT_Glyph_Format format ) pfFT_Get_Renderer;
4224 +alias FT_Error function( FT_Library library, FT_Renderer renderer, FT_UInt num_params, FT_Parameter* parameters ) pfFT_Set_Renderer;
4226 // t1tables.h (FT_TYPE1_TABLES_H)
4227 -typedef FT_Int function( FT_Face face ) pfFT_Has_PS_Glyph_Names;
4228 -typedef FT_Error function( FT_Face face, PS_FontInfoRec *afont_info ) pfFT_Get_PS_Font_Info;
4229 -typedef FT_Error function( FT_Face face, PS_PrivateRec *afont_private ) pfFT_Get_PS_Font_Private;
4230 +alias FT_Int function( FT_Face face ) pfFT_Has_PS_Glyph_Names;
4231 +alias FT_Error function( FT_Face face, PS_FontInfoRec *afont_info ) pfFT_Get_PS_Font_Info;
4232 +alias FT_Error function( FT_Face face, PS_PrivateRec *afont_private ) pfFT_Get_PS_Font_Private;
4234 // tttables.h (FT_TRUETYPE_TABLES_H)
4235 -typedef void* function( FT_Face face, FT_Sfnt_Tag tag ) pfFT_Get_Sfnt_Table;
4236 -typedef FT_Error function( FT_Face face, FT_ULong tag, FT_Long offset, FT_Byte* buffer, FT_ULong* length ) pfFT_Load_Sfnt_Table;
4237 -typedef FT_Error function( FT_Face face, FT_UInt table_index, FT_ULong *tag, FT_ULong *length ) pfFT_Sfnt_Table_Info;
4238 -typedef FT_ULong function( FT_CharMap charmap ) pfFT_Get_CMap_Language_ID;
4239 -typedef FT_ULong function( FT_CharMap charmap ) pfFT_Get_CMap_Format;
4240 +alias void* function( FT_Face face, FT_Sfnt_Tag tag ) pfFT_Get_Sfnt_Table;
4241 +alias FT_Error function( FT_Face face, FT_ULong tag, FT_Long offset, FT_Byte* buffer, FT_ULong* length ) pfFT_Load_Sfnt_Table;
4242 +alias FT_Error function( FT_Face face, FT_UInt table_index, FT_ULong *tag, FT_ULong *length ) pfFT_Sfnt_Table_Info;
4243 +alias FT_ULong function( FT_CharMap charmap ) pfFT_Get_CMap_Language_ID;
4244 +alias FT_ULong function( FT_CharMap charmap ) pfFT_Get_CMap_Format;
4246 // ftbdf.h (FT_BDF_H)
4247 -typedef FT_Error function( FT_Face face, char* *acharset_encoding, char* *acharset_registry ) pfFT_Get_BDF_Charset_ID;
4248 -typedef FT_Error function( FT_Face face, char* prop_name, BDF_PropertyRec *aproperty ) pfFT_Get_BDF_Property;
4249 +alias FT_Error function( FT_Face face, char* *acharset_encoding, char* *acharset_registry ) pfFT_Get_BDF_Charset_ID;
4250 +alias FT_Error function( FT_Face face, char* prop_name, BDF_PropertyRec *aproperty ) pfFT_Get_BDF_Property;
4252 // ftgzip.h (FT_GZIP_H)
4253 -typedef FT_Error function( FT_Stream stream, FT_Stream source ) pfFT_Stream_OpenGzip;
4254 +alias FT_Error function( FT_Stream stream, FT_Stream source ) pfFT_Stream_OpenGzip;
4256 // ftlzw.h (FT_LZW_H)
4257 -typedef FT_Error function( FT_Stream stream, FT_Stream source ) pfFT_Stream_OpenLZW;
4258 +alias FT_Error function( FT_Stream stream, FT_Stream source ) pfFT_Stream_OpenLZW;
4260 // ftwinfnt.h (FT_WINFONTS_H)
4261 -typedef FT_Error function( FT_Face face, FT_WinFNT_HeaderRec *aheader ) pfFT_Get_WinFNT_Header;
4262 +alias FT_Error function( FT_Face face, FT_WinFNT_HeaderRec *aheader ) pfFT_Get_WinFNT_Header;
4264 // ftglyph.h (FT_GLYPH_H, FT_CACHE_H, FT_STROKER_H)
4265 -typedef FT_Error function( FT_GlyphSlot slot, FT_Glyph *aglyph ) pfFT_Get_Glyph;
4266 -typedef FT_Error function( FT_Glyph source, FT_Glyph *target ) pfFT_Glyph_Copy;
4267 -typedef FT_Error function( FT_Glyph glyph, FT_Matrix* matrix, FT_Vector* delta ) pfFT_Glyph_Transform;
4268 -typedef void function( FT_Glyph glyph, FT_UInt bbox_mode, FT_BBox *acbox ) pfFT_Glyph_Get_CBox;
4269 -typedef FT_Error function( FT_Glyph* the_glyph, FT_Render_Mode render_mode, FT_Vector* origin, FT_Bool destroy ) pfFT_Glyph_To_Bitmap;
4270 -typedef void function( FT_Glyph glyph ) pfFT_Done_Glyph;
4271 -typedef void function( FT_Matrix* a, FT_Matrix* b ) pfFT_Matrix_Multiply;
4272 -typedef FT_Error function( FT_Matrix* matrix ) pfFT_Matrix_Invert;
4273 +alias FT_Error function( FT_GlyphSlot slot, FT_Glyph *aglyph ) pfFT_Get_Glyph;
4274 +alias FT_Error function( FT_Glyph source, FT_Glyph *target ) pfFT_Glyph_Copy;
4275 +alias FT_Error function( FT_Glyph glyph, FT_Matrix* matrix, FT_Vector* delta ) pfFT_Glyph_Transform;
4276 +alias void function( FT_Glyph glyph, FT_UInt bbox_mode, FT_BBox *acbox ) pfFT_Glyph_Get_CBox;
4277 +alias FT_Error function( FT_Glyph* the_glyph, FT_Render_Mode render_mode, FT_Vector* origin, FT_Bool destroy ) pfFT_Glyph_To_Bitmap;
4278 +alias void function( FT_Glyph glyph ) pfFT_Done_Glyph;
4279 +alias void function( FT_Matrix* a, FT_Matrix* b ) pfFT_Matrix_Multiply;
4280 +alias FT_Error function( FT_Matrix* matrix ) pfFT_Matrix_Invert;
4282 // ftbitmap.h (FT_BITMAP_H)
4283 -typedef void function( FT_Bitmap *abitmap ) pfFT_Bitmap_New;
4284 -typedef FT_Error function( FT_Library library, FT_Bitmap *source, FT_Bitmap *target) pfFT_Bitmap_Copy;
4285 -typedef FT_Error function( FT_Library library, FT_Bitmap* bitmap, FT_Pos xStrength, FT_Pos yStrength ) pfFT_Bitmap_Embolden;
4286 -typedef FT_Error function( FT_Library library, FT_Bitmap *source, FT_Bitmap *target, FT_Int alignment ) pfFT_Bitmap_Convert;
4287 -typedef FT_Error function( FT_Library library, FT_Bitmap *bitmap ) pfFT_Bitmap_Done;
4288 +alias void function( FT_Bitmap *abitmap ) pfFT_Bitmap_New;
4289 +alias FT_Error function( FT_Library library, FT_Bitmap *source, FT_Bitmap *target) pfFT_Bitmap_Copy;
4290 +alias FT_Error function( FT_Library library, FT_Bitmap* bitmap, FT_Pos xStrength, FT_Pos yStrength ) pfFT_Bitmap_Embolden;
4291 +alias FT_Error function( FT_Library library, FT_Bitmap *source, FT_Bitmap *target, FT_Int alignment ) pfFT_Bitmap_Convert;
4292 +alias FT_Error function( FT_Library library, FT_Bitmap *bitmap ) pfFT_Bitmap_Done;
4294 // ftbbox.h (FT_BBOX_H)
4295 -typedef FT_Error function( FT_Outline* outline, FT_BBox *abbox ) pfFT_Outline_Get_BBox;
4296 +alias FT_Error function( FT_Outline* outline, FT_BBox *abbox ) pfFT_Outline_Get_BBox;
4298 // ftcache.h (FT_CACHE_H)
4299 -typedef FT_Error function( FT_Library library, FT_UInt max_faces, FT_UInt max_sizes, FT_ULong max_bytes, FTC_Face_Requester requester, FT_Pointer req_data, FTC_Manager *amanager ) pfFTC_Manager_New;
4300 -typedef void function( FTC_Manager manager ) pfFTC_Manager_Reset;
4301 -typedef void function( FTC_Manager manager ) pfFTC_Manager_Done;
4302 -typedef FT_Error function( FTC_Manager manager, FTC_FaceID face_id, FT_Face *aface ) pfFTC_Manager_LookupFace;
4303 -typedef FT_Error function( FTC_Manager manager, FTC_Scaler scaler, FT_Size *asize ) pfFTC_Manager_LookupSize;
4304 -typedef void function( FTC_Node node, FTC_Manager manager ) pfFTC_Node_Unref;
4305 -typedef void function( FTC_Manager manager, FTC_FaceID face_id ) pfFTC_Manager_RemoveFaceID;
4306 -typedef FT_Error function( FTC_Manager manager, FTC_CMapCache *acache ) pfFTC_CMapCache_New;
4307 -typedef FT_UInt function( FTC_CMapCache cache, FTC_FaceID face_id, FT_Int cmap_index, FT_UInt32 char_code ) pfFTC_CMapCache_Lookup;
4308 -typedef FT_Error function( FTC_Manager manager, FTC_ImageCache *acache ) pfFTC_ImageCache_New;
4309 -typedef FT_Error function( FTC_ImageCache cache, FTC_ImageType type, FT_UInt gindex, FT_Glyph *aglyph, FTC_Node *anode ) pfFTC_ImageCache_Lookup;
4310 -typedef FT_Error function( FTC_ImageCache cache, FTC_Scaler scaler, FT_ULong load_flags, FT_UInt gindex, FT_Glyph *aglyph, FTC_Node *anode ) pfFTC_ImageCache_LookupScaler;
4311 -typedef FT_Error function( FTC_Manager manager, FTC_SBitCache *acache ) pfFTC_SBitCache_New;
4312 -typedef FT_Error function( FTC_SBitCache cache, FTC_ImageType type, FT_UInt gindex, FTC_SBit *sbit, FTC_Node *anode ) pfFTC_SBitCache_Lookup;
4313 -typedef FT_Error function( FTC_SBitCache cache, FTC_Scaler scaler, FT_ULong load_flags, FT_UInt gindex, FTC_SBit *sbit,FTC_Node *anode ) pfFTC_SBitCache_LookupScaler;
4314 +alias FT_Error function( FT_Library library, FT_UInt max_faces, FT_UInt max_sizes, FT_ULong max_bytes, FTC_Face_Requester requester, FT_Pointer req_data, FTC_Manager *amanager ) pfFTC_Manager_New;
4315 +alias void function( FTC_Manager manager ) pfFTC_Manager_Reset;
4316 +alias void function( FTC_Manager manager ) pfFTC_Manager_Done;
4317 +alias FT_Error function( FTC_Manager manager, FTC_FaceID face_id, FT_Face *aface ) pfFTC_Manager_LookupFace;
4318 +alias FT_Error function( FTC_Manager manager, FTC_Scaler scaler, FT_Size *asize ) pfFTC_Manager_LookupSize;
4319 +alias void function( FTC_Node node, FTC_Manager manager ) pfFTC_Node_Unref;
4320 +alias void function( FTC_Manager manager, FTC_FaceID face_id ) pfFTC_Manager_RemoveFaceID;
4321 +alias FT_Error function( FTC_Manager manager, FTC_CMapCache *acache ) pfFTC_CMapCache_New;
4322 +alias FT_UInt function( FTC_CMapCache cache, FTC_FaceID face_id, FT_Int cmap_index, FT_UInt32 char_code ) pfFTC_CMapCache_Lookup;
4323 +alias FT_Error function( FTC_Manager manager, FTC_ImageCache *acache ) pfFTC_ImageCache_New;
4324 +alias FT_Error function( FTC_ImageCache cache, FTC_ImageType type, FT_UInt gindex, FT_Glyph *aglyph, FTC_Node *anode ) pfFTC_ImageCache_Lookup;
4325 +alias FT_Error function( FTC_ImageCache cache, FTC_Scaler scaler, FT_ULong load_flags, FT_UInt gindex, FT_Glyph *aglyph, FTC_Node *anode ) pfFTC_ImageCache_LookupScaler;
4326 +alias FT_Error function( FTC_Manager manager, FTC_SBitCache *acache ) pfFTC_SBitCache_New;
4327 +alias FT_Error function( FTC_SBitCache cache, FTC_ImageType type, FT_UInt gindex, FTC_SBit *sbit, FTC_Node *anode ) pfFTC_SBitCache_Lookup;
4328 +alias FT_Error function( FTC_SBitCache cache, FTC_Scaler scaler, FT_ULong load_flags, FT_UInt gindex, FTC_SBit *sbit,FTC_Node *anode ) pfFTC_SBitCache_LookupScaler;
4330 // ftmm.h (FT_MULTIPLE_MASTERS_H)
4331 -typedef FT_Error function( FT_Face face, FT_Multi_Master *amaster ) pfFT_Get_Multi_Master;
4332 -typedef FT_Error function( FT_Face face, FT_MM_Var* *amaster ) pfFT_Get_MM_Var;
4333 -typedef FT_Error function( FT_Face face, FT_UInt num_coords, FT_Long* coords ) pfFT_Set_MM_Design_Coordinates;
4334 -typedef FT_Error function( FT_Face face, FT_UInt num_coords, FT_Fixed* coords ) pfFT_Set_Var_Design_Coordinates;
4335 -typedef FT_Error function( FT_Face face, FT_UInt num_coords, FT_Fixed* coords ) pfFT_Set_MM_Blend_Coordinates;
4336 -typedef FT_Error function( FT_Face face, FT_UInt num_coords, FT_Fixed* coords ) pfFT_Set_Var_Blend_Coordinates;
4337 +alias FT_Error function( FT_Face face, FT_Multi_Master *amaster ) pfFT_Get_Multi_Master;
4338 +alias FT_Error function( FT_Face face, FT_MM_Var* *amaster ) pfFT_Get_MM_Var;
4339 +alias FT_Error function( FT_Face face, FT_UInt num_coords, FT_Long* coords ) pfFT_Set_MM_Design_Coordinates;
4340 +alias FT_Error function( FT_Face face, FT_UInt num_coords, FT_Fixed* coords ) pfFT_Set_Var_Design_Coordinates;
4341 +alias FT_Error function( FT_Face face, FT_UInt num_coords, FT_Fixed* coords ) pfFT_Set_MM_Blend_Coordinates;
4342 +alias FT_Error function( FT_Face face, FT_UInt num_coords, FT_Fixed* coords ) pfFT_Set_Var_Blend_Coordinates;
4344 // ftsnames.h (FT_SFNT_NAMES_H)
4345 -typedef FT_UInt function( FT_Face face ) pfFT_Get_Sfnt_Name_Count;
4346 -typedef FT_Error function( FT_Face face, FT_UInt idx, FT_SfntName *aname ) pfFT_Get_Sfnt_Name;
4347 +alias FT_UInt function( FT_Face face ) pfFT_Get_Sfnt_Name_Count;
4348 +alias FT_Error function( FT_Face face, FT_UInt idx, FT_SfntName *aname ) pfFT_Get_Sfnt_Name;
4350 // ftotval.h (FT_OPENTYPE_VALIDATE_H)
4351 -typedef FT_Error function( FT_Face face, FT_UInt validation_flags, FT_Bytes *BASE_table, FT_Bytes *GDEF_table, FT_Bytes *GPOS_table, FT_Bytes *GSUB_table, FT_Bytes *JSTF_table ) pfFT_OpenType_Validate;
4352 -typedef void function ( FT_Face face, FT_Bytes table ) pfFT_OpenType_Free;
4353 +alias FT_Error function( FT_Face face, FT_UInt validation_flags, FT_Bytes *BASE_table, FT_Bytes *GDEF_table, FT_Bytes *GPOS_table, FT_Bytes *GSUB_table, FT_Bytes *JSTF_table ) pfFT_OpenType_Validate;
4354 +alias void function ( FT_Face face, FT_Bytes table ) pfFT_OpenType_Free;
4355 // ftotval.h (FT_OPENTYPE_VALIDATE_H)
4357 // ftgxval.h (FT_GX_VALIDATE_H)
4358 -typedef FT_Error function( FT_Face face, FT_UInt validation_flags, FT_Bytes tables[FT_VALIDATE_GX_LENGTH], FT_UInt table_length ) pfFT_TrueTypeGX_Validate;
4359 -typedef void function( FT_Face face, FT_Bytes table ) pfFT_TrueTypeGX_Free;
4360 -typedef FT_Error function( FT_Face face, FT_UInt validation_flags, FT_Bytes *ckern_table ) pfFT_ClassicKern_Validate;
4361 -typedef void function( FT_Face face, FT_Bytes table ) pfFT_ClassicKern_Free;
4362 +alias FT_Error function( FT_Face face, FT_UInt validation_flags, FT_Bytes tables[FT_VALIDATE_GX_LENGTH], FT_UInt table_length ) pfFT_TrueTypeGX_Validate;
4363 +alias void function( FT_Face face, FT_Bytes table ) pfFT_TrueTypeGX_Free;
4364 +alias FT_Error function( FT_Face face, FT_UInt validation_flags, FT_Bytes *ckern_table ) pfFT_ClassicKern_Validate;
4365 +alias void function( FT_Face face, FT_Bytes table ) pfFT_ClassicKern_Free;
4367 // ftpfr (FT_PFR_H)
4368 -typedef FT_Error function( FT_Face face, FT_UInt *aoutline_resolution, FT_UInt *ametrics_resolution, FT_Fixed *ametrics_x_scale, FT_Fixed *ametrics_y_scale ) pfFT_Get_PFR_Metrics;
4369 -typedef FT_Error function( FT_Face face, FT_UInt left, FT_UInt right, FT_Vector *avector ) pfFT_Get_PFR_Kerning;
4370 -typedef FT_Error function( FT_Face face, FT_UInt gindex, FT_Pos *aadvance ) pfFT_Get_PFR_Advance;
4371 +alias FT_Error function( FT_Face face, FT_UInt *aoutline_resolution, FT_UInt *ametrics_resolution, FT_Fixed *ametrics_x_scale, FT_Fixed *ametrics_y_scale ) pfFT_Get_PFR_Metrics;
4372 +alias FT_Error function( FT_Face face, FT_UInt left, FT_UInt right, FT_Vector *avector ) pfFT_Get_PFR_Kerning;
4373 +alias FT_Error function( FT_Face face, FT_UInt gindex, FT_Pos *aadvance ) pfFT_Get_PFR_Advance;
4375 // ftstroke.h (FT_STROKER_H)
4376 -typedef FT_StrokerBorder function( FT_Outline* outline ) pfFT_Outline_GetInsideBorder;
4377 -typedef FT_StrokerBorder function( FT_Outline* outline ) pfFT_Outline_GetOutsideBorder;
4378 -typedef FT_Error function( FT_Memory memory, FT_Stroker *astroker ) pfFT_Stroker_New;
4379 -typedef void function( FT_Stroker stroker, FT_Fixed radius, FT_Stroker_LineCap line_cap, FT_Stroker_LineJoin line_join, FT_Fixed miter_limit ) pfFT_Stroker_Set;
4380 -typedef void function( FT_Stroker stroker ) pfFT_Stroker_Rewind;
4381 -typedef FT_Error function( FT_Stroker stroker, FT_Outline* outline, FT_Bool opened ) pfFT_Stroker_ParseOutline;
4382 -typedef FT_Error function( FT_Stroker stroker, FT_Vector* to, FT_Bool open ) pfFT_Stroker_BeginSubPath;
4383 -typedef FT_Error function( FT_Stroker stroker ) pfFT_Stroker_EndSubPath;
4384 -typedef FT_Error function( FT_Stroker stroker, FT_Vector* to ) pfFT_Stroker_LineTo;
4385 -typedef FT_Error function( FT_Stroker stroker, FT_Vector* control, FT_Vector* to ) pfFT_Stroker_ConicTo;
4386 -typedef FT_Error function( FT_Stroker stroker, FT_Vector* control1, FT_Vector* control2, FT_Vector* to ) pfFT_Stroker_CubicTo;
4387 -typedef FT_Error function( FT_Stroker stroker, FT_StrokerBorder border, FT_UInt *anum_points, FT_UInt *anum_contours ) pfFT_Stroker_GetBorderCounts;
4388 -typedef void function( FT_Stroker stroker, FT_StrokerBorder border, FT_Outline* outline ) pfFT_Stroker_ExportBorder;
4389 -typedef FT_Error function( FT_Stroker stroker, FT_UInt *anum_points, FT_UInt *anum_contours ) pfFT_Stroker_GetCounts;
4390 -typedef void function( FT_Stroker stroker, FT_Outline* outline ) pfFT_Stroker_Export;
4391 -typedef void function( FT_Stroker stroker ) pfFT_Stroker_Done;
4392 -typedef FT_Error function( FT_Glyph *pglyph, FT_Stroker stroker, FT_Bool destroy ) pfFT_Glyph_Stroke;
4393 -typedef FT_Error function( FT_Glyph *pglyph, FT_Stroker stroker, FT_Bool inside, FT_Bool destroy ) pfFT_Glyph_StrokeBorder;
4394 +alias FT_StrokerBorder function( FT_Outline* outline ) pfFT_Outline_GetInsideBorder;
4395 +alias FT_StrokerBorder function( FT_Outline* outline ) pfFT_Outline_GetOutsideBorder;
4396 +alias FT_Error function( FT_Memory memory, FT_Stroker *astroker ) pfFT_Stroker_New;
4397 +alias void function( FT_Stroker stroker, FT_Fixed radius, FT_Stroker_LineCap line_cap, FT_Stroker_LineJoin line_join, FT_Fixed miter_limit ) pfFT_Stroker_Set;
4398 +alias void function( FT_Stroker stroker ) pfFT_Stroker_Rewind;
4399 +alias FT_Error function( FT_Stroker stroker, FT_Outline* outline, FT_Bool opened ) pfFT_Stroker_ParseOutline;
4400 +alias FT_Error function( FT_Stroker stroker, FT_Vector* to, FT_Bool open ) pfFT_Stroker_BeginSubPath;
4401 +alias FT_Error function( FT_Stroker stroker ) pfFT_Stroker_EndSubPath;
4402 +alias FT_Error function( FT_Stroker stroker, FT_Vector* to ) pfFT_Stroker_LineTo;
4403 +alias FT_Error function( FT_Stroker stroker, FT_Vector* control, FT_Vector* to ) pfFT_Stroker_ConicTo;
4404 +alias FT_Error function( FT_Stroker stroker, FT_Vector* control1, FT_Vector* control2, FT_Vector* to ) pfFT_Stroker_CubicTo;
4405 +alias FT_Error function( FT_Stroker stroker, FT_StrokerBorder border, FT_UInt *anum_points, FT_UInt *anum_contours ) pfFT_Stroker_GetBorderCounts;
4406 +alias void function( FT_Stroker stroker, FT_StrokerBorder border, FT_Outline* outline ) pfFT_Stroker_ExportBorder;
4407 +alias FT_Error function( FT_Stroker stroker, FT_UInt *anum_points, FT_UInt *anum_contours ) pfFT_Stroker_GetCounts;
4408 +alias void function( FT_Stroker stroker, FT_Outline* outline ) pfFT_Stroker_Export;
4409 +alias void function( FT_Stroker stroker ) pfFT_Stroker_Done;
4410 +alias FT_Error function( FT_Glyph *pglyph, FT_Stroker stroker, FT_Bool destroy ) pfFT_Glyph_Stroke;
4411 +alias FT_Error function( FT_Glyph *pglyph, FT_Stroker stroker, FT_Bool inside, FT_Bool destroy ) pfFT_Glyph_StrokeBorder;
4413 // ftsynth.h (FT_SYNTHESIS_H) (WARNING: ALPHA CODE)
4414 -typedef FT_Error function( FT_GlyphSlot slot ) pfFT_GlyphSlot_Own_Bitmap;
4415 -typedef void function( FT_GlyphSlot slot ) pfFT_GlyphSlot_Embolden;
4416 -typedef void function( FT_GlyphSlot slot ) pfFT_GlyphSlot_Oblique;
4417 +alias FT_Error function( FT_GlyphSlot slot ) pfFT_GlyphSlot_Own_Bitmap;
4418 +alias void function( FT_GlyphSlot slot ) pfFT_GlyphSlot_Embolden;
4419 +alias void function( FT_GlyphSlot slot ) pfFT_GlyphSlot_Oblique;
4421 // ftxf86.h (FT_XFREE86_H)
4422 -typedef char* function( FT_Face face ) pfFT_Get_X11_Font_Format;
4423 +alias char* function( FT_Face face ) pfFT_Get_X11_Font_Format;
4425 // fttrigon.h (FT_TRIGONOMETRY_H)
4426 -typedef FT_Fixed function( FT_Angle angle ) pfFT_Sin;
4427 -typedef FT_Fixed function( FT_Angle angle ) pfFT_Cos;
4428 -typedef FT_Fixed function( FT_Angle angle ) pfFT_Tan;
4429 -typedef FT_Angle function( FT_Fixed x,FT_Fixed y ) pfFT_Atan2;
4430 -typedef FT_Angle function( FT_Angle angle1, FT_Angle angle2 ) pfFT_Angle_Diff;
4431 -typedef void function( FT_Vector* vec, FT_Angle angle ) pfFT_Vector_Unit;
4432 -typedef void function( FT_Vector* vec, FT_Angle angle ) pfFT_Vector_Rotate;
4433 -typedef FT_Fixed function( FT_Vector* vec ) pfFT_Vector_Length;
4434 -typedef void function( FT_Vector* vec, FT_Fixed *length, FT_Angle *angle ) pfFT_Vector_Polarize;
4435 -typedef void function( FT_Vector* vec, FT_Fixed length, FT_Angle angle ) pfFT_Vector_From_Polar;
4436 +alias FT_Fixed function( FT_Angle angle ) pfFT_Sin;
4437 +alias FT_Fixed function( FT_Angle angle ) pfFT_Cos;
4438 +alias FT_Fixed function( FT_Angle angle ) pfFT_Tan;
4439 +alias FT_Angle function( FT_Fixed x,FT_Fixed y ) pfFT_Atan2;
4440 +alias FT_Angle function( FT_Angle angle1, FT_Angle angle2 ) pfFT_Angle_Diff;
4441 +alias void function( FT_Vector* vec, FT_Angle angle ) pfFT_Vector_Unit;
4442 +alias void function( FT_Vector* vec, FT_Angle angle ) pfFT_Vector_Rotate;
4443 +alias FT_Fixed function( FT_Vector* vec ) pfFT_Vector_Length;
4444 +alias void function( FT_Vector* vec, FT_Fixed *length, FT_Angle *angle ) pfFT_Vector_Polarize;
4445 +alias void function( FT_Vector* vec, FT_Fixed length, FT_Angle angle ) pfFT_Vector_From_Polar;
4447 // ftlcdfil.h (FT_LCD_FILTER_H)
4448 -typedef FT_Error function( FT_Library library, FT_LcdFilter filter) pfFT_Library_SetLcdFilter;
4449 +alias FT_Error function( FT_Library library, FT_LcdFilter filter) pfFT_Library_SetLcdFilter;
4451 // ftgasp.h (FT_GASP_H)
4452 -typedef FT_Int function( FT_Face face, FT_UInt ppem ) pfFT_Get_Gasp;
4453 +alias FT_Int function( FT_Face face, FT_UInt ppem ) pfFT_Get_Gasp;
4455 /+ other
4456 -typedef FT_Error function( FT_Memory memory, FT_Long size, void* *P ) pfFT_Alloc;
4457 -typedef FT_Error function( FT_Memory memory, FT_Long size, void* *p ) pfFT_QAlloc;
4458 -typedef FT_Error function( FT_Memory memory, FT_Long current, FT_Long size, void* *P ) pfFT_Realloc;
4459 -typedef FT_Error function( FT_Memory memory, FT_Long current, FT_Long size, void* *p ) pfFT_QRealloc;
4460 -typedef void function( FT_Memory memory, void* *P ) pfFT_Free;
4461 -typedef FT_Error function( FT_Memory memory, FT_GlyphLoader *aloader ) pfFT_GlyphLoader_New;
4462 -typedef FT_Error function( FT_GlyphLoader loader ) pfFT_GlyphLoader_CreateExtra;
4463 -typedef void function( FT_GlyphLoader loader ) pfFT_GlyphLoader_Done;
4464 -typedef void function( FT_GlyphLoader loader ) pfFT_GlyphLoader_Reset;
4465 -typedef void function( FT_GlyphLoader loader ) pfFT_GlyphLoader_Rewind;
4466 -typedef FT_Error function( FT_GlyphLoader loader, FT_UInt n_points, FT_UInt n_contours ) pfFT_GlyphLoader_CheckPoints;
4467 -typedef FT_Error function( FT_GlyphLoader loader, FT_UInt n_subs ) pfFT_GlyphLoader_CheckSubGlyphs;
4468 -typedef void function( FT_GlyphLoader loader ) pfFT_GlyphLoader_Prepare;
4469 -typedef void function( FT_GlyphLoader loader ) pfFT_GlyphLoader_Add;
4470 -typedef FT_Error function( FT_GlyphLoader target, FT_GlyphLoader source ) pfFT_GlyphLoader_CopyPoints;
4471 -typedef FT_Pointer function( FT_ServiceDesc service_descriptors, char* service_id ) pfft_service_list_lookup;
4472 -typedef FT_Error function( FT_CMap_Class clazz, FT_Pointer init_data, FT_CharMap charmap, FT_CMap *acmap ) pfFT_CMap_New;
4473 -typedef void function( FT_CMap cmap ) pfFT_CMap_Done;
4474 -typedef void* function( FT_Library library, char* mod_name ) pfFT_Get_Module_Interface;
4475 -typedef FT_Pointer function( FT_Module mod, char* service_id ) pfft_module_get_service;
4476 -typedef FT_Error function( FT_Face face, FT_GlyphSlot *aslot ) pfFT_New_GlyphSlot;
4477 -typedef void function( FT_GlyphSlot slot ) pfFT_Done_GlyphSlot;
4478 -typedef void function( FT_GlyphSlot slot ) pfft_glyphslot_free_bitmap;
4479 -typedef FT_Error function( FT_GlyphSlot slot, FT_ULong size ) pfft_glyphslot_alloc_bitmap;
4480 -typedef void function( FT_GlyphSlot slot, FT_Byte* buffer ) pfft_glyphslot_set_bitmap;
4481 -typedef FT_Renderer function( FT_Library library, FT_Glyph_Format format, FT_ListNode* node ) pfFT_Lookup_Renderer;
4482 -typedef FT_Error function( FT_Library library, FT_GlyphSlot slot, FT_Render_Mode render_mode ) pfFT_Render_Glyph_Internal;
4483 -typedef FT_Memory function() pfFT_New_Memory;
4484 -typedef void function( FT_Memory memory ) pfFT_Done_Memory;
4485 -typedef FT_Error function( FT_Stream stream, char* filepathname ) pfFT_Stream_Open;
4486 -typedef FT_Error function( FT_Library library, FT_Open_Args* args, FT_Stream *astream ) pfFT_Stream_New;
4487 -typedef void function( FT_Stream stream, FT_Int external ) pfFT_Stream_Free;
4488 -typedef void function( FT_Stream stream, FT_Byte* base, FT_ULong size ) pfFT_Stream_OpenMemory;
4489 -typedef void function( FT_Stream stream ) pfFT_Stream_Close;
4490 -typedef FT_Error function( FT_Stream stream, FT_ULong pos ) pfFT_Stream_Seek;
4491 -typedef FT_Error function( FT_Stream stream, FT_Long distance ) pfFT_Stream_Skip;
4492 -typedef FT_Long function( FT_Stream stream ) pfFT_Stream_Pos;
4493 -typedef FT_Error function( FT_Stream stream, FT_Byte* buffer, FT_ULong count ) pfFT_Stream_Read;
4494 -typedef FT_Error function( FT_Stream stream, FT_ULong pos, FT_Byte* buffer, FT_ULong count ) pfFT_Stream_ReadAt;
4495 -typedef FT_ULong function( FT_Stream stream, FT_Byte* buffer, FT_ULong count ) pfFT_Stream_TryRead;
4496 -typedef FT_Error function( FT_Stream stream, FT_ULong count ) pfFT_Stream_EnterFrame;
4497 -typedef void function( FT_Stream stream ) pfFT_Stream_ExitFrame;
4498 -typedef FT_Error function( FT_Stream stream, FT_ULong count, FT_Byte** pbytes ) pfFT_Stream_ExtractFrame;
4499 -typedef void function( FT_Stream stream, FT_Byte** pbytes ) pfFT_Stream_ReleaseFrame;
4500 -typedef FT_Char function( FT_Stream stream ) pfFT_Stream_GetChar;
4501 -typedef FT_Short function( FT_Stream stream ) pfFT_Stream_GetShort;
4502 -typedef FT_Long function( FT_Stream stream ) pfFT_Stream_GetOffset;
4503 -typedef FT_Long function( FT_Stream stream ) pfFT_Stream_GetLong;
4504 -typedef FT_Short function( FT_Stream stream ) pfFT_Stream_GetShortLE;
4505 -typedef FT_Long function( FT_Stream stream ) pfFT_Stream_GetLongLE;
4506 -typedef FT_Char function( FT_Stream stream, FT_Error* error ) pfFT_Stream_ReadChar;
4507 -typedef FT_Short function( FT_Stream stream, FT_Error* error ) pfFT_Stream_ReadShort;
4508 -typedef FT_Long function( FT_Stream stream, FT_Error* error ) pfFT_Stream_ReadOffset;
4509 -typedef FT_Long function( FT_Stream stream, FT_Error* error ) pfFT_Stream_ReadLong;
4510 -typedef FT_Short function( FT_Stream stream, FT_Error* error ) pfFT_Stream_ReadShortLE;
4511 -typedef FT_Long function( FT_Stream stream, FT_Error* error ) pfFT_Stream_ReadLongLE;
4512 -typedef FT_Error function( FT_Stream stream, FT_Frame_Field* fields, void* structure ) pfFT_Stream_ReadFields;
4513 -typedef FT_Int function() pfFT_Trace_Get_Count;
4514 -typedef char* function( FT_Int idx ) pfFT_Trace_Get_Name;
4515 -typedef void function() pfft_debug_init;
4516 -typedef FT_Int32 function( FT_Int32 x ) pfFT_SqrtFixed;
4517 -typedef void function( FT_Library library, FT_Stream stream, char* base_name, char** new_names, FT_Long* offsets, FT_Error* errors ) pfFT_Raccess_Guess;
4518 -typedef FT_Error function( FT_Library library, FT_Stream stream, FT_Long rfork_offset, FT_Long *map_offset, FT_Long *rdata_pos ) pfFT_Raccess_Get_HeaderInfo;
4519 -typedef FT_Error function( FT_Library library, FT_Stream stream, FT_Long map_offset, FT_Long rdata_pos, FT_Long tag, FT_Long **offsets, FT_Long *count ) pfFT_Raccess_Get_DataOffsets;
4520 -typedef void function( FT_Validator valid, FT_Byte* base, FT_Byte* limit, FT_ValidationLevel level ) pfft_validator_init;
4521 -typedef FT_Int function( FT_Validator valid ) pfft_validator_run;
4522 -typedef void function( FT_Validator valid, FT_Error error ) pfft_validator_error;
4523 -+/
4524 -//END Typedefs
4525 +alias FT_Error function( FT_Memory memory, FT_Long size, void* *P ) pfFT_Alloc;
4526 +alias FT_Error function( FT_Memory memory, FT_Long size, void* *p ) pfFT_QAlloc;
4527 +alias FT_Error function( FT_Memory memory, FT_Long current, FT_Long size, void* *P ) pfFT_Realloc;
4528 +alias FT_Error function( FT_Memory memory, FT_Long current, FT_Long size, void* *p ) pfFT_QRealloc;
4529 +alias void function( FT_Memory memory, void* *P ) pfFT_Free;
4530 +alias FT_Error function( FT_Memory memory, FT_GlyphLoader *aloader ) pfFT_GlyphLoader_New;
4531 +alias FT_Error function( FT_GlyphLoader loader ) pfFT_GlyphLoader_CreateExtra;
4532 +alias void function( FT_GlyphLoader loader ) pfFT_GlyphLoader_Done;
4533 +alias void function( FT_GlyphLoader loader ) pfFT_GlyphLoader_Reset;
4534 +alias void function( FT_GlyphLoader loader ) pfFT_GlyphLoader_Rewind;
4535 +alias FT_Error function( FT_GlyphLoader loader, FT_UInt n_points, FT_UInt n_contours ) pfFT_GlyphLoader_CheckPoints;
4536 +alias FT_Error function( FT_GlyphLoader loader, FT_UInt n_subs ) pfFT_GlyphLoader_CheckSubGlyphs;
4537 +alias void function( FT_GlyphLoader loader ) pfFT_GlyphLoader_Prepare;
4538 +alias void function( FT_GlyphLoader loader ) pfFT_GlyphLoader_Add;
4539 +alias FT_Error function( FT_GlyphLoader target, FT_GlyphLoader source ) pfFT_GlyphLoader_CopyPoints;
4540 +alias FT_Pointer function( FT_ServiceDesc service_descriptors, char* service_id ) pfft_service_list_lookup;
4541 +alias FT_Error function( FT_CMap_Class clazz, FT_Pointer init_data, FT_CharMap charmap, FT_CMap *acmap ) pfFT_CMap_New;
4542 +alias void function( FT_CMap cmap ) pfFT_CMap_Done;
4543 +alias void* function( FT_Library library, char* mod_name ) pfFT_Get_Module_Interface;
4544 +alias FT_Pointer function( FT_Module mod, char* service_id ) pfft_module_get_service;
4545 +alias FT_Error function( FT_Face face, FT_GlyphSlot *aslot ) pfFT_New_GlyphSlot;
4546 +alias void function( FT_GlyphSlot slot ) pfFT_Done_GlyphSlot;
4547 +alias void function( FT_GlyphSlot slot ) pfft_glyphslot_free_bitmap;
4548 +alias FT_Error function( FT_GlyphSlot slot, FT_ULong size ) pfft_glyphslot_alloc_bitmap;
4549 +alias void function( FT_GlyphSlot slot, FT_Byte* buffer ) pfft_glyphslot_set_bitmap;
4550 +alias FT_Renderer function( FT_Library library, FT_Glyph_Format format, FT_ListNode* node ) pfFT_Lookup_Renderer;
4551 +alias FT_Error function( FT_Library library, FT_GlyphSlot slot, FT_Render_Mode render_mode ) pfFT_Render_Glyph_Internal;
4552 +alias FT_Memory function() pfFT_New_Memory;
4553 +alias void function( FT_Memory memory ) pfFT_Done_Memory;
4554 +alias FT_Error function( FT_Stream stream, char* filepathname ) pfFT_Stream_Open;
4555 +alias FT_Error function( FT_Library library, FT_Open_Args* args, FT_Stream *astream ) pfFT_Stream_New;
4556 +alias void function( FT_Stream stream, FT_Int external ) pfFT_Stream_Free;
4557 +alias void function( FT_Stream stream, FT_Byte* base, FT_ULong size ) pfFT_Stream_OpenMemory;
4558 +alias void function( FT_Stream stream ) pfFT_Stream_Close;
4559 +alias FT_Error function( FT_Stream stream, FT_ULong pos ) pfFT_Stream_Seek;
4560 +alias FT_Error function( FT_Stream stream, FT_Long distance ) pfFT_Stream_Skip;
4561 +alias FT_Long function( FT_Stream stream ) pfFT_Stream_Pos;
4562 +alias FT_Error function( FT_Stream stream, FT_Byte* buffer, FT_ULong count ) pfFT_Stream_Read;
4563 +alias FT_Error function( FT_Stream stream, FT_ULong pos, FT_Byte* buffer, FT_ULong count ) pfFT_Stream_ReadAt;
4564 +alias FT_ULong function( FT_Stream stream, FT_Byte* buffer, FT_ULong count ) pfFT_Stream_TryRead;
4565 +alias FT_Error function( FT_Stream stream, FT_ULong count ) pfFT_Stream_EnterFrame;
4566 +alias void function( FT_Stream stream ) pfFT_Stream_ExitFrame;
4567 +alias FT_Error function( FT_Stream stream, FT_ULong count, FT_Byte** pbytes ) pfFT_Stream_ExtractFrame;
4568 +alias void function( FT_Stream stream, FT_Byte** pbytes ) pfFT_Stream_ReleaseFrame;
4569 +alias FT_Char function( FT_Stream stream ) pfFT_Stream_GetChar;
4570 +alias FT_Short function( FT_Stream stream ) pfFT_Stream_GetShort;
4571 +alias FT_Long function( FT_Stream stream ) pfFT_Stream_GetOffset;
4572 +alias FT_Long function( FT_Stream stream ) pfFT_Stream_GetLong;
4573 +alias FT_Short function( FT_Stream stream ) pfFT_Stream_GetShortLE;
4574 +alias FT_Long function( FT_Stream stream ) pfFT_Stream_GetLongLE;
4575 +alias FT_Char function( FT_Stream stream, FT_Error* error ) pfFT_Stream_ReadChar;
4576 +alias FT_Short function( FT_Stream stream, FT_Error* error ) pfFT_Stream_ReadShort;
4577 +alias FT_Long function( FT_Stream stream, FT_Error* error ) pfFT_Stream_ReadOffset;
4578 +alias FT_Long function( FT_Stream stream, FT_Error* error ) pfFT_Stream_ReadLong;
4579 +alias FT_Short function( FT_Stream stream, FT_Error* error ) pfFT_Stream_ReadShortLE;
4580 +alias FT_Long function( FT_Stream stream, FT_Error* error ) pfFT_Stream_ReadLongLE;
4581 +alias FT_Error function( FT_Stream stream, FT_Frame_Field* fields, void* structure ) pfFT_Stream_ReadFields;
4582 +alias FT_Int function() pfFT_Trace_Get_Count;
4583 +alias char* function( FT_Int idx ) pfFT_Trace_Get_Name;
4584 +alias void function() pfft_debug_init;
4585 +alias FT_Int32 function( FT_Int32 x ) pfFT_SqrtFixed;
4586 +alias void function( FT_Library library, FT_Stream stream, char* base_name, char** new_names, FT_Long* offsets, FT_Error* errors ) pfFT_Raccess_Guess;
4587 +alias FT_Error function( FT_Library library, FT_Stream stream, FT_Long rfork_offset, FT_Long *map_offset, FT_Long *rdata_pos ) pfFT_Raccess_Get_HeaderInfo;
4588 +alias FT_Error function( FT_Library library, FT_Stream stream, FT_Long map_offset, FT_Long rdata_pos, FT_Long tag, FT_Long **offsets, FT_Long *count ) pfFT_Raccess_Get_DataOffsets;
4589 +alias void function( FT_Validator valid, FT_Byte* base, FT_Byte* limit, FT_ValidationLevel level ) pfft_validator_init;
4590 +alias FT_Int function( FT_Validator valid ) pfft_validator_run;
4591 +alias void function( FT_Validator valid, FT_Error error ) pfft_validator_error;
4592 ++/
4593 +}
4594 +//END aliass
4597 //BEGIN Symbols
4598 Index: DerelictFT/derelict/freetype/sftfuncs.d
4599 ===================================================================
4600 --- DerelictFT/derelict/freetype/sftfuncs.d (revision 318)
4601 +++ DerelictFT/derelict/freetype/sftfuncs.d (working copy)
4602 @@ -329,4 +329,4 @@
4603 void FT_validator_init( FT_Validator valid, FT_Byte* base, FT_Byte* limit, FT_ValidationLevel level );
4604 FT_Int FT_validator_run( FT_Validator valid );
4605 void FT_validator_error( FT_Validator valid, FT_Error error );
4606 -*/
4607 \ No newline at end of file
4608 +*/
4609 Index: DerelictOgg/derelict/ogg/ogg.d
4610 ===================================================================
4611 --- DerelictOgg/derelict/ogg/ogg.d (revision 318)
4612 +++ DerelictOgg/derelict/ogg/ogg.d (working copy)
4613 @@ -31,7 +31,7 @@
4614 */
4615 module derelict.ogg.ogg;
4617 -private
4618 +private
4619 {
4620 import derelict.util.loader;
4621 import derelict.ogg.oggtypes;
4622 @@ -134,143 +134,116 @@
4623 extern (C)
4624 {
4625 // Ogg BITSTREAM PRIMITIVES: bitstream
4626 - typedef void function(oggpack_buffer *b) pfoggpack_writeinit;
4627 - typedef void function(oggpack_buffer *b, int bits) pfoggpack_writetrunc;
4628 - typedef void function(oggpack_buffer *b) pfoggpack_writealign;
4629 - typedef void function(oggpack_buffer *b, void *source, int bits) pfoggpack_writecopy;
4630 - typedef void function(oggpack_buffer *b) pfoggpack_reset;
4631 - typedef void function(oggpack_buffer *b) pfoggpack_writeclear;
4632 - typedef void function(oggpack_buffer *b, ubyte *buf, int bytes) pfoggpack_readinit;
4633 - typedef void function(oggpack_buffer *b, uint value, int bits) pfoggpack_write;
4634 - typedef int function(oggpack_buffer *b, int bits) pfoggpack_look;
4635 - typedef int function(oggpack_buffer *b) pfoggpack_look1;
4636 - typedef void function(oggpack_buffer *b, int bits) pfoggpack_adv;
4637 - typedef void function(oggpack_buffer *b) pfoggpack_adv1;
4638 - typedef int function(oggpack_buffer *b, int bits) pfoggpack_read;
4639 - typedef int function(oggpack_buffer *b) pfoggpack_read1;
4640 - typedef int function(oggpack_buffer *b) pfoggpack_bytes;
4641 - typedef int function(oggpack_buffer *b) pfoggpack_bits;
4642 - typedef ubyte *function(oggpack_buffer *b) pfoggpack_get_buffer;
4643 - pfoggpack_writeinit oggpack_writeinit;
4644 - pfoggpack_writetrunc oggpack_writetrunc;
4645 - pfoggpack_writealign oggpack_writealign;
4646 - pfoggpack_writecopy oggpack_writecopy;
4647 - pfoggpack_reset oggpack_reset;
4648 - pfoggpack_writeclear oggpack_writeclear;
4649 - pfoggpack_readinit oggpack_readinit;
4650 - pfoggpack_write oggpack_write;
4651 - pfoggpack_look oggpack_look;
4652 - pfoggpack_look1 oggpack_look1;
4653 - pfoggpack_adv oggpack_adv;
4654 - pfoggpack_adv1 oggpack_adv1;
4655 - pfoggpack_read oggpack_read;
4656 - pfoggpack_read1 oggpack_read1;
4657 - pfoggpack_bytes oggpack_bytes;
4658 - pfoggpack_bits oggpack_bits;
4659 - pfoggpack_get_buffer oggpack_get_buffer;
4660 + alias void function(oggpack_buffer *b) pfoggpack_writeinit;
4661 + alias void function(oggpack_buffer *b, int bits) pfoggpack_writetrunc;
4662 + alias void function(oggpack_buffer *b) pfoggpack_writealign;
4663 + alias void function(oggpack_buffer *b, void *source, int bits) pfoggpack_writecopy;
4664 + alias void function(oggpack_buffer *b) pfoggpack_reset;
4665 + alias void function(oggpack_buffer *b) pfoggpack_writeclear;
4666 + alias void function(oggpack_buffer *b, ubyte *buf, int bytes) pfoggpack_readinit;
4667 + alias void function(oggpack_buffer *b, uint value, int bits) pfoggpack_write;
4668 + alias int function(oggpack_buffer *b, int bits) pfoggpack_look;
4669 + alias int function(oggpack_buffer *b) pfoggpack_look1;
4670 + alias void function(oggpack_buffer *b, int bits) pfoggpack_adv;
4671 + alias void function(oggpack_buffer *b) pfoggpack_adv1;
4672 + alias int function(oggpack_buffer *b, int bits) pfoggpack_read;
4673 + alias int function(oggpack_buffer *b) pfoggpack_read1;
4674 + alias int function(oggpack_buffer *b) pfoggpack_bytes;
4675 + alias int function(oggpack_buffer *b) pfoggpack_bits;
4676 + alias ubyte *function(oggpack_buffer *b) pfoggpack_get_buffer;
4678 // Ogg BITSTREAM PRIMITIVES: encoding
4679 - typedef int function(ogg_stream_state *os, ogg_packet *op) pfogg_stream_packetin;
4680 - typedef int function(ogg_stream_state *os, ogg_page *og) pfogg_stream_pageout;
4681 - typedef int function(ogg_stream_state *os, ogg_page *og) pfogg_stream_flush;
4682 - pfogg_stream_packetin ogg_stream_packetin;
4683 - pfogg_stream_pageout ogg_stream_pageout;
4684 - pfogg_stream_flush ogg_stream_flush;
4685 + alias int function(ogg_stream_state *os, ogg_packet *op) pfogg_stream_packetin;
4686 + alias int function(ogg_stream_state *os, ogg_page *og) pfogg_stream_pageout;
4687 + alias int function(ogg_stream_state *os, ogg_page *og) pfogg_stream_flush;
4689 // Ogg BITSTREAM PRIMITIVES: decoding
4690 - typedef int function(ogg_sync_state *oy) pfogg_sync_init;
4691 - typedef int function(ogg_sync_state *oy) pfogg_sync_clear;
4692 - typedef int function(ogg_sync_state *oy) pfogg_sync_reset;
4693 - typedef int function(ogg_sync_state *oy) pfogg_sync_destroy;
4694 - pfogg_sync_init ogg_sync_init;
4695 - pfogg_sync_clear ogg_sync_clear;
4696 - pfogg_sync_reset ogg_sync_reset;
4697 - pfogg_sync_destroy ogg_sync_destroy;
4698 + alias int function(ogg_sync_state *oy) pfogg_sync_init;
4699 + alias int function(ogg_sync_state *oy) pfogg_sync_clear;
4700 + alias int function(ogg_sync_state *oy) pfogg_sync_reset;
4701 + alias int function(ogg_sync_state *oy) pfogg_sync_destroy;
4703 - typedef byte* function(ogg_sync_state *oy, int size) pfogg_sync_buffer;
4704 - typedef int function(ogg_sync_state *oy, int bytes) pfogg_sync_wrote;
4705 - typedef int function(ogg_sync_state *oy,ogg_page *og) pfogg_sync_pageseek;
4706 - typedef int function(ogg_sync_state *oy, ogg_page *og) pfogg_sync_pageout;
4707 - typedef int function(ogg_stream_state *os, ogg_page *og) pfogg_stream_pagein;
4708 - typedef int function(ogg_stream_state *os,ogg_packet *op) pfogg_stream_packetout;
4709 - typedef int function(ogg_stream_state *os,ogg_packet *op) pfogg_stream_packetpeek;
4710 - pfogg_sync_buffer ogg_sync_buffer;
4711 - pfogg_sync_wrote ogg_sync_wrote;
4712 - pfogg_sync_pageseek ogg_sync_pageseek;
4713 - pfogg_sync_pageout ogg_sync_pageout;
4714 - pfogg_stream_pagein ogg_stream_pagein;
4715 - pfogg_stream_packetout ogg_stream_packetout;
4716 - pfogg_stream_packetpeek ogg_stream_packetpeek;
4717 + alias byte* function(ogg_sync_state *oy, int size) pfogg_sync_buffer;
4718 + alias int function(ogg_sync_state *oy, int bytes) pfogg_sync_wrote;
4719 + alias int function(ogg_sync_state *oy,ogg_page *og) pfogg_sync_pageseek;
4720 + alias int function(ogg_sync_state *oy, ogg_page *og) pfogg_sync_pageout;
4721 + alias int function(ogg_stream_state *os, ogg_page *og) pfogg_stream_pagein;
4722 + alias int function(ogg_stream_state *os,ogg_packet *op) pfogg_stream_packetout;
4723 + alias int function(ogg_stream_state *os,ogg_packet *op) pfogg_stream_packetpeek;
4725 // Ogg BITSTREAM PRIMITIVES: general
4726 - typedef int function(ogg_stream_state *os,int serialno) pfogg_stream_init;
4727 - typedef int function(ogg_stream_state *os) pfogg_stream_clear;
4728 - typedef int function(ogg_stream_state *os) pfogg_stream_reset;
4729 - typedef int function(ogg_stream_state *os,int serialno) pfogg_stream_reset_serialno;
4730 - typedef int function(ogg_stream_state *os) pfogg_stream_destroy;
4731 - typedef int function(ogg_stream_state *os) pfogg_stream_eos;
4732 - pfogg_stream_init ogg_stream_init;
4733 - pfogg_stream_clear ogg_stream_clear;
4734 - pfogg_stream_reset ogg_stream_reset;
4735 - pfogg_stream_reset_serialno ogg_stream_reset_serialno;
4736 - pfogg_stream_destroy ogg_stream_destroy;
4737 - pfogg_stream_eos ogg_stream_eos;
4738 + alias int function(ogg_stream_state *os,int serialno) pfogg_stream_init;
4739 + alias int function(ogg_stream_state *os) pfogg_stream_clear;
4740 + alias int function(ogg_stream_state *os) pfogg_stream_reset;
4741 + alias int function(ogg_stream_state *os,int serialno) pfogg_stream_reset_serialno;
4742 + alias int function(ogg_stream_state *os) pfogg_stream_destroy;
4743 + alias int function(ogg_stream_state *os) pfogg_stream_eos;
4745 - typedef void function(ogg_page *og) pfogg_page_checksum_set;
4746 - pfogg_page_checksum_set ogg_page_checksum_set;
4747 + alias void function(ogg_page *og) pfogg_page_checksum_set;
4749 - typedef int function(ogg_page *og) pfogg_page_version;
4750 - typedef int function(ogg_page *og) pfogg_page_continued;
4751 - typedef int function(ogg_page *og) pfogg_page_bos;
4752 - typedef int function(ogg_page *og) pfogg_page_eos;
4753 - typedef ogg_int64_t function(ogg_page *og) pfogg_page_granulepos;
4754 - typedef int function(ogg_page *og) pfogg_page_serialno;
4755 - typedef int function(ogg_page *og) pfogg_page_pageno;
4756 - typedef int function(ogg_page *og) pfogg_page_packets;
4757 - pfogg_page_version ogg_page_version;
4758 - pfogg_page_continued ogg_page_continued;
4759 - pfogg_page_bos ogg_page_bos;
4760 - pfogg_page_eos ogg_page_eos;
4761 - pfogg_page_granulepos ogg_page_granulepos;
4762 - pfogg_page_serialno ogg_page_serialno;
4763 - pfogg_page_pageno ogg_page_pageno;
4764 - pfogg_page_packets ogg_page_packets;
4765 + alias int function(ogg_page *og) pfogg_page_version;
4766 + alias int function(ogg_page *og) pfogg_page_continued;
4767 + alias int function(ogg_page *og) pfogg_page_bos;
4768 + alias int function(ogg_page *og) pfogg_page_eos;
4769 + alias ogg_int64_t function(ogg_page *og) pfogg_page_granulepos;
4770 + alias int function(ogg_page *og) pfogg_page_serialno;
4771 + alias int function(ogg_page *og) pfogg_page_pageno;
4772 + alias int function(ogg_page *og) pfogg_page_packets;
4774 - typedef void function(ogg_packet *op) pfogg_packet_clear;
4775 - pfogg_packet_clear ogg_packet_clear;
4776 -
4777 -
4778 + alias void function(ogg_packet *op) pfogg_packet_clear;
4779 } // Extern (C)
4782 +pfoggpack_writeinit oggpack_writeinit;
4783 +pfoggpack_writetrunc oggpack_writetrunc;
4784 +pfoggpack_writealign oggpack_writealign;
4785 +pfoggpack_writecopy oggpack_writecopy;
4786 +pfoggpack_reset oggpack_reset;
4787 +pfoggpack_writeclear oggpack_writeclear;
4788 +pfoggpack_readinit oggpack_readinit;
4789 +pfoggpack_write oggpack_write;
4790 +pfoggpack_look oggpack_look;
4791 +pfoggpack_look1 oggpack_look1;
4792 +pfoggpack_adv oggpack_adv;
4793 +pfoggpack_adv1 oggpack_adv1;
4794 +pfoggpack_read oggpack_read;
4795 +pfoggpack_read1 oggpack_read1;
4796 +pfoggpack_bytes oggpack_bytes;
4797 +pfoggpack_bits oggpack_bits;
4798 +pfoggpack_get_buffer oggpack_get_buffer;
4800 +pfogg_stream_packetin ogg_stream_packetin;
4801 +pfogg_stream_pageout ogg_stream_pageout;
4802 +pfogg_stream_flush ogg_stream_flush;
4803 +
4804 +pfogg_sync_init ogg_sync_init;
4805 +pfogg_sync_clear ogg_sync_clear;
4806 +pfogg_sync_reset ogg_sync_reset;
4807 +pfogg_sync_destroy ogg_sync_destroy;
4808 +
4809 +pfogg_sync_buffer ogg_sync_buffer;
4810 +pfogg_sync_wrote ogg_sync_wrote;
4811 +pfogg_sync_pageseek ogg_sync_pageseek;
4812 +pfogg_sync_pageout ogg_sync_pageout;
4813 +pfogg_stream_pagein ogg_stream_pagein;
4814 +pfogg_stream_packetout ogg_stream_packetout;
4815 +pfogg_stream_packetpeek ogg_stream_packetpeek;
4816 +
4817 +pfogg_stream_init ogg_stream_init;
4818 +pfogg_stream_clear ogg_stream_clear;
4819 +pfogg_stream_reset ogg_stream_reset;
4820 +pfogg_stream_reset_serialno ogg_stream_reset_serialno;
4821 +pfogg_stream_destroy ogg_stream_destroy;
4822 +pfogg_stream_eos ogg_stream_eos;
4824 -
4825 -
4826 -
4827 -
4828 -
4829 -
4830 -
4831 -
4832 -
4833 -
4834 -
4835 -
4836 -
4837 -
4838 -
4839 -
4840 -
4841 -
4842 -
4843 -
4844 -
4845 -
4846 -
4847 -
4848 -
4849 -
4850 -
4851 -
4852 -
4853 +pfogg_page_checksum_set ogg_page_checksum_set;
4854 +
4855 +pfogg_page_version ogg_page_version;
4856 +pfogg_page_continued ogg_page_continued;
4857 +pfogg_page_bos ogg_page_bos;
4858 +pfogg_page_eos ogg_page_eos;
4859 +pfogg_page_granulepos ogg_page_granulepos;
4860 +pfogg_page_serialno ogg_page_serialno;
4861 +pfogg_page_pageno ogg_page_pageno;
4862 +pfogg_page_packets ogg_page_packets;
4863 +pfogg_packet_clear ogg_packet_clear;
4864 Index: DerelictUtil/derelict/util/wrapper.d
4865 ===================================================================
4866 --- DerelictUtil/derelict/util/wrapper.d (revision 318)
4867 +++ DerelictUtil/derelict/util/wrapper.d (working copy)
4868 @@ -34,7 +34,8 @@
4869 version(Tango)
4870 {
4871 private
4872 - {
4873 + {
4874 + import tango.io.Stdout;
4875 import tango.stdc.string;
4876 import tango.text.Util;
4877 import tango.stdc.stringz;
4878 @@ -67,7 +68,7 @@
4879 version(Tango)
4880 {
4881 static if(is(typeof(&fromStringz))) { return fromStringz(cstr); }
4882 - else { return fromUtf8z(cstr); }
4883 + else { return fromUtf8z(cstr); }
4884 }
4885 else
4886 {
4887 @@ -89,7 +90,7 @@
4888 }
4890 char[][] splitStr(char[] str, char[] delim)
4891 -{
4892 +{
4893 return split(str, delim);
4894 }
4896 Index: DerelictUtil/derelict/util/loader.d
4897 ===================================================================
4898 --- DerelictUtil/derelict/util/loader.d (revision 318)
4899 +++ DerelictUtil/derelict/util/loader.d (working copy)
4900 @@ -30,7 +30,7 @@
4901 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
4902 */
4903 module derelict.util.loader;
4904 -
4905 +
4906 private
4907 {
4908 import derelict.util.exception;
4909 @@ -50,10 +50,10 @@
4910 version = Nix;
4911 }
4913 -version (Nix)
4914 +version (Nix)
4915 {
4916 // for people using DSSS, tell it to link the executable with libdl
4917 - version(build)
4918 + version(build)
4919 {
4920 pragma(link, "dl");
4921 }
4922 @@ -102,7 +102,7 @@
4923 {
4924 SharedLibLoadException exception = null;
4925 SharedLib lib = null;
4926 -
4927 +
4928 foreach(char[] libName; libNames)
4929 {
4930 try
4931 @@ -111,7 +111,7 @@
4932 if(lib !is null) break;
4933 }
4934 catch(SharedLibLoadException slle)
4935 - {
4936 + {
4937 exception = slle;
4938 }
4939 }
4940 @@ -135,7 +135,7 @@
4941 assert(procName !is null);
4942 }
4943 body
4944 -{
4945 +{
4946 if(lib._handle is null)
4947 throw new InvalidSharedLibHandleException(lib._name);
4948 return Platform_GetProc(lib, procName);
4949 @@ -198,11 +198,12 @@
4950 }
4952 SharedLib Platform_LoadSharedLib(char[] libName)
4953 - {
4954 - void* hlib = dlopen(toCString(libName), RTLD_NOW);
4955 - if(null is hlib)
4956 - throw new SharedLibLoadException("Failed to load shared library " ~ libName);
4957 -
4958 + {
4959 + void* hlib = dlopen(toCString(libName), RTLD_NOW);
4960 + if(null is hlib) {
4961 + throw new SharedLibLoadException("Failed to load shared library " ~ libName);
4962 + }
4963 +
4964 return new SharedLib(hlib, libName);
4965 }
4967 @@ -213,10 +214,11 @@
4968 }
4970 void* Platform_GetProc(SharedLib lib, char[] procName)
4971 - {
4972 + {
4973 void* proc = dlsym(lib._handle, toCString(procName));
4974 - if(null is proc)
4975 - Derelict_HandleMissingProc(lib._name, procName);
4976 + if(null is proc) {
4977 + Derelict_HandleMissingProc(lib._name, procName);
4978 + }
4980 return proc;
4981 }
4982 Index: DerelictILUT/derelict/devil/ilutfuncs.d
4983 ===================================================================
4984 --- DerelictILUT/derelict/devil/ilutfuncs.d (revision 318)
4985 +++ DerelictILUT/derelict/devil/ilutfuncs.d (working copy)
4986 @@ -101,32 +101,32 @@
4987 }
4990 -extern(System):
4991 +extern(System) {
4992 +alias ILboolean function(ILenum Mode) pfilutDisable;
4993 +alias ILboolean function(ILenum Mode) pfilutEnable;
4994 +alias ILboolean function(ILenum Mode) pfilutGetBoolean;
4995 +alias ILvoid function(ILenum Mode, ILboolean *Param) pfilutGetBooleanv;
4996 +alias ILint function(ILenum Mode) pfilutGetInteger;
4997 +alias ILvoid function(ILenum Mode, ILint *Param) pfilutGetIntegerv;
4998 +alias ILstring function(ILenum StringName) pfilutGetString;
4999 +alias ILvoid function() pfilutInit;
5000 +alias ILboolean function(ILenum Mode) pfilutIsDisabled;
5001 +alias ILboolean function(ILenum Mode) pfilutIsEnabled;
5002 +alias ILvoid function() pfilutPopAttrib;
5003 +alias ILvoid function(ILuint Bits) pfilutPushAttrib;
5004 +alias ILvoid function(ILenum Mode, ILint Param) pfilutSetInteger;
5005 +alias ILboolean function(ILenum Renderer) pfilutRenderer;
5006 +alias GLuint function() pfilutGLBindTexImage;
5007 +alias GLuint function() pfilutGLBindMipmaps;
5008 +alias ILboolean function() pfilutGLBuildMipmaps;
5009 +alias GLuint function( ILstring FileName) pfilutGLLoadImage;
5010 +alias ILboolean function() pfilutGLScreen;
5011 +alias ILboolean function() pfilutGLScreenie;
5012 +alias ILboolean function( ILstring FileName, GLuint TexID) pfilutGLSaveImage;
5013 +alias ILboolean function(GLuint TexID) pfilutGLSetTex;
5014 +alias ILboolean function(GLuint Level) pfilutGLTexImage;
5015 +}
5017 -typedef ILboolean function(ILenum Mode) pfilutDisable;
5018 -typedef ILboolean function(ILenum Mode) pfilutEnable;
5019 -typedef ILboolean function(ILenum Mode) pfilutGetBoolean;
5020 -typedef ILvoid function(ILenum Mode, ILboolean *Param) pfilutGetBooleanv;
5021 -typedef ILint function(ILenum Mode) pfilutGetInteger;
5022 -typedef ILvoid function(ILenum Mode, ILint *Param) pfilutGetIntegerv;
5023 -typedef ILstring function(ILenum StringName) pfilutGetString;
5024 -typedef ILvoid function() pfilutInit;
5025 -typedef ILboolean function(ILenum Mode) pfilutIsDisabled;
5026 -typedef ILboolean function(ILenum Mode) pfilutIsEnabled;
5027 -typedef ILvoid function() pfilutPopAttrib;
5028 -typedef ILvoid function(ILuint Bits) pfilutPushAttrib;
5029 -typedef ILvoid function(ILenum Mode, ILint Param) pfilutSetInteger;
5030 -typedef ILboolean function(ILenum Renderer) pfilutRenderer;
5031 -typedef GLuint function() pfilutGLBindTexImage;
5032 -typedef GLuint function() pfilutGLBindMipmaps;
5033 -typedef ILboolean function() pfilutGLBuildMipmaps;
5034 -typedef GLuint function( ILstring FileName) pfilutGLLoadImage;
5035 -typedef ILboolean function() pfilutGLScreen;
5036 -typedef ILboolean function() pfilutGLScreenie;
5037 -typedef ILboolean function( ILstring FileName, GLuint TexID) pfilutGLSaveImage;
5038 -typedef ILboolean function(GLuint TexID) pfilutGLSetTex;
5039 -typedef ILboolean function(GLuint Level) pfilutGLTexImage;
5040 -
5041 pfilutDisable ilutDisable;
5042 pfilutEnable ilutEnable;
5043 pfilutGetBoolean ilutGetBoolean;
5044 @@ -152,9 +152,9 @@
5045 pfilutGLTexImage ilutGLTexImage;
5047 // ImageLib Utility Toolkit's SDL Functions
5048 -//typedef SDL_Surface* function(uint flags) pfilutConvertToSDLSurface;
5049 -//typedef SDL_Surface* function( ILstring FileName) pfilutSDLSurfaceLoadImage;
5050 -//typedef ILboolean function(SDL_Surface *Bitmap) pfilutSDLSurfaceFromBitmap;
5051 +//alias SDL_Surface* function(uint flags) pfilutConvertToSDLSurface;
5052 +//alias SDL_Surface* function( ILstring FileName) pfilutSDLSurfaceLoadImage;
5053 +//alias ILboolean function(SDL_Surface *Bitmap) pfilutSDLSurfaceFromBitmap;
5054 //pfilutConvertToSDLSurface ilutConvertToSDLSurface;
5055 //pfilutSDLSurfaceLoadImage ilutSDLSurfaceLoadImage;
5056 //pfilutSDLSurfaceFromBitmap ilutSDLSurfaceFromBitmap;
5057 @@ -173,20 +173,20 @@
5058 }
5060 extern(Windows):
5061 - typedef HBITMAP function(HDC hDC) pfilutConvertToHBitmap;
5062 - typedef ILvoid function(ILubyte *Data) pfilutFreePaddedData;
5063 - typedef ILvoid function(BITMAPINFO *Info) pfilutGetBmpInfo;
5064 - typedef HPALETTE function() pfilutGetHPal;
5065 - typedef ILubyte* function() pfilutGetPaddedData;
5066 - typedef ILboolean function() pfilutGetWinClipboard;
5067 - typedef ILboolean function(HINSTANCE hInst, ILint ID, ILstring ResourceType, ILenum Type) pfilutLoadResource;
5068 - typedef ILboolean function(HBITMAP Bitmap) pfilutSetHBitmap;
5069 - typedef ILboolean function(HPALETTE Pal) pfilutSetHPal;
5070 - typedef ILboolean function() pfilutSetWinClipboard;
5071 - typedef HBITMAP function( ILstring FileName, HDC hDC) pfilutWinLoadImage;
5072 - typedef ILboolean function( ILstring Url) pfilutWinLoadUrl;
5073 - typedef ILboolean function(ILuint XPos, ILuint YPos, ILuint Width, ILuint Height, HDC hDC) pfilutWinPrint;
5074 - typedef ILboolean function( ILstring FileName, HBITMAP Bitmap) pfilutWinSaveImage;
5075 + alias HBITMAP function(HDC hDC) pfilutConvertToHBitmap;
5076 + alias ILvoid function(ILubyte *Data) pfilutFreePaddedData;
5077 + alias ILvoid function(BITMAPINFO *Info) pfilutGetBmpInfo;
5078 + alias HPALETTE function() pfilutGetHPal;
5079 + alias ILubyte* function() pfilutGetPaddedData;
5080 + alias ILboolean function() pfilutGetWinClipboard;
5081 + alias ILboolean function(HINSTANCE hInst, ILint ID, ILstring ResourceType, ILenum Type) pfilutLoadResource;
5082 + alias ILboolean function(HBITMAP Bitmap) pfilutSetHBitmap;
5083 + alias ILboolean function(HPALETTE Pal) pfilutSetHPal;
5084 + alias ILboolean function() pfilutSetWinClipboard;
5085 + alias HBITMAP function( ILstring FileName, HDC hDC) pfilutWinLoadImage;
5086 + alias ILboolean function( ILstring Url) pfilutWinLoadUrl;
5087 + alias ILboolean function(ILuint XPos, ILuint YPos, ILuint Width, ILuint Height, HDC hDC) pfilutWinPrint;
5088 + alias ILboolean function( ILstring FileName, HBITMAP Bitmap) pfilutWinSaveImage;
5089 pfilutConvertToHBitmap ilutConvertToHBitmap;
5090 pfilutFreePaddedData ilutFreePaddedData;
5091 pfilutGetBmpInfo ilutGetBmpInfo;
5092 Index: DerelictSDL/derelict/sdl/endian.d
5093 ===================================================================
5094 --- DerelictSDL/derelict/sdl/endian.d (revision 318)
5095 +++ DerelictSDL/derelict/sdl/endian.d (working copy)
5096 @@ -33,7 +33,8 @@
5098 private import derelict.sdl.types;
5099 private import derelict.sdl.rwops;
5100 -private import std.intrinsic;
5101 +// private import std.intrinsic;
5102 +private import ldc.bitmanip;
5104 //==============================================================================
5105 // MACROS
5106 Index: DerelictSDL/derelict/sdl/joystick.d
5107 ===================================================================
5108 --- DerelictSDL/derelict/sdl/joystick.d (revision 318)
5109 +++ DerelictSDL/derelict/sdl/joystick.d (working copy)
5110 @@ -54,24 +54,25 @@
5111 //==============================================================================
5112 // FUNCTIONS
5113 //==============================================================================
5114 -extern(C):
5115 +extern(C) {
5116 +alias int function() pfSDL_NumJoysticks;
5117 +alias char* function(int) pfSDL_JoystickName;
5118 +alias SDL_Joystick* function(int) pfSDL_JoystickOpen;
5119 +alias int function(int) pfSDL_JoystickOpened;
5120 +alias int function(SDL_Joystick*) pfSDL_JoystickIndex;
5121 +alias int function(SDL_Joystick*) pfSDL_JoystickNumAxes;
5122 +alias int function(SDL_Joystick*) pfSDL_JoystickNumBalls;
5123 +alias int function(SDL_Joystick*) pfSDL_JoystickNumHats;
5124 +alias int function(SDL_Joystick*) pfSDL_JoystickNumButtons;
5125 +alias void function() pfSDL_JoystickUpdate;
5126 +alias int function(int) pfSDL_JoystickEventState;
5127 +alias Sint16 function(SDL_Joystick*,int) pfSDL_JoystickGetAxis;
5128 +alias Uint8 function(SDL_Joystick*,int) pfSDL_JoystickGetHat;
5129 +alias int function(SDL_Joystick*,int,int*,int*) pfSDL_JoystickGetBall;
5130 +alias Uint8 function(SDL_Joystick*,int) pfSDL_JoystickGetButton;
5131 +alias void function(SDL_Joystick*) pfSDL_JoystickClose;
5132 +}
5134 -typedef int function() pfSDL_NumJoysticks;
5135 -typedef char* function(int) pfSDL_JoystickName;
5136 -typedef SDL_Joystick* function(int) pfSDL_JoystickOpen;
5137 -typedef int function(int) pfSDL_JoystickOpened;
5138 -typedef int function(SDL_Joystick*) pfSDL_JoystickIndex;
5139 -typedef int function(SDL_Joystick*) pfSDL_JoystickNumAxes;
5140 -typedef int function(SDL_Joystick*) pfSDL_JoystickNumBalls;
5141 -typedef int function(SDL_Joystick*) pfSDL_JoystickNumHats;
5142 -typedef int function(SDL_Joystick*) pfSDL_JoystickNumButtons;
5143 -typedef void function() pfSDL_JoystickUpdate;
5144 -typedef int function(int) pfSDL_JoystickEventState;
5145 -typedef Sint16 function(SDL_Joystick*,int) pfSDL_JoystickGetAxis;
5146 -typedef Uint8 function(SDL_Joystick*,int) pfSDL_JoystickGetHat;
5147 -typedef int function(SDL_Joystick*,int,int*,int*) pfSDL_JoystickGetBall;
5148 -typedef Uint8 function(SDL_Joystick*,int) pfSDL_JoystickGetButton;
5149 -typedef void function(SDL_Joystick*) pfSDL_JoystickClose;
5150 pfSDL_NumJoysticks SDL_NumJoysticks;
5151 pfSDL_JoystickName SDL_JoystickName;
5152 pfSDL_JoystickOpen SDL_JoystickOpen;
5153 @@ -87,4 +88,4 @@
5154 pfSDL_JoystickGetHat SDL_JoystickGetHat;
5155 pfSDL_JoystickGetBall SDL_JoystickGetBall;
5156 pfSDL_JoystickGetButton SDL_JoystickGetButton;
5157 -pfSDL_JoystickClose SDL_JoystickClose;
5158 \ No newline at end of file
5159 +pfSDL_JoystickClose SDL_JoystickClose;
5160 Index: DerelictSDL/derelict/sdl/keyboard.d
5161 ===================================================================
5162 --- DerelictSDL/derelict/sdl/keyboard.d (revision 318)
5163 +++ DerelictSDL/derelict/sdl/keyboard.d (working copy)
5164 @@ -56,19 +56,20 @@
5165 //==============================================================================
5166 // FUNCTIONS
5167 //==============================================================================
5168 -extern(C):
5169 +extern(C) {
5170 +alias int function(int) pfSDL_EnableUNICODE;
5171 +alias int function(int,int) pfSDL_EnableKeyRepeat;
5172 +alias void function(int*,int*) pfSDL_GetKeyRepeat;
5173 +alias Uint8* function(int*) pfSDL_GetKeyState;
5174 +alias SDLMod function() pfSDL_GetModState;
5175 +alias void function(SDLMod) pfSDL_SetModState;
5176 +alias char* function(SDLKey key) pfSDL_GetKeyName;
5177 +}
5179 -typedef int function(int) pfSDL_EnableUNICODE;
5180 -typedef int function(int,int) pfSDL_EnableKeyRepeat;
5181 -typedef void function(int*,int*) pfSDL_GetKeyRepeat;
5182 -typedef Uint8* function(int*) pfSDL_GetKeyState;
5183 -typedef SDLMod function() pfSDL_GetModState;
5184 -typedef void function(SDLMod) pfSDL_SetModState;
5185 -typedef char* function(SDLKey key) pfSDL_GetKeyName;
5186 pfSDL_EnableUNICODE SDL_EnableUNICODE;
5187 pfSDL_EnableKeyRepeat SDL_EnableKeyRepeat;
5188 pfSDL_GetKeyRepeat SDL_GetKeyRepeat;
5189 pfSDL_GetKeyState SDL_GetKeyState;
5190 pfSDL_GetModState SDL_GetModState;
5191 pfSDL_SetModState SDL_SetModState;
5192 -pfSDL_GetKeyName SDL_GetKeyName;
5193 \ No newline at end of file
5194 +pfSDL_GetKeyName SDL_GetKeyName;
5195 Index: DerelictSDL/derelict/sdl/audio.d
5196 ===================================================================
5197 --- DerelictSDL/derelict/sdl/audio.d (revision 318)
5198 +++ DerelictSDL/derelict/sdl/audio.d (working copy)
5199 @@ -115,22 +115,23 @@
5200 //==============================================================================
5201 // FUNCTIONS
5202 //==============================================================================
5203 -extern(C):
5204 +extern(C) {
5205 +alias int function(char*) pfSDL_AudioInit;
5206 +alias void function() pfSDL_AudioQuit;
5207 +alias char* function(char*,int) pfSDL_AudioDriverName;
5208 +alias int function(SDL_AudioSpec*,SDL_AudioSpec*) pfSDL_OpenAudio;
5209 +alias SDL_audiostatus function() pfSDL_GetAudioStatus;
5210 +alias void function(int) pfSDL_PauseAudio;
5211 +alias SDL_AudioSpec* function(SDL_RWops*,int,SDL_AudioSpec*,Uint8**,Uint32*) pfSDL_LoadWAV_RW;
5212 +alias void function(Uint8*) pfSDL_FreeWAV;
5213 +alias int function(SDL_AudioCVT*,Uint16,Uint8,int,Uint16,Uint8,int) pfSDL_BuildAudioCVT;
5214 +alias int function(SDL_AudioCVT*) pfSDL_ConvertAudio;
5215 +alias void function(Uint8*,Uint8*,Uint32,int) pfSDL_MixAudio;
5216 +alias void function() pfSDL_LockAudio;
5217 +alias void function() pfSDL_UnlockAudio;
5218 +alias void function() pfSDL_CloseAudio;
5219 +}
5221 -typedef int function(char*) pfSDL_AudioInit;
5222 -typedef void function() pfSDL_AudioQuit;
5223 -typedef char* function(char*,int) pfSDL_AudioDriverName;
5224 -typedef int function(SDL_AudioSpec*,SDL_AudioSpec*) pfSDL_OpenAudio;
5225 -typedef SDL_audiostatus function() pfSDL_GetAudioStatus;
5226 -typedef void function(int) pfSDL_PauseAudio;
5227 -typedef SDL_AudioSpec* function(SDL_RWops*,int,SDL_AudioSpec*,Uint8**,Uint32*) pfSDL_LoadWAV_RW;
5228 -typedef void function(Uint8*) pfSDL_FreeWAV;
5229 -typedef int function(SDL_AudioCVT*,Uint16,Uint8,int,Uint16,Uint8,int) pfSDL_BuildAudioCVT;
5230 -typedef int function(SDL_AudioCVT*) pfSDL_ConvertAudio;
5231 -typedef void function(Uint8*,Uint8*,Uint32,int) pfSDL_MixAudio;
5232 -typedef void function() pfSDL_LockAudio;
5233 -typedef void function() pfSDL_UnlockAudio;
5234 -typedef void function() pfSDL_CloseAudio;
5235 pfSDL_AudioInit SDL_AudioInit;
5236 pfSDL_AudioQuit SDL_AudioQuit;
5237 pfSDL_AudioDriverName SDL_AudioDriverName;
5238 @@ -144,4 +145,4 @@
5239 pfSDL_MixAudio SDL_MixAudio;
5240 pfSDL_LockAudio SDL_LockAudio;
5241 pfSDL_UnlockAudio SDL_UnlockAudio;
5242 -pfSDL_CloseAudio SDL_CloseAudio;
5243 \ No newline at end of file
5244 +pfSDL_CloseAudio SDL_CloseAudio;
5245 Index: DerelictSDL/derelict/sdl/macinit/SDLMain.d
5246 ===================================================================
5247 --- DerelictSDL/derelict/sdl/macinit/SDLMain.d (revision 318)
5248 +++ DerelictSDL/derelict/sdl/macinit/SDLMain.d (working copy)
5249 @@ -403,4 +403,4 @@
5253 -} // version(darwin)
5254 \ No newline at end of file
5255 +} // version(darwin)
5256 Index: DerelictSDL/derelict/sdl/mutex.d
5257 ===================================================================
5258 --- DerelictSDL/derelict/sdl/mutex.d (revision 318)
5259 +++ DerelictSDL/derelict/sdl/mutex.d (working copy)
5260 @@ -62,24 +62,33 @@
5261 //==============================================================================
5262 // FUNCTIONS
5263 //==============================================================================
5264 -extern(C):
5265 +extern(C) {
5266 +alias SDL_mutex* function() pfSDL_CreateMutex;
5267 +alias int function(SDL_mutex*) pfSDL_mutexP;
5268 +alias int function(SDL_mutex*) pfSDL_mutexV;
5269 +alias void function(SDL_mutex*) pfSDL_DestroyMutex;
5271 -typedef SDL_mutex* function() pfSDL_CreateMutex;
5272 -typedef int function(SDL_mutex*) pfSDL_mutexP;
5273 -typedef int function(SDL_mutex*) pfSDL_mutexV;
5274 -typedef void function(SDL_mutex*) pfSDL_DestroyMutex;
5275 +alias SDL_sem* function(Uint32) pfSDL_CreateSemaphore;
5276 +alias void function(SDL_sem*) pfSDL_DestroySemaphore;
5277 +alias int function(SDL_sem*) pfSDL_SemWait;
5278 +alias int function(SDL_sem*) pfSDL_SemTryWait;
5279 +alias int function(SDL_sem*,Uint32) pfSDL_SemWaitTimeout;
5280 +alias int function(SDL_sem*) pfSDL_SemPost;
5281 +alias Uint32 function(SDL_sem*) pfSDL_SemValue;
5282 +
5283 +alias SDL_cond* function() pfSDL_CreateCond;
5284 +alias void function(SDL_cond*) pfSDL_DestroyCond;
5285 +alias int function(SDL_cond*) pfSDL_CondSignal;
5286 +alias int function(SDL_cond*) pfSDL_CondBroadcast;
5287 +alias int function(SDL_cond*,SDL_mutex*) pfSDL_CondWait;
5288 +alias int function(SDL_cond*,SDL_mutex*,Uint32) pfSDL_CondWaitTimeout;
5289 +}
5290 +
5291 pfSDL_CreateMutex SDL_CreateMutex;
5292 pfSDL_mutexP SDL_mutexP;
5293 pfSDL_mutexV SDL_mutexV;
5294 pfSDL_DestroyMutex SDL_DestroyMutex;
5295 -
5296 -typedef SDL_sem* function(Uint32) pfSDL_CreateSemaphore;
5297 -typedef void function(SDL_sem*) pfSDL_DestroySemaphore;
5298 -typedef int function(SDL_sem*) pfSDL_SemWait;
5299 -typedef int function(SDL_sem*) pfSDL_SemTryWait;
5300 -typedef int function(SDL_sem*,Uint32) pfSDL_SemWaitTimeout;
5301 -typedef int function(SDL_sem*) pfSDL_SemPost;
5302 -typedef Uint32 function(SDL_sem*) pfSDL_SemValue;
5303 +
5304 pfSDL_CreateSemaphore SDL_CreateSemaphore;
5305 pfSDL_DestroySemaphore SDL_DestroySemaphore;
5306 pfSDL_SemWait SDL_SemWait;
5307 @@ -87,16 +96,10 @@
5308 pfSDL_SemWaitTimeout SDL_SemWaitTimeout;
5309 pfSDL_SemPost SDL_SemPost;
5310 pfSDL_SemValue SDL_SemValue;
5311 -
5312 -typedef SDL_cond* function() pfSDL_CreateCond;
5313 -typedef void function(SDL_cond*) pfSDL_DestroyCond;
5314 -typedef int function(SDL_cond*) pfSDL_CondSignal;
5315 -typedef int function(SDL_cond*) pfSDL_CondBroadcast;
5316 -typedef int function(SDL_cond*,SDL_mutex*) pfSDL_CondWait;
5317 -typedef int function(SDL_cond*,SDL_mutex*,Uint32) pfSDL_CondWaitTimeout;
5318 +
5319 pfSDL_CreateCond SDL_CreateCond;
5320 pfSDL_DestroyCond SDL_DestroyCond;
5321 pfSDL_CondSignal SDL_CondSignal;
5322 pfSDL_CondBroadcast SDL_CondBroadcast;
5323 pfSDL_CondWait SDL_CondWait;
5324 -pfSDL_CondWaitTimeout SDL_CondWaitTimeout;
5325 \ No newline at end of file
5326 +pfSDL_CondWaitTimeout SDL_CondWaitTimeout;
5327 Index: DerelictSDL/derelict/sdl/cpuinfo.d
5328 ===================================================================
5329 --- DerelictSDL/derelict/sdl/cpuinfo.d (revision 318)
5330 +++ DerelictSDL/derelict/sdl/cpuinfo.d (working copy)
5331 @@ -33,16 +33,17 @@
5333 private import derelict.sdl.types;
5335 -extern(C):
5336 +extern(C) {
5337 +alias SDL_bool function() pfSDL_HasRDTSC;
5338 +alias SDL_bool function() pfSDL_HasMMX;
5339 +alias SDL_bool function() pfSDL_HasMMXExt;
5340 +alias SDL_bool function() pfSDL_Has3DNow;
5341 +alias SDL_bool function() pfSDL_Has3DNowExt;
5342 +alias SDL_bool function() pfSDL_HasSSE;
5343 +alias SDL_bool function() pfSDL_HasSSE2;
5344 +alias SDL_bool function() pfSDL_HasAltiVec;
5345 +}
5347 -typedef SDL_bool function() pfSDL_HasRDTSC;
5348 -typedef SDL_bool function() pfSDL_HasMMX;
5349 -typedef SDL_bool function() pfSDL_HasMMXExt;
5350 -typedef SDL_bool function() pfSDL_Has3DNow;
5351 -typedef SDL_bool function() pfSDL_Has3DNowExt;
5352 -typedef SDL_bool function() pfSDL_HasSSE;
5353 -typedef SDL_bool function() pfSDL_HasSSE2;
5354 -typedef SDL_bool function() pfSDL_HasAltiVec;
5355 pfSDL_HasRDTSC SDL_HasRDTSC;
5356 pfSDL_HasMMX SDL_HasMMX;
5357 pfSDL_HasMMXExt SDL_HasMMXExt;
5358 @@ -50,4 +51,4 @@
5359 pfSDL_Has3DNowExt SDL_Has3DNowExt;
5360 pfSDL_HasSSE SDL_HasSSE;
5361 pfSDL_HasSSE2 SDL_HasSSE2;
5362 -pfSDL_HasAltiVec SDL_HasAltiVec;
5363 \ No newline at end of file
5364 +pfSDL_HasAltiVec SDL_HasAltiVec;
5365 Index: DerelictSDL/derelict/sdl/events.d
5366 ===================================================================
5367 --- DerelictSDL/derelict/sdl/events.d (revision 318)
5368 +++ DerelictSDL/derelict/sdl/events.d (working copy)
5369 @@ -225,7 +225,7 @@
5370 SDL_GETEVENT
5371 }
5373 -extern(C) typedef int function(SDL_Event *event) SDL_EventFilter;
5374 +extern(C) alias int function(SDL_Event *event) SDL_EventFilter;
5376 enum : Uint8
5377 {
5378 @@ -247,16 +247,17 @@
5379 //==============================================================================
5380 // FUNCTIONS
5381 //==============================================================================
5382 -extern(C):
5383 +extern(C) {
5384 +alias void function() pfSDL_PumpEvents;
5385 +alias int function(SDL_Event*,int,SDL_eventaction,Uint32) pfSDL_PeepEvents;
5386 +alias int function(SDL_Event*) pfSDL_PollEvent;
5387 +alias int function(SDL_Event*) pfSDL_WaitEvent;
5388 +alias int function(SDL_Event*) pfSDL_PushEvent;
5389 +alias void function(SDL_EventFilter) pfSDL_SetEventFilter;
5390 +alias SDL_EventFilter function() pfSDL_GetEventFilter;
5391 +alias Uint8 function(Uint8,int) pfSDL_EventState;
5392 +}
5394 -typedef void function() pfSDL_PumpEvents;
5395 -typedef int function(SDL_Event*,int,SDL_eventaction,Uint32) pfSDL_PeepEvents;
5396 -typedef int function(SDL_Event*) pfSDL_PollEvent;
5397 -typedef int function(SDL_Event*) pfSDL_WaitEvent;
5398 -typedef int function(SDL_Event*) pfSDL_PushEvent;
5399 -typedef void function(SDL_EventFilter) pfSDL_SetEventFilter;
5400 -typedef SDL_EventFilter function() pfSDL_GetEventFilter;
5401 -typedef Uint8 function(Uint8,int) pfSDL_EventState;
5402 pfSDL_PumpEvents SDL_PumpEvents;
5403 pfSDL_PeepEvents SDL_PeepEvents;
5404 pfSDL_PollEvent SDL_PollEvent;
5405 @@ -264,4 +265,4 @@
5406 pfSDL_PushEvent SDL_PushEvent;
5407 pfSDL_SetEventFilter SDL_SetEventFilter;
5408 pfSDL_GetEventFilter SDL_GetEventFilter;
5409 -pfSDL_EventState SDL_EventState;
5410 \ No newline at end of file
5411 +pfSDL_EventState SDL_EventState;
5412 Index: DerelictSDL/derelict/sdl/cdrom.d
5413 ===================================================================
5414 --- DerelictSDL/derelict/sdl/cdrom.d (revision 318)
5415 +++ DerelictSDL/derelict/sdl/cdrom.d (working copy)
5416 @@ -101,19 +101,20 @@
5417 //==============================================================================
5418 // FUNCTIONS
5419 //==============================================================================
5420 -extern(C):
5421 +extern(C) {
5422 +alias int function() pfSDL_CDNumDrives;
5423 +alias char* function(int) pfSDL_CDName;
5424 +alias SDL_CD* function(int) pfSDL_CDOpen;
5425 +alias CDstatus function(SDL_CD*) pfSDL_CDStatus;
5426 +alias int function(SDL_CD*,int,int,int,int) pfSDL_CDPlayTracks;
5427 +alias int function(SDL_CD*,int,int) pfSDL_CDPlay;
5428 +alias int function(SDL_CD*) pfSDL_CDPause;
5429 +alias int function(SDL_CD*) pfSDL_CDResume;
5430 +alias int function(SDL_CD*) pfSDL_CDStop;
5431 +alias int function(SDL_CD*) pfSDL_CDEject;
5432 +alias int function(SDL_CD*) pfSDL_CDClose;
5433 +}
5435 -typedef int function() pfSDL_CDNumDrives;
5436 -typedef char* function(int) pfSDL_CDName;
5437 -typedef SDL_CD* function(int) pfSDL_CDOpen;
5438 -typedef CDstatus function(SDL_CD*) pfSDL_CDStatus;
5439 -typedef int function(SDL_CD*,int,int,int,int) pfSDL_CDPlayTracks;
5440 -typedef int function(SDL_CD*,int,int) pfSDL_CDPlay;
5441 -typedef int function(SDL_CD*) pfSDL_CDPause;
5442 -typedef int function(SDL_CD*) pfSDL_CDResume;
5443 -typedef int function(SDL_CD*) pfSDL_CDStop;
5444 -typedef int function(SDL_CD*) pfSDL_CDEject;
5445 -typedef int function(SDL_CD*) pfSDL_CDClose;
5446 pfSDL_CDNumDrives SDL_CDNumDrives;
5447 pfSDL_CDName SDL_CDName;
5448 pfSDL_CDOpen SDL_CDOpen;
5449 Index: DerelictSDL/derelict/sdl/video.d
5450 ===================================================================
5451 --- DerelictSDL/derelict/sdl/video.d (revision 318)
5452 +++ DerelictSDL/derelict/sdl/video.d (working copy)
5453 @@ -213,65 +213,66 @@
5454 //==============================================================================
5455 // FUNCTIONS
5456 //==============================================================================
5457 -extern(C):
5458 +extern(C) {
5459 +alias int function(char*,Uint32) pfSDL_VideoInit;
5460 +alias void function() pfSDL_VideoQuit;
5461 +alias char* function(char*,int) pfSDL_VideoDriverName;
5462 +alias SDL_Surface* function() pfSDL_GetVideoSurface;
5463 +alias SDL_VideoInfo* function() pfSDL_GetVideoInfo;
5464 +alias int function(int,int,int,Uint32) pfSDL_VideoModeOK;
5465 +alias SDL_Rect** function(SDL_PixelFormat*,Uint32) pfSDL_ListModes;
5466 +alias SDL_Surface* function(int,int,int,Uint32) pfSDL_SetVideoMode;
5467 +alias void function(SDL_Surface*,int,SDL_Rect*) pfSDL_UpdateRects;
5468 +alias void function(SDL_Surface*,Sint32,Sint32,Uint32,Uint32) pfSDL_UpdateRect;
5469 +alias int function(SDL_Surface*) pfSDL_Flip;
5470 +alias int function(float,float,float) pfSDL_SetGamma;
5471 +alias int function(Uint16*,Uint16*,Uint16*) pfSDL_SetGammaRamp;
5472 +alias int function(Uint16*,Uint16*,Uint16*) pfSDL_GetGammaRamp;
5473 +alias int function(SDL_Surface*,SDL_Color*,int,int) pfSDL_SetColors;
5474 +alias int function(SDL_Surface*,int,SDL_Color*,int,int) pfSDL_SetPalette;
5475 +alias Uint32 function(SDL_PixelFormat*,Uint8,Uint8,Uint8) pfSDL_MapRGB;
5476 +alias Uint32 function(SDL_PixelFormat*,Uint8,Uint8,Uint8,Uint8) pfSDL_MapRGBA;
5477 +alias void function(Uint32,SDL_PixelFormat*,Uint8*,Uint8*,Uint8*) pfSDL_GetRGB;
5478 +alias void function(Uint32,SDL_PixelFormat*,Uint8*,Uint8*,Uint8*,Uint8*) pfSDL_GetRGBA;
5479 +alias SDL_Surface* function(Uint32,int,int,int,Uint32,Uint32,Uint32,Uint32) pfSDL_CreateRGBSurface;
5480 +alias SDL_Surface* function(void*,int,int,int,int,Uint32,Uint32,Uint32,Uint32) pfSDL_CreateRGBSurfaceFrom;
5481 +alias void function(SDL_Surface*) pfSDL_FreeSurface;
5482 +alias int function(SDL_Surface*) pfSDL_LockSurface;
5483 +alias void function(SDL_Surface*) pfSDL_UnlockSurface;
5484 +alias SDL_Surface* function(SDL_RWops*,int) pfSDL_LoadBMP_RW;
5485 +alias int function(SDL_Surface*,SDL_RWops*,int) pfSDL_SaveBMP_RW;
5486 +alias int function(SDL_Surface*,Uint32,Uint32) pfSDL_SetColorKey;
5487 +alias int function(SDL_Surface*,Uint32,Uint8) pfSDL_SetAlpha;
5488 +alias SDL_bool function(SDL_Surface*,SDL_Rect*) pfSDL_SetClipRect;
5489 +alias void function(SDL_Surface*,SDL_Rect*) pfSDL_GetClipRect;
5490 +alias SDL_Surface* function(SDL_Surface*,SDL_PixelFormat*,Uint32) pfSDL_ConvertSurface;
5491 +alias int function(SDL_Surface*,SDL_Rect*,SDL_Surface*,SDL_Rect*) pfSDL_UpperBlit;
5492 +alias int function(SDL_Surface*,SDL_Rect*,SDL_Surface*,SDL_Rect*) pfSDL_LowerBlit;
5493 +alias int function(SDL_Surface*,SDL_Rect*,Uint32) pfSDL_FillRect;
5494 +alias SDL_Surface* function(SDL_Surface*) pfSDL_DisplayFormat;
5495 +alias SDL_Surface* function(SDL_Surface*) pfSDL_DisplayFormatAlpha;
5496 +alias SDL_Overlay* function(int,int,Uint32,SDL_Surface*) pfSDL_CreateYUVOverlay;
5497 +alias int function(SDL_Overlay*) pfSDL_LockYUVOverlay;
5498 +alias void function(SDL_Overlay*) pfSDL_UnlockYUVOverlay;
5499 +alias int function(SDL_Overlay*,SDL_Rect*) pfSDL_DisplayYUVOverlay;
5500 +alias void function(SDL_Overlay*) pfSDL_FreeYUVOverlay;
5501 +alias int function(char*) pfSDL_GL_LoadLibrary;
5502 +alias void* function(char*) pfSDL_GL_GetProcAddress;
5503 +alias int function(SDL_GLattr,int) pfSDL_GL_SetAttribute;
5504 +alias int function(SDL_GLattr,int*) pfSDL_GL_GetAttribute;
5505 +alias void function() pfSDL_GL_SwapBuffers;
5506 +alias void function(int,SDL_Rect*) pfSDL_GL_UpdateRects;
5507 +alias void function() pfSDL_GL_Lock;
5508 +alias void function() pfSDL_GL_Unlock;
5509 +alias void function(char*,char*) pfSDL_WM_SetCaption;
5510 +alias void function(char**,char**) pfSDL_WM_GetCaption;
5511 +alias void function(SDL_Surface*,Uint8*) pfSDL_WM_SetIcon;
5512 +alias int function() pfSDL_WM_IconifyWindow;
5513 +alias int function(SDL_Surface*) pfSDL_WM_ToggleFullScreen;
5514 +alias SDL_GrabMode function(SDL_GrabMode) pfSDL_WM_GrabInput;
5515 +}
5517 -typedef int function(char*,Uint32) pfSDL_VideoInit;
5518 -typedef void function() pfSDL_VideoQuit;
5519 -typedef char* function(char*,int) pfSDL_VideoDriverName;
5520 -typedef SDL_Surface* function() pfSDL_GetVideoSurface;
5521 -typedef SDL_VideoInfo* function() pfSDL_GetVideoInfo;
5522 -typedef int function(int,int,int,Uint32) pfSDL_VideoModeOK;
5523 -typedef SDL_Rect** function(SDL_PixelFormat*,Uint32) pfSDL_ListModes;
5524 -typedef SDL_Surface* function(int,int,int,Uint32) pfSDL_SetVideoMode;
5525 -typedef void function(SDL_Surface*,int,SDL_Rect*) pfSDL_UpdateRects;
5526 -typedef void function(SDL_Surface*,Sint32,Sint32,Uint32,Uint32) pfSDL_UpdateRect;
5527 -typedef int function(SDL_Surface*) pfSDL_Flip;
5528 -typedef int function(float,float,float) pfSDL_SetGamma;
5529 -typedef int function(Uint16*,Uint16*,Uint16*) pfSDL_SetGammaRamp;
5530 -typedef int function(Uint16*,Uint16*,Uint16*) pfSDL_GetGammaRamp;
5531 -typedef int function(SDL_Surface*,SDL_Color*,int,int) pfSDL_SetColors;
5532 -typedef int function(SDL_Surface*,int,SDL_Color*,int,int) pfSDL_SetPalette;
5533 -typedef Uint32 function(SDL_PixelFormat*,Uint8,Uint8,Uint8) pfSDL_MapRGB;
5534 -typedef Uint32 function(SDL_PixelFormat*,Uint8,Uint8,Uint8,Uint8) pfSDL_MapRGBA;
5535 -typedef void function(Uint32,SDL_PixelFormat*,Uint8*,Uint8*,Uint8*) pfSDL_GetRGB;
5536 -typedef void function(Uint32,SDL_PixelFormat*,Uint8*,Uint8*,Uint8*,Uint8*) pfSDL_GetRGBA;
5537 -typedef SDL_Surface* function(Uint32,int,int,int,Uint32,Uint32,Uint32,Uint32) pfSDL_CreateRGBSurface;
5538 -typedef SDL_Surface* function(void*,int,int,int,int,Uint32,Uint32,Uint32,Uint32) pfSDL_CreateRGBSurfaceFrom;
5539 -typedef void function(SDL_Surface*) pfSDL_FreeSurface;
5540 -typedef int function(SDL_Surface*) pfSDL_LockSurface;
5541 -typedef void function(SDL_Surface*) pfSDL_UnlockSurface;
5542 -typedef SDL_Surface* function(SDL_RWops*,int) pfSDL_LoadBMP_RW;
5543 -typedef int function(SDL_Surface*,SDL_RWops*,int) pfSDL_SaveBMP_RW;
5544 -typedef int function(SDL_Surface*,Uint32,Uint32) pfSDL_SetColorKey;
5545 -typedef int function(SDL_Surface*,Uint32,Uint8) pfSDL_SetAlpha;
5546 -typedef SDL_bool function(SDL_Surface*,SDL_Rect*) pfSDL_SetClipRect;
5547 -typedef void function(SDL_Surface*,SDL_Rect*) pfSDL_GetClipRect;
5548 -typedef SDL_Surface* function(SDL_Surface*,SDL_PixelFormat*,Uint32) pfSDL_ConvertSurface;
5549 -typedef int function(SDL_Surface*,SDL_Rect*,SDL_Surface*,SDL_Rect*) pfSDL_UpperBlit;
5550 -typedef int function(SDL_Surface*,SDL_Rect*,SDL_Surface*,SDL_Rect*) pfSDL_LowerBlit;
5551 -typedef int function(SDL_Surface*,SDL_Rect*,Uint32) pfSDL_FillRect;
5552 -typedef SDL_Surface* function(SDL_Surface*) pfSDL_DisplayFormat;
5553 -typedef SDL_Surface* function(SDL_Surface*) pfSDL_DisplayFormatAlpha;
5554 -typedef SDL_Overlay* function(int,int,Uint32,SDL_Surface*) pfSDL_CreateYUVOverlay;
5555 -typedef int function(SDL_Overlay*) pfSDL_LockYUVOverlay;
5556 -typedef void function(SDL_Overlay*) pfSDL_UnlockYUVOverlay;
5557 -typedef int function(SDL_Overlay*,SDL_Rect*) pfSDL_DisplayYUVOverlay;
5558 -typedef void function(SDL_Overlay*) pfSDL_FreeYUVOverlay;
5559 -typedef int function(char*) pfSDL_GL_LoadLibrary;
5560 -typedef void* function(char*) pfSDL_GL_GetProcAddress;
5561 -typedef int function(SDL_GLattr,int) pfSDL_GL_SetAttribute;
5562 -typedef int function(SDL_GLattr,int*) pfSDL_GL_GetAttribute;
5563 -typedef void function() pfSDL_GL_SwapBuffers;
5564 -typedef void function(int,SDL_Rect*) pfSDL_GL_UpdateRects;
5565 -typedef void function() pfSDL_GL_Lock;
5566 -typedef void function() pfSDL_GL_Unlock;
5567 -typedef void function(char*,char*) pfSDL_WM_SetCaption;
5568 -typedef void function(char**,char**) pfSDL_WM_GetCaption;
5569 -typedef void function(SDL_Surface*,Uint8*) pfSDL_WM_SetIcon;
5570 -typedef int function() pfSDL_WM_IconifyWindow;
5571 -typedef int function(SDL_Surface*) pfSDL_WM_ToggleFullScreen;
5572 -typedef SDL_GrabMode function(SDL_GrabMode) pfSDL_WM_GrabInput;
5573 -//typedef int function(SDL_Surface*,SDL_Rect*,SDL_Surface*,SDL_Rect*) pfSDL_SoftStretch;
5574 +//alias int function(SDL_Surface*,SDL_Rect*,SDL_Surface*,SDL_Rect*) pfSDL_SoftStretch;
5575 pfSDL_VideoInit SDL_VideoInit;
5576 pfSDL_VideoQuit SDL_VideoQuit;
5577 pfSDL_VideoDriverName SDL_VideoDriverName;
5578 @@ -329,4 +330,4 @@
5579 pfSDL_WM_SetIcon SDL_WM_SetIcon;
5580 pfSDL_WM_IconifyWindow SDL_WM_IconifyWindow;
5581 pfSDL_WM_ToggleFullScreen SDL_WM_ToggleFullScreen;
5582 -pfSDL_WM_GrabInput SDL_WM_GrabInput;
5583 \ No newline at end of file
5584 +pfSDL_WM_GrabInput SDL_WM_GrabInput;
5585 Index: DerelictSDL/derelict/sdl/thread.d
5586 ===================================================================
5587 --- DerelictSDL/derelict/sdl/thread.d (revision 318)
5588 +++ DerelictSDL/derelict/sdl/thread.d (working copy)
5589 @@ -42,13 +42,14 @@
5590 //==============================================================================
5591 // FUNCTIONS
5592 //==============================================================================
5593 -extern(C):
5594 +extern(C) {
5595 +alias SDL_Thread* function(int (*fm)(void*), void*) pfSDL_CreateThread;
5596 +alias Uint32 function() pfSDL_ThreadID;
5597 +alias Uint32 function(SDL_Thread*) pfSDL_GetThreadID;
5598 +alias void function(SDL_Thread*,int*) pfSDL_WaitThread;
5599 +alias void function(SDL_Thread*) pfSDL_KillThread;
5600 +}
5602 -typedef SDL_Thread* function(int (*fm)(void*), void*) pfSDL_CreateThread;
5603 -typedef Uint32 function() pfSDL_ThreadID;
5604 -typedef Uint32 function(SDL_Thread*) pfSDL_GetThreadID;
5605 -typedef void function(SDL_Thread*,int*) pfSDL_WaitThread;
5606 -typedef void function(SDL_Thread*) pfSDL_KillThread;
5607 pfSDL_CreateThread SDL_CreateThread;
5608 pfSDL_ThreadID SDL_ThreadID;
5609 pfSDL_GetThreadID SDL_GetThreadID;
5610 Index: DerelictSDL/derelict/sdl/rwops.d
5611 ===================================================================
5612 --- DerelictSDL/derelict/sdl/rwops.d (revision 318)
5613 +++ DerelictSDL/derelict/sdl/rwops.d (working copy)
5614 @@ -64,7 +64,7 @@
5615 int (*write)(SDL_RWops *context, void *ptr, int size, int num);
5616 int (*close)(SDL_RWops *context);
5617 }
5618 -
5619 +
5620 Uint32 type;
5621 union Hidden
5622 {
5623 @@ -133,33 +133,34 @@
5624 //==============================================================================
5625 // FUNCTIONS
5626 //==============================================================================
5627 -extern(C):
5628 +extern(C) {
5629 +alias SDL_RWops* function(char*,char*) pfSDL_RWFromFile;
5630 +alias SDL_RWops* function(FILE*,int) pfSDL_RWFromFP;
5631 +alias SDL_RWops* function(void*,int) pfSDL_RWFromMem;
5632 +alias SDL_RWops* function(void*,int) pfSDL_RWFromConstMem;
5633 +alias SDL_RWops* function() pfSDL_AllocRW;
5634 +alias void function(SDL_RWops*) pfSDL_FreeRW;
5636 -typedef SDL_RWops* function(char*,char*) pfSDL_RWFromFile;
5637 -typedef SDL_RWops* function(FILE*,int) pfSDL_RWFromFP;
5638 -typedef SDL_RWops* function(void*,int) pfSDL_RWFromMem;
5639 -typedef SDL_RWops* function(void*,int) pfSDL_RWFromConstMem;
5640 -typedef SDL_RWops* function() pfSDL_AllocRW;
5641 -typedef void function(SDL_RWops*) pfSDL_FreeRW;
5642 +alias Uint16 function(SDL_RWops*) pfSDL_ReadLE16;
5643 +alias Uint16 function(SDL_RWops*) pfSDL_ReadBE16;
5644 +alias Uint32 function(SDL_RWops*) pfSDL_ReadLE32;
5645 +alias Uint32 function(SDL_RWops*) pfSDL_ReadBE32;
5646 +alias Uint64 function(SDL_RWops*) pfSDL_ReadLE64;
5647 +alias Uint64 function(SDL_RWops*) pfSDL_ReadBE64;
5648 +alias Uint16 function(SDL_RWops*,Uint16) pfSDL_WriteLE16;
5649 +alias Uint16 function(SDL_RWops*,Uint16) pfSDL_WriteBE16;
5650 +alias Uint32 function(SDL_RWops*,Uint32) pfSDL_WriteLE32;
5651 +alias Uint32 function(SDL_RWops*,Uint32) pfSDL_WriteBE32;
5652 +alias Uint64 function(SDL_RWops*,Uint64) pfSDL_WriteLE64;
5653 +alias Uint64 function(SDL_RWops*,Uint64) pfSDL_WriteBE64;
5654 +}
5655 pfSDL_RWFromFile SDL_RWFromFile;
5656 pfSDL_RWFromFP SDL_RWFromFP;
5657 pfSDL_RWFromMem SDL_RWFromMem;
5658 pfSDL_RWFromConstMem SDL_RWFromConstMem;
5659 pfSDL_AllocRW SDL_AllocRW;
5660 pfSDL_FreeRW SDL_FreeRW;
5661 -
5662 -typedef Uint16 function(SDL_RWops*) pfSDL_ReadLE16;
5663 -typedef Uint16 function(SDL_RWops*) pfSDL_ReadBE16;
5664 -typedef Uint32 function(SDL_RWops*) pfSDL_ReadLE32;
5665 -typedef Uint32 function(SDL_RWops*) pfSDL_ReadBE32;
5666 -typedef Uint64 function(SDL_RWops*) pfSDL_ReadLE64;
5667 -typedef Uint64 function(SDL_RWops*) pfSDL_ReadBE64;
5668 -typedef Uint16 function(SDL_RWops*,Uint16) pfSDL_WriteLE16;
5669 -typedef Uint16 function(SDL_RWops*,Uint16) pfSDL_WriteBE16;
5670 -typedef Uint32 function(SDL_RWops*,Uint32) pfSDL_WriteLE32;
5671 -typedef Uint32 function(SDL_RWops*,Uint32) pfSDL_WriteBE32;
5672 -typedef Uint64 function(SDL_RWops*,Uint64) pfSDL_WriteLE64;
5673 -typedef Uint64 function(SDL_RWops*,Uint64) pfSDL_WriteBE64;
5674 +
5675 pfSDL_ReadLE16 SDL_ReadLE16;
5676 pfSDL_ReadBE16 SDL_ReadBE16;
5677 pfSDL_ReadLE32 SDL_ReadLE32;
5678 @@ -171,4 +172,4 @@
5679 pfSDL_WriteLE32 SDL_WriteLE32;
5680 pfSDL_WriteBE32 SDL_WriteBE32;
5681 pfSDL_WriteLE64 SDL_WriteLE64;
5682 -pfSDL_WriteBE64 SDL_WriteBE64;
5683 \ No newline at end of file
5684 +pfSDL_WriteBE64 SDL_WriteBE64;
5685 Index: DerelictSDL/derelict/sdl/active.d
5686 ===================================================================
5687 --- DerelictSDL/derelict/sdl/active.d (revision 318)
5688 +++ DerelictSDL/derelict/sdl/active.d (working copy)
5689 @@ -47,7 +47,7 @@
5690 // FUNCTIONS
5691 //==============================================================================
5693 -extern(C):
5694 -
5695 -typedef Uint8 function() pfSDL_GetAppState;
5696 -pfSDL_GetAppState SDL_GetAppState;
5697 \ No newline at end of file
5698 +extern(C) {
5699 +alias Uint8 function() pfSDL_GetAppState;
5700 +}
5701 +pfSDL_GetAppState SDL_GetAppState;
5702 Index: DerelictSDL/derelict/sdl/timer.d
5703 ===================================================================
5704 --- DerelictSDL/derelict/sdl/timer.d (revision 318)
5705 +++ DerelictSDL/derelict/sdl/timer.d (working copy)
5706 @@ -47,19 +47,20 @@
5707 typedef Uint32 function(Uint32) SDL_TimerCallback;
5708 typedef Uint32 function(Uint32,void*) SDL_NewTimerCallback;
5709 }
5710 -
5711 +
5712 alias void *SDL_TimerID;
5714 //==============================================================================
5715 // FUNCTIONS
5716 //==============================================================================
5717 -extern(C):
5718 +extern(C) {
5719 +alias Uint32 function() pfSDL_GetTicks;
5720 +alias void function(Uint32) pfSDL_Delay;
5721 +alias int function(Uint32,SDL_TimerCallback) pfSDL_SetTimer;
5722 +alias SDL_TimerID function(Uint32,SDL_NewTimerCallback,void*) pfSDL_AddTimer;
5723 +alias SDL_bool function(SDL_TimerID) pfSDL_RemoveTimer;
5724 +}
5726 -typedef Uint32 function() pfSDL_GetTicks;
5727 -typedef void function(Uint32) pfSDL_Delay;
5728 -typedef int function(Uint32,SDL_TimerCallback) pfSDL_SetTimer;
5729 -typedef SDL_TimerID function(Uint32,SDL_NewTimerCallback,void*) pfSDL_AddTimer;
5730 -typedef SDL_bool function(SDL_TimerID) pfSDL_RemoveTimer;
5731 pfSDL_GetTicks SDL_GetTicks;
5732 pfSDL_Delay SDL_Delay;
5733 pfSDL_SetTimer SDL_SetTimer;
5734 Index: DerelictSDL/derelict/sdl/loadso.d
5735 ===================================================================
5736 --- DerelictSDL/derelict/sdl/loadso.d (revision 318)
5737 +++ DerelictSDL/derelict/sdl/loadso.d (working copy)
5738 @@ -31,11 +31,12 @@
5739 */
5740 module derelict.sdl.loadso;
5742 -extern(C):
5743 +extern(C) {
5744 +alias void* function(char*) pfSDL_LoadObject;
5745 +alias void* function(void*,char*) pfSDL_LoadFunction;
5746 +alias void function(void*) pfSDL_UnloadObject;
5747 +}
5749 -typedef void* function(char*) pfSDL_LoadObject;
5750 -typedef void* function(void*,char*) pfSDL_LoadFunction;
5751 -typedef void function(void*) pfSDL_UnloadObject;
5752 pfSDL_LoadObject SDL_LoadObject;
5753 pfSDL_LoadFunction SDL_LoadFunction;
5754 -pfSDL_UnloadObject SDL_UnloadObject;
5755 \ No newline at end of file
5756 +pfSDL_UnloadObject SDL_UnloadObject;
5757 Index: DerelictSDL/derelict/sdl/sdl.d
5758 ===================================================================
5759 --- DerelictSDL/derelict/sdl/sdl.d (revision 318)
5760 +++ DerelictSDL/derelict/sdl/sdl.d (working copy)
5761 @@ -82,22 +82,19 @@
5762 //==============================================================================
5763 // Functions
5764 //==============================================================================
5765 -extern(C)
5766 -{
5767 -
5768 -typedef int function(Uint32) pfSDL_Init;
5769 -typedef int function(Uint32) pfSDL_InitSubSystem;
5770 -typedef int function(Uint32) pfSDL_QuitSubSystem;
5771 -typedef int function(Uint32) pfSDL_WasInit;
5772 -typedef void function() pfSDL_Quit;
5773 +extern(C) {
5774 +alias int function(Uint32) pfSDL_Init;
5775 +alias int function(Uint32) pfSDL_InitSubSystem;
5776 +alias int function(Uint32) pfSDL_QuitSubSystem;
5777 +alias int function(Uint32) pfSDL_WasInit;
5778 +alias void function() pfSDL_Quit;
5779 +}
5780 pfSDL_Init SDL_Init;
5781 pfSDL_InitSubSystem SDL_InitSubSystem;
5782 pfSDL_QuitSubSystem SDL_QuitSubSystem;
5783 pfSDL_WasInit SDL_WasInit;
5784 pfSDL_Quit SDL_Quit;
5786 -}
5787 -
5788 //==============================================================================
5789 // Loader
5790 //==============================================================================
5791 Index: DerelictSDL/derelict/sdl/syswm.d
5792 ===================================================================
5793 --- DerelictSDL/derelict/sdl/syswm.d (revision 318)
5794 +++ DerelictSDL/derelict/sdl/syswm.d (working copy)
5795 @@ -79,7 +79,8 @@
5796 //==============================================================================
5797 // FUNCTIONS
5798 //==============================================================================
5799 -extern(C):
5800 +extern(C) {
5801 +alias int function(SDL_SysWMinfo*) pfSDL_GetWMInfo;
5802 +}
5804 -typedef int function(SDL_SysWMinfo*) pfSDL_GetWMInfo;
5805 -pfSDL_GetWMInfo SDL_GetWMInfo;
5806 \ No newline at end of file
5807 +pfSDL_GetWMInfo SDL_GetWMInfo;
5808 Index: DerelictSDL/derelict/sdl/mouse.d
5809 ===================================================================
5810 --- DerelictSDL/derelict/sdl/mouse.d (revision 318)
5811 +++ DerelictSDL/derelict/sdl/mouse.d (working copy)
5812 @@ -72,16 +72,17 @@
5813 //==============================================================================
5814 // FUNCTIONS
5815 //==============================================================================
5816 -extern(C):
5817 +extern(C) {
5818 +alias Uint8 function(int*,int*) pfSDL_GetMouseState;
5819 +alias Uint8 function(int*,int*) pfSDL_GetRelativeMouseState;
5820 +alias void function(Uint16,Uint16) pfSDL_WarpMouse;
5821 +alias SDL_Cursor* function(Uint8*,Uint8*,int,int,int,int) pfSDL_CreateCursor;
5822 +alias void function(SDL_Cursor*) pfSDL_SetCursor;
5823 +alias SDL_Cursor* function() pfSDL_GetCursor;
5824 +alias void function(SDL_Cursor*) pfSDL_FreeCursor;
5825 +alias int function(int) pfSDL_ShowCursor;
5826 +}
5828 -typedef Uint8 function(int*,int*) pfSDL_GetMouseState;
5829 -typedef Uint8 function(int*,int*) pfSDL_GetRelativeMouseState;
5830 -typedef void function(Uint16,Uint16) pfSDL_WarpMouse;
5831 -typedef SDL_Cursor* function(Uint8*,Uint8*,int,int,int,int) pfSDL_CreateCursor;
5832 -typedef void function(SDL_Cursor*) pfSDL_SetCursor;
5833 -typedef SDL_Cursor* function() pfSDL_GetCursor;
5834 -typedef void function(SDL_Cursor*) pfSDL_FreeCursor;
5835 -typedef int function(int) pfSDL_ShowCursor;
5836 pfSDL_GetMouseState SDL_GetMouseState;
5837 pfSDL_GetRelativeMouseState SDL_GetRelativeMouseState;
5838 pfSDL_WarpMouse SDL_WarpMouse;
5839 Index: DerelictSDL/derelict/sdl/sdlversion.d
5840 ===================================================================
5841 --- DerelictSDL/derelict/sdl/sdlversion.d (revision 318)
5842 +++ DerelictSDL/derelict/sdl/sdlversion.d (working copy)
5843 @@ -76,7 +76,8 @@
5844 //==============================================================================
5845 // FUNCTIONS
5846 //==============================================================================
5847 -extern(C):
5848 +extern(C) {
5849 +alias SDL_version* function() pfSDL_Linked_Version;
5850 +}
5852 -typedef SDL_version* function() pfSDL_Linked_Version;
5853 -pfSDL_Linked_Version SDL_Linked_Version;
5854 \ No newline at end of file
5855 +pfSDL_Linked_Version SDL_Linked_Version;
5856 Index: DerelictSDL/derelict/sdl/error.d
5857 ===================================================================
5858 --- DerelictSDL/derelict/sdl/error.d (revision 318)
5859 +++ DerelictSDL/derelict/sdl/error.d (working copy)
5860 @@ -33,11 +33,12 @@
5862 private import derelict.sdl.types;
5864 -extern(C):
5865 +extern(C) {
5866 +alias void function(char*,...) pfSDL_SetError;
5867 +alias char* function() pfSDL_GetError;
5868 +alias void function() pfSDL_ClearError;
5869 +}
5871 -typedef void function(char*,...) pfSDL_SetError;
5872 -typedef char* function() pfSDL_GetError;
5873 -typedef void function() pfSDL_ClearError;
5874 pfSDL_SetError SDL_SetError;
5875 pfSDL_GetError SDL_GetError;
5876 -pfSDL_ClearError SDL_ClearError;
5877 \ No newline at end of file
5878 +pfSDL_ClearError SDL_ClearError;
5879 Index: DerelictSDLImage/derelict/sdl/image.d
5880 ===================================================================
5881 --- DerelictSDLImage/derelict/sdl/image.d (revision 318)
5882 +++ DerelictSDLImage/derelict/sdl/image.d (working copy)
5883 @@ -55,19 +55,27 @@
5884 //==============================================================================
5885 extern(C)
5886 {
5887 -typedef SDL_version* function() pfIMG_Linked_Version;
5888 +alias SDL_version* function() pfIMG_Linked_Version;
5889 +
5890 +alias SDL_Surface* function(SDL_RWops*, int, char*) pfIMG_LoadTyped_RW;
5891 +alias SDL_Surface* function(char*) pfIMG_Load;
5892 +alias SDL_Surface* function(SDL_RWops*, int) pfIMG_Load_RW;
5893 +alias int function(int) pfIMG_InvertAlpha;
5894 +
5895 +alias int function(SDL_RWops*) pfIsType;
5896 +
5897 +alias SDL_Surface* function(SDL_RWops*) pfLoadFunc;
5898 +
5899 +alias SDL_Surface* function(char**) pfIMG_ReadXPMFromArray;
5900 +}
5901 +
5902 pfIMG_Linked_Version IMG_Linked_Version;
5903 -
5904 -typedef SDL_Surface* function(SDL_RWops*, int, char*) pfIMG_LoadTyped_RW;
5905 -typedef SDL_Surface* function(char*) pfIMG_Load;
5906 -typedef SDL_Surface* function(SDL_RWops*, int) pfIMG_Load_RW;
5907 -typedef int function(int) pfIMG_InvertAlpha;
5908 +
5909 pfIMG_LoadTyped_RW IMG_LoadTyped_RW;
5910 pfIMG_Load IMG_Load;
5911 pfIMG_Load_RW IMG_Load_RW;
5912 pfIMG_InvertAlpha IMG_InvertAlpha;
5913 -
5914 -typedef int function(SDL_RWops*) pfIsType;
5915 +
5916 pfIsType IMG_isBMP;
5917 pfIsType IMG_isPNM;
5918 pfIsType IMG_isXPM;
5919 @@ -79,7 +87,6 @@
5920 pfIsType IMG_isPNG;
5921 pfIsType IMG_isLBM;
5923 -typedef SDL_Surface* function(SDL_RWops*) pfLoadFunc;
5924 pfLoadFunc IMG_LoadBMP_RW;
5925 pfLoadFunc IMG_LoadPNM_RW;
5926 pfLoadFunc IMG_LoadXPM_RW;
5927 @@ -91,12 +98,9 @@
5928 pfLoadFunc IMG_LoadPNG_RW;
5929 pfLoadFunc IMG_LoadTGA_RW;
5930 pfLoadFunc IMG_LoadLBM_RW;
5931 -
5932 -typedef SDL_Surface* function(char**) pfIMG_ReadXPMFromArray;
5933 +
5934 pfIMG_ReadXPMFromArray IMG_ReadXPMFromArray;
5936 -}
5937 -
5938 //==============================================================================
5939 // Macros
5940 //==============================================================================
5941 Index: DerelictGLU/derelict/opengl/glu.d
5942 ===================================================================
5943 --- DerelictGLU/derelict/opengl/glu.d (revision 318)
5944 +++ DerelictGLU/derelict/opengl/glu.d (working copy)
5945 @@ -116,171 +116,172 @@
5946 // CONSTANTS
5947 //==============================================================================
5948 enum : GLenum
5949 -{
5950 - GLU_FALSE = 0,
5951 - GLU_TRUE = 1,
5952 +{
5953 + // Boolean
5954 + GLU_FALSE = 0,
5955 + GLU_TRUE = 1,
5956 // StringName
5957 - GLU_VERSION = 100800,
5958 - GLU_EXTENSIONS = 100801,
5959 + GLU_VERSION = 100800,
5960 + GLU_EXTENSIONS = 100801,
5961 // ErrorCode
5962 - GLU_INVALID_ENUM = 100900,
5963 - GLU_INVALID_VALUE = 100901,
5964 - GLU_OUT_OF_MEMORY = 100902,
5965 - GLU_INVALID_OPERATION = 100904,
5966 + GLU_INVALID_ENUM = 100900,
5967 + GLU_INVALID_VALUE = 100901,
5968 + GLU_OUT_OF_MEMORY = 100902,
5969 + GLU_INVALID_OPERATION = 100904,
5970 // NurbsDisplay
5971 - GLU_OUTLINE_POLYGON = 100240,
5972 - GLU_OUTLINE_PATCH = 100241,
5973 + GLU_OUTLINE_POLYGON = 100240,
5974 + GLU_OUTLINE_PATCH = 100241,
5975 // NurbsCallback
5976 - GLU_NURBS_ERROR = 100103,
5977 - GLU_ERROR = 100103,
5978 - GLU_NURBS_BEGIN = 100164,
5979 - GLU_NURBS_BEGIN_EXT = 100164,
5980 - GLU_NURBS_VERTEX = 100165,
5981 - GLU_NURBS_VERTEX_EXT = 100165,
5982 - GLU_NURBS_NORMAL = 100166,
5983 - GLU_NURBS_NORMAL_EXT = 100166,
5984 - GLU_NURBS_COLOR = 100167,
5985 - GLU_NURBS_COLOR_EXT = 100167,
5986 - GLU_NURBS_TEXTURE_COORD = 100168,
5987 - GLU_NURBS_TEX_COORD_EXT = 100168,
5988 - GLU_NURBS_END = 100169,
5989 - GLU_NURBS_END_EXT = 100169,
5990 - GLU_NURBS_BEGIN_DATA = 100170,
5991 - GLU_NURBS_BEGIN_DATA_EXT = 100170,
5992 - GLU_NURBS_VERTEX_DATA = 100171,
5993 - GLU_NURBS_VERTEX_DATA_EXT = 100171,
5994 - GLU_NURBS_NORMAL_DATA = 100172,
5995 - GLU_NURBS_NORMAL_DATA_EXT = 100172,
5996 - GLU_NURBS_COLOR_DATA = 100173,
5997 - GLU_NURBS_COLOR_DATA_EXT = 100173,
5998 - GLU_NURBS_TEXTURE_COORD_DATA = 100174,
5999 - GLU_NURBS_TEX_COORD_DATA_EXT = 100174,
6000 - GLU_NURBS_END_DATA = 100175,
6001 - GLU_NURBS_END_DATA_EXT = 100175,
6002 + GLU_NURBS_ERROR = 100103,
6003 + GLU_ERROR = 100103,
6004 + GLU_NURBS_BEGIN = 100164,
6005 + GLU_NURBS_BEGIN_EXT = 100164,
6006 + GLU_NURBS_VERTEX = 100165,
6007 + GLU_NURBS_VERTEX_EXT = 100165,
6008 + GLU_NURBS_NORMAL = 100166,
6009 + GLU_NURBS_NORMAL_EXT = 100166,
6010 + GLU_NURBS_COLOR = 100167,
6011 + GLU_NURBS_COLOR_EXT = 100167,
6012 + GLU_NURBS_TEXTURE_COORD = 100168,
6013 + GLU_NURBS_TEX_COORD_EXT = 100168,
6014 + GLU_NURBS_END = 100169,
6015 + GLU_NURBS_END_EXT = 100169,
6016 + GLU_NURBS_BEGIN_DATA = 100170,
6017 + GLU_NURBS_BEGIN_DATA_EXT = 100170,
6018 + GLU_NURBS_VERTEX_DATA = 100171,
6019 + GLU_NURBS_VERTEX_DATA_EXT = 100171,
6020 + GLU_NURBS_NORMAL_DATA = 100172,
6021 + GLU_NURBS_NORMAL_DATA_EXT = 100172,
6022 + GLU_NURBS_COLOR_DATA = 100173,
6023 + GLU_NURBS_COLOR_DATA_EXT = 100173,
6024 + GLU_NURBS_TEXTURE_COORD_DATA = 100174,
6025 + GLU_NURBS_TEX_COORD_DATA_EXT = 100174,
6026 + GLU_NURBS_END_DATA = 100175,
6027 + GLU_NURBS_END_DATA_EXT = 100175,
6028 // NurbsError
6029 - GLU_NURBS_ERROR1 = 100251,
6030 - GLU_NURBS_ERROR2 = 100252,
6031 - GLU_NURBS_ERROR3 = 100253,
6032 - GLU_NURBS_ERROR4 = 100254,
6033 - GLU_NURBS_ERROR5 = 100255,
6034 - GLU_NURBS_ERROR6 = 100256,
6035 - GLU_NURBS_ERROR7 = 100257,
6036 - GLU_NURBS_ERROR8 = 100258,
6037 - GLU_NURBS_ERROR9 = 100259,
6038 - GLU_NURBS_ERROR10 = 100260,
6039 - GLU_NURBS_ERROR11 = 100261,
6040 - GLU_NURBS_ERROR12 = 100262,
6041 - GLU_NURBS_ERROR13 = 100263,
6042 - GLU_NURBS_ERROR14 = 100264,
6043 - GLU_NURBS_ERROR15 = 100265,
6044 - GLU_NURBS_ERROR16 = 100266,
6045 - GLU_NURBS_ERROR17 = 100267,
6046 - GLU_NURBS_ERROR18 = 100268,
6047 - GLU_NURBS_ERROR19 = 100269,
6048 - GLU_NURBS_ERROR20 = 100270,
6049 - GLU_NURBS_ERROR21 = 100271,
6050 - GLU_NURBS_ERROR22 = 100272,
6051 - GLU_NURBS_ERROR23 = 100273,
6052 - GLU_NURBS_ERROR24 = 100274,
6053 - GLU_NURBS_ERROR25 = 100275,
6054 - GLU_NURBS_ERROR26 = 100276,
6055 - GLU_NURBS_ERROR27 = 100277,
6056 - GLU_NURBS_ERROR28 = 100278,
6057 - GLU_NURBS_ERROR29 = 100279,
6058 - GLU_NURBS_ERROR30 = 100280,
6059 - GLU_NURBS_ERROR31 = 100281,
6060 - GLU_NURBS_ERROR32 = 100282,
6061 - GLU_NURBS_ERROR33 = 100283,
6062 - GLU_NURBS_ERROR34 = 100284,
6063 - GLU_NURBS_ERROR35 = 100285,
6064 - GLU_NURBS_ERROR36 = 100286,
6065 - GLU_NURBS_ERROR37 = 100287,
6066 + GLU_NURBS_ERROR1 = 100251,
6067 + GLU_NURBS_ERROR2 = 100252,
6068 + GLU_NURBS_ERROR3 = 100253,
6069 + GLU_NURBS_ERROR4 = 100254,
6070 + GLU_NURBS_ERROR5 = 100255,
6071 + GLU_NURBS_ERROR6 = 100256,
6072 + GLU_NURBS_ERROR7 = 100257,
6073 + GLU_NURBS_ERROR8 = 100258,
6074 + GLU_NURBS_ERROR9 = 100259,
6075 + GLU_NURBS_ERROR10 = 100260,
6076 + GLU_NURBS_ERROR11 = 100261,
6077 + GLU_NURBS_ERROR12 = 100262,
6078 + GLU_NURBS_ERROR13 = 100263,
6079 + GLU_NURBS_ERROR14 = 100264,
6080 + GLU_NURBS_ERROR15 = 100265,
6081 + GLU_NURBS_ERROR16 = 100266,
6082 + GLU_NURBS_ERROR17 = 100267,
6083 + GLU_NURBS_ERROR18 = 100268,
6084 + GLU_NURBS_ERROR19 = 100269,
6085 + GLU_NURBS_ERROR20 = 100270,
6086 + GLU_NURBS_ERROR21 = 100271,
6087 + GLU_NURBS_ERROR22 = 100272,
6088 + GLU_NURBS_ERROR23 = 100273,
6089 + GLU_NURBS_ERROR24 = 100274,
6090 + GLU_NURBS_ERROR25 = 100275,
6091 + GLU_NURBS_ERROR26 = 100276,
6092 + GLU_NURBS_ERROR27 = 100277,
6093 + GLU_NURBS_ERROR28 = 100278,
6094 + GLU_NURBS_ERROR29 = 100279,
6095 + GLU_NURBS_ERROR30 = 100280,
6096 + GLU_NURBS_ERROR31 = 100281,
6097 + GLU_NURBS_ERROR32 = 100282,
6098 + GLU_NURBS_ERROR33 = 100283,
6099 + GLU_NURBS_ERROR34 = 100284,
6100 + GLU_NURBS_ERROR35 = 100285,
6101 + GLU_NURBS_ERROR36 = 100286,
6102 + GLU_NURBS_ERROR37 = 100287,
6103 // NurbsProperty
6104 - GLU_AUTO_LOAD_MATRIX = 100200,
6105 - GLU_CULLING = 100201,
6106 - GLU_SAMPLING_TOLERANCE = 100203,
6107 - GLU_DISPLAY_MODE = 100204,
6108 - GLU_PARAMETRIC_TOLERANCE = 100202,
6109 - GLU_SAMPLING_METHOD = 100205,
6110 - GLU_U_STEP = 100206,
6111 - GLU_V_STEP = 100207,
6112 - GLU_NURBS_MODE = 100160,
6113 - GLU_NURBS_MODE_EXT = 100160,
6114 - GLU_NURBS_TESSELLATOR = 100161,
6115 - GLU_NURBS_TESSELLATOR_EXT = 100161,
6116 - GLU_NURBS_RENDERER = 100162,
6117 - GLU_NURBS_RENDERER_EXT = 100162,
6118 + GLU_AUTO_LOAD_MATRIX = 100200,
6119 + GLU_CULLING = 100201,
6120 + GLU_SAMPLING_TOLERANCE = 100203,
6121 + GLU_DISPLAY_MODE = 100204,
6122 + GLU_PARAMETRIC_TOLERANCE = 100202,
6123 + GLU_SAMPLING_METHOD = 100205,
6124 + GLU_U_STEP = 100206,
6125 + GLU_V_STEP = 100207,
6126 + GLU_NURBS_MODE = 100160,
6127 + GLU_NURBS_MODE_EXT = 100160,
6128 + GLU_NURBS_TESSELLATOR = 100161,
6129 + GLU_NURBS_TESSELLATOR_EXT = 100161,
6130 + GLU_NURBS_RENDERER = 100162,
6131 + GLU_NURBS_RENDERER_EXT = 100162,
6132 // NurbsSampling
6133 - GLU_OBJECT_PARAMETRIC_ERROR = 100208,
6134 - GLU_OBJECT_PARAMETRIC_ERROR_EXT = 100208,
6135 - GLU_OBJECT_PATH_LENGTH = 100209,
6136 - GLU_OBJECT_PATH_LENGTH_EXT = 100209,
6137 - GLU_PATH_LENGTH = 100215,
6138 - GLU_PARAMETRIC_ERROR = 100216,
6139 - GLU_DOMAIN_DISTANCE = 100217,
6140 + GLU_OBJECT_PARAMETRIC_ERROR = 100208,
6141 + GLU_OBJECT_PARAMETRIC_ERROR_EXT = 100208,
6142 + GLU_OBJECT_PATH_LENGTH = 100209,
6143 + GLU_OBJECT_PATH_LENGTH_EXT = 100209,
6144 + GLU_PATH_LENGTH = 100215,
6145 + GLU_PARAMETRIC_ERROR = 100216,
6146 + GLU_DOMAIN_DISTANCE = 100217,
6147 // NurbsTrim
6148 - GLU_MAP1_TRIM_2 = 100210,
6149 - GLU_MAP2_TRIM_3 = 100211,
6150 + GLU_MAP1_TRIM_2 = 100210,
6151 + GLU_MAP2_TRIM_3 = 100211,
6152 // QuadricDrawStyle
6153 - GLU_POINT = 100010,
6154 - GLU_LINE = 100011,
6155 - GLU_FILL = 100012,
6156 - GLU_SILHOUETTE = 100013,
6157 + GLU_POINT = 100010,
6158 + GLU_LINE = 100011,
6159 + GLU_FILL = 100012,
6160 + GLU_SILHOUETTE = 100013,
6161 // QuadricNormal
6162 - GLU_SMOOTH = 100000,
6163 - GLU_FLAT = 100001,
6164 - GLU_NONE = 100002,
6165 + GLU_SMOOTH = 100000,
6166 + GLU_FLAT = 100001,
6167 + GLU_NONE = 100002,
6168 // QuadricOrientation
6169 - GLU_OUTSIDE = 100020,
6170 - GLU_INSIDE = 100021,
6171 + GLU_OUTSIDE = 100020,
6172 + GLU_INSIDE = 100021,
6173 // TessCallback
6174 - GLU_TESS_BEGIN = 100100,
6175 - GLU_BEGIN = 100100,
6176 - GLU_TESS_VERTEX = 100101,
6177 - GLU_VERTEX = 100101,
6178 - GLU_TESS_END = 100102,
6179 - GLU_END = 100102,
6180 - GLU_TESS_ERROR = 100103,
6181 - GLU_TESS_EDGE_FLAG = 100104,
6182 - GLU_EDGE_FLAG = 100104,
6183 - GLU_TESS_COMBINE = 100105,
6184 - GLU_TESS_BEGIN_DATA = 100106,
6185 - GLU_TESS_VERTEX_DATA = 100107,
6186 - GLU_TESS_END_DATA = 100108,
6187 - GLU_TESS_ERROR_DATA = 100109,
6188 - GLU_TESS_EDGE_FLAG_DATA = 100110,
6189 - GLU_TESS_COMBINE_DATA = 100111,
6190 + GLU_TESS_BEGIN = 100100,
6191 + GLU_BEGIN = 100100,
6192 + GLU_TESS_VERTEX = 100101,
6193 + GLU_VERTEX = 100101,
6194 + GLU_TESS_END = 100102,
6195 + GLU_END = 100102,
6196 + GLU_TESS_ERROR = 100103,
6197 + GLU_TESS_EDGE_FLAG = 100104,
6198 + GLU_EDGE_FLAG = 100104,
6199 + GLU_TESS_COMBINE = 100105,
6200 + GLU_TESS_BEGIN_DATA = 100106,
6201 + GLU_TESS_VERTEX_DATA = 100107,
6202 + GLU_TESS_END_DATA = 100108,
6203 + GLU_TESS_ERROR_DATA = 100109,
6204 + GLU_TESS_EDGE_FLAG_DATA = 100110,
6205 + GLU_TESS_COMBINE_DATA = 100111,
6206 // TessContour
6207 - GLU_CW = 100120,
6208 - GLU_CCW = 100121,
6209 - GLU_INTERIOR = 100122,
6210 - GLU_EXTERIOR = 100123,
6211 - GLU_UNKNOWN = 100124,
6212 + GLU_CW = 100120,
6213 + GLU_CCW = 100121,
6214 + GLU_INTERIOR = 100122,
6215 + GLU_EXTERIOR = 100123,
6216 + GLU_UNKNOWN = 100124,
6217 // TessProperty
6218 - GLU_TESS_WINDING_RULE = 100140,
6219 - GLU_TESS_BOUNDARY_ONLY = 100141,
6220 - GLU_TESS_TOLERANCE = 100142,
6221 + GLU_TESS_WINDING_RULE = 100140,
6222 + GLU_TESS_BOUNDARY_ONLY = 100141,
6223 + GLU_TESS_TOLERANCE = 100142,
6224 // TessError
6225 - GLU_TESS_ERROR1 = 100151,
6226 - GLU_TESS_ERROR2 = 100152,
6227 - GLU_TESS_ERROR3 = 100153,
6228 - GLU_TESS_ERROR4 = 100154,
6229 - GLU_TESS_ERROR5 = 100155,
6230 - GLU_TESS_ERROR6 = 100156,
6231 - GLU_TESS_ERROR7 = 100157,
6232 - GLU_TESS_ERROR8 = 100158,
6233 - GLU_TESS_MISSING_BEGIN_POLYGON = 100151,
6234 - GLU_TESS_MISSING_BEGIN_COUNTER = 100152,
6235 - GLU_TESS_MISSING_END_POLYGON = 100153,
6236 - GLU_TESS_MISSING_END_COUNTER = 100154,
6237 - GLU_TESS_COORD_TOO_LARGE = 100155,
6238 - GLU_TESS_NEED_COMBINE_CALLBACK = 100156,
6239 + GLU_TESS_ERROR1 = 100151,
6240 + GLU_TESS_ERROR2 = 100152,
6241 + GLU_TESS_ERROR3 = 100153,
6242 + GLU_TESS_ERROR4 = 100154,
6243 + GLU_TESS_ERROR5 = 100155,
6244 + GLU_TESS_ERROR6 = 100156,
6245 + GLU_TESS_ERROR7 = 100157,
6246 + GLU_TESS_ERROR8 = 100158,
6247 + GLU_TESS_MISSING_BEGIN_POLYGON = 100151,
6248 + GLU_TESS_MISSING_BEGIN_COUNTER = 100152,
6249 + GLU_TESS_MISSING_END_POLYGON = 100153,
6250 + GLU_TESS_MISSING_END_COUNTER = 100154,
6251 + GLU_TESS_COORD_TOO_LARGE = 100155,
6252 + GLU_TESS_NEED_COMBINE_CALLBACK = 100156,
6253 // TessWinding
6254 - GLU_TESS_WINDING_ODD = 100130,
6255 - GLU_TESS_WINDING_NONZERO = 100131,
6256 - GLU_TESS_WINDING_POSITIVE = 100132,
6257 - GLU_TESS_WINDING_NEGATIVE = 100133,
6258 - GLU_TESS_WINDING_ABS_GEQ_TWO = 100134,
6259 + GLU_TESS_WINDING_ODD = 100130,
6260 + GLU_TESS_WINDING_NONZERO = 100131,
6261 + GLU_TESS_WINDING_POSITIVE = 100132,
6262 + GLU_TESS_WINDING_NEGATIVE = 100133,
6263 + GLU_TESS_WINDING_ABS_GEQ_TWO = 100134,
6264 }
6266 const GLdouble GLU_TESS_MAX_COORD = 1.0e150;
6267 @@ -292,78 +293,77 @@
6268 struct GLUquadric {}
6269 struct GLUtesselator {}
6271 -typedef GLUnurbs GLUnurbsObj;
6272 -typedef GLUquadric GLUquadricObj;
6273 -typedef GLUtesselator GLUtesselatorObj;
6274 -typedef GLUtesselator GLUtriangulatorObj;
6275 +alias GLUnurbs GLUnurbsObj;
6276 +alias GLUquadric GLUquadricObj;
6277 +alias GLUtesselator GLUtesselatorObj;
6278 +alias GLUtesselator GLUtriangulatorObj;
6280 -extern(System) typedef void function() _GLUfuncptr;
6281 +extern(System) alias void function() _GLUfuncptr;
6283 //==============================================================================
6284 // DLL FUNCTIONS
6285 //==============================================================================
6286 -extern(System):
6287 -
6288 -typedef GLint function(GLenum,GLint,GLsizei,GLenum,GLenum,GLint,GLint,GLint,void*) pfgluBuild1DMipmapLevels;
6289 -typedef GLint function(GLenum,GLint,GLsizei,GLenum,GLenum,void*) pfgluBuild1DMipmaps;
6290 -typedef GLint function(GLenum,GLint,GLsizei,GLsizei,GLenum,GLenum,GLint,GLint,GLint,void*) pfgluBuild2DMipmapLevels;
6291 -typedef GLint function(GLenum,GLint,GLsizei,GLsizei,GLenum,GLenum,void*) pfgluBuild2DMipmaps;
6292 -typedef GLint function(GLenum,GLint,GLsizei,GLsizei,GLsizei,GLenum,GLenum,GLint,GLint,GLint,void*) pfgluBuild3DMipmapLevels;
6293 -typedef GLint function(GLenum,GLint,GLsizei,GLsizei,GLsizei,GLenum,GLenum,void*) pfgluBuild3DMipmaps;
6294 -typedef GLboolean function(GLubyte*,GLubyte*) pfgluCheckExtension;
6295 -typedef GLubyte* function(GLenum) pfgluErrorString;
6296 -typedef GLubyte* function(GLenum) pfgluGetString;
6297 -typedef void function(GLUquadric*,GLdouble,GLdouble,GLdouble,GLint,GLint) pfgluCylinder;
6298 -typedef void function(GLUquadric*,GLdouble,GLdouble,GLint,GLint) pfgluDisk;
6299 -typedef void function(GLUquadric*,GLdouble,GLdouble,GLint,GLint,GLdouble,GLdouble) pfgluPartialDisk;
6300 -typedef void function(GLUquadric*,GLdouble,GLint,GLint) pfgluSphere;
6301 -typedef void function(GLUnurbs*) pfgluBeginCurve;
6302 -typedef void function(GLUtesselator*) pfgluBeginPolygon;
6303 -typedef void function(GLUnurbs*) pfgluBeginSurface;
6304 -typedef void function(GLUnurbs*) pfgluBeginTrim;
6305 -typedef void function(GLUnurbs*) pfgluEndCurve;
6306 -typedef void function(GLUtesselator*) pfgluEndPolygon;
6307 -typedef void function(GLUnurbs*) pfgluEndSurface;
6308 -typedef void function(GLUnurbs*) pfgluEndTrim;
6309 -typedef void function(GLUnurbs*) pfgluDeleteNurbsRenderer;
6310 -typedef void function(GLUquadric*) pfgluDeleteQuadric;
6311 -typedef void function(GLUtesselator*) pfgluDeleteTess;
6312 -typedef void function(GLUnurbs*,GLenum,GLfloat*) pfgluGetNurbsProperty;
6313 -typedef void function(GLUtesselator*,GLenum,GLdouble*) pfgluGetTessProperty;
6314 -typedef void function(GLUnurbs*,GLfloat*,GLfloat*,GLint*) pfgluLoadSamplingMatrices;
6315 -typedef GLUnurbs* function() pfgluNewNurbsRenderer;
6316 -typedef GLUquadric* function() pfgluNewQuadric;
6317 -typedef GLUtesselator* function() pfgluNewTess;
6318 -typedef void function(GLUtesselator*,GLenum) pfgluNextContour;
6319 -typedef void function(GLUnurbs*,GLenum,_GLUfuncptr) pfgluNurbsCallback;
6320 -typedef void function(GLUnurbs*,GLvoid*) pfgluNurbsCallbackData;
6321 -typedef void function(GLUnurbs*,GLvoid*) pfgluNurbsCallbackDataEXT;
6322 -typedef void function(GLUnurbs*,GLint,GLfloat*,GLint,GLfloat*,GLint,GLenum) pfgluNurbsCurve;
6323 -typedef void function(GLUnurbs*,GLenum,GLfloat) pfgluNurbsProperty;
6324 -typedef void function(GLUnurbs*,GLint,GLfloat*,GLint,GLfloat*,GLint,GLint,GLfloat*,GLint,GLint,GLenum) pfgluNurbsSurface;
6325 -typedef void function(GLUnurbs*,GLint,GLfloat*,GLint,GLenum) pfgluPwlCurve;
6326 -typedef void function(GLUquadric*,GLenum,_GLUfuncptr) pfgluQuadricCallback;
6327 -typedef void function(GLUquadric*,GLenum) pfgluQuadricDrawStyle;
6328 -typedef void function(GLUquadric*,GLenum) pfgluQuadricNormals;
6329 -typedef void function(GLUquadric*,GLenum) pfgluQuadricOrientation;
6330 -typedef void function(GLUquadric*,GLboolean) pfgluQuadricTexture;
6331 -typedef void function(GLUtesselator*) pfgluTessBeginContour;
6332 -typedef void function(GLUtesselator*,GLvoid*) pfgluTessBeginPolygon;
6333 -typedef void function(GLUtesselator*,GLenum,_GLUfuncptr) pfgluTessCallback;
6334 -typedef void function(GLUtesselator*) pfgluTessEndContour;
6335 -typedef void function(GLUtesselator*) pfgluTessEndPolygon;
6336 -typedef void function(GLUtesselator*,GLdouble,GLdouble,GLdouble) pfgluTessNormal;
6337 -typedef void function(GLUtesselator*,GLenum,GLdouble) pfgluTessProperty;
6338 -typedef void function(GLUtesselator*,GLdouble*,GLvoid*) pfgluTessVertex;
6339 -typedef void function(GLdouble,GLdouble,GLdouble,GLdouble,GLdouble,GLdouble,GLdouble,GLdouble,GLdouble) pfgluLookAt;
6340 -typedef void function(GLdouble,GLdouble,GLdouble,GLdouble) pfgluOrtho2D;
6341 -typedef void function(GLdouble,GLdouble,GLdouble,GLdouble) pfgluPerspective;
6342 -typedef void function(GLdouble,GLdouble,GLdouble,GLdouble,GLint*) pfgluPickMatrix;
6343 -typedef GLint function(GLdouble,GLdouble,GLdouble,GLdouble*,GLdouble*,GLint*,GLdouble*,GLdouble*,GLdouble*) pfgluProject;
6344 -typedef GLint function(GLenum,GLsizei,GLsizei,GLenum,void*,GLsizei,GLsizei,GLenum,GLvoid*) pfgluScaleImage;
6345 -typedef GLint function(GLdouble,GLdouble,GLdouble,GLdouble*,GLdouble*,GLint*,GLdouble*,GLdouble*,GLdouble*) pfgluUnProject;
6346 -typedef GLint function(GLdouble,GLdouble,GLdouble,GLdouble,GLdouble*,GLdouble*,GLint*,GLdouble,GLdouble,GLdouble*,GLdouble*,GLdouble*,GLdouble*) pfgluUnProject4;
6347 -
6348 +extern(System) {
6349 +alias GLint function(GLenum,GLint,GLsizei,GLenum,GLenum,GLint,GLint,GLint,void*) pfgluBuild1DMipmapLevels;
6350 +alias GLint function(GLenum,GLint,GLsizei,GLenum,GLenum,void*) pfgluBuild1DMipmaps;
6351 +alias GLint function(GLenum,GLint,GLsizei,GLsizei,GLenum,GLenum,GLint,GLint,GLint,void*) pfgluBuild2DMipmapLevels;
6352 +alias GLint function(GLenum,GLint,GLsizei,GLsizei,GLenum,GLenum,void*) pfgluBuild2DMipmaps;
6353 +alias GLint function(GLenum,GLint,GLsizei,GLsizei,GLsizei,GLenum,GLenum,GLint,GLint,GLint,void*) pfgluBuild3DMipmapLevels;
6354 +alias GLint function(GLenum,GLint,GLsizei,GLsizei,GLsizei,GLenum,GLenum,void*) pfgluBuild3DMipmaps;
6355 +alias GLboolean function(GLubyte*,GLubyte*) pfgluCheckExtension;
6356 +alias GLubyte* function(GLenum) pfgluErrorString;
6357 +alias GLubyte* function(GLenum) pfgluGetString;
6358 +alias void function(GLUquadric*,GLdouble,GLdouble,GLdouble,GLint,GLint) pfgluCylinder;
6359 +alias void function(GLUquadric*,GLdouble,GLdouble,GLint,GLint) pfgluDisk;
6360 +alias void function(GLUquadric*,GLdouble,GLdouble,GLint,GLint,GLdouble,GLdouble) pfgluPartialDisk;
6361 +alias void function(GLUquadric*,GLdouble,GLint,GLint) pfgluSphere;
6362 +alias void function(GLUnurbs*) pfgluBeginCurve;
6363 +alias void function(GLUtesselator*) pfgluBeginPolygon;
6364 +alias void function(GLUnurbs*) pfgluBeginSurface;
6365 +alias void function(GLUnurbs*) pfgluBeginTrim;
6366 +alias void function(GLUnurbs*) pfgluEndCurve;
6367 +alias void function(GLUtesselator*) pfgluEndPolygon;
6368 +alias void function(GLUnurbs*) pfgluEndSurface;
6369 +alias void function(GLUnurbs*) pfgluEndTrim;
6370 +alias void function(GLUnurbs*) pfgluDeleteNurbsRenderer;
6371 +alias void function(GLUquadric*) pfgluDeleteQuadric;
6372 +alias void function(GLUtesselator*) pfgluDeleteTess;
6373 +alias void function(GLUnurbs*,GLenum,GLfloat*) pfgluGetNurbsProperty;
6374 +alias void function(GLUtesselator*,GLenum,GLdouble*) pfgluGetTessProperty;
6375 +alias void function(GLUnurbs*,GLfloat*,GLfloat*,GLint*) pfgluLoadSamplingMatrices;
6376 +alias GLUnurbs* function() pfgluNewNurbsRenderer;
6377 +alias GLUquadric* function() pfgluNewQuadric;
6378 +alias GLUtesselator* function() pfgluNewTess;
6379 +alias void function(GLUtesselator*,GLenum) pfgluNextContour;
6380 +alias void function(GLUnurbs*,GLenum,_GLUfuncptr) pfgluNurbsCallback;
6381 +alias void function(GLUnurbs*,GLvoid*) pfgluNurbsCallbackData;
6382 +alias void function(GLUnurbs*,GLvoid*) pfgluNurbsCallbackDataEXT;
6383 +alias void function(GLUnurbs*,GLint,GLfloat*,GLint,GLfloat*,GLint,GLenum) pfgluNurbsCurve;
6384 +alias void function(GLUnurbs*,GLenum,GLfloat) pfgluNurbsProperty;
6385 +alias void function(GLUnurbs*,GLint,GLfloat*,GLint,GLfloat*,GLint,GLint,GLfloat*,GLint,GLint,GLenum) pfgluNurbsSurface;
6386 +alias void function(GLUnurbs*,GLint,GLfloat*,GLint,GLenum) pfgluPwlCurve;
6387 +alias void function(GLUquadric*,GLenum,_GLUfuncptr) pfgluQuadricCallback;
6388 +alias void function(GLUquadric*,GLenum) pfgluQuadricDrawStyle;
6389 +alias void function(GLUquadric*,GLenum) pfgluQuadricNormals;
6390 +alias void function(GLUquadric*,GLenum) pfgluQuadricOrientation;
6391 +alias void function(GLUquadric*,GLboolean) pfgluQuadricTexture;
6392 +alias void function(GLUtesselator*) pfgluTessBeginContour;
6393 +alias void function(GLUtesselator*,GLvoid*) pfgluTessBeginPolygon;
6394 +alias void function(GLUtesselator*,GLenum,_GLUfuncptr) pfgluTessCallback;
6395 +alias void function(GLUtesselator*) pfgluTessEndContour;
6396 +alias void function(GLUtesselator*) pfgluTessEndPolygon;
6397 +alias void function(GLUtesselator*,GLdouble,GLdouble,GLdouble) pfgluTessNormal;
6398 +alias void function(GLUtesselator*,GLenum,GLdouble) pfgluTessProperty;
6399 +alias void function(GLUtesselator*,GLdouble*,GLvoid*) pfgluTessVertex;
6400 +alias void function(GLdouble,GLdouble,GLdouble,GLdouble,GLdouble,GLdouble,GLdouble,GLdouble,GLdouble) pfgluLookAt;
6401 +alias void function(GLdouble,GLdouble,GLdouble,GLdouble) pfgluOrtho2D;
6402 +alias void function(GLdouble,GLdouble,GLdouble,GLdouble) pfgluPerspective;
6403 +alias void function(GLdouble,GLdouble,GLdouble,GLdouble,GLint*) pfgluPickMatrix;
6404 +alias GLint function(GLdouble,GLdouble,GLdouble,GLdouble*,GLdouble*,GLint*,GLdouble*,GLdouble*,GLdouble*) pfgluProject;
6405 +alias GLint function(GLenum,GLsizei,GLsizei,GLenum,void*,GLsizei,GLsizei,GLenum,GLvoid*) pfgluScaleImage;
6406 +alias GLint function(GLdouble,GLdouble,GLdouble,GLdouble*,GLdouble*,GLint*,GLdouble*,GLdouble*,GLdouble*) pfgluUnProject;
6407 +alias GLint function(GLdouble,GLdouble,GLdouble,GLdouble,GLdouble*,GLdouble*,GLint*,GLdouble,GLdouble,GLdouble*,GLdouble*,GLdouble*,GLdouble*) pfgluUnProject4;
6408 +}
6409 //pfgluBuild1DMipmapLevels gluBuild1DMipmapLevels;
6410 pfgluBuild1DMipmaps gluBuild1DMipmaps;
6411 //pfgluBuild2DMipmapLevels gluBuild2DMipmapLevels;
6412 Index: DerelictSDLMixer/derelict/sdl/mixer.d
6413 ===================================================================
6414 --- DerelictSDLMixer/derelict/sdl/mixer.d (revision 318)
6415 +++ DerelictSDLMixer/derelict/sdl/mixer.d (working copy)
6416 @@ -83,7 +83,7 @@
6417 };
6419 struct _Mix_Music {}
6420 -typedef _Mix_Music Mix_Music;
6421 +alias _Mix_Music Mix_Music;
6423 enum
6424 {
6425 @@ -104,8 +104,8 @@
6427 extern(C)
6428 {
6429 -typedef void function(int chan, void* stream, int len, void* udata) Mix_EffectFunc_t;
6430 -typedef void function(int chan, void* udata) Mix_EffectDone_t;
6431 +alias void function(int chan, void* stream, int len, void* udata) Mix_EffectFunc_t;
6432 +alias void function(int chan, void* udata) Mix_EffectDone_t;
6433 }
6435 //==============================================================================
6436 @@ -139,71 +139,71 @@
6437 //==============================================================================
6438 // Functions
6439 //==============================================================================
6440 -extern (C)
6441 -{
6442 -typedef SDL_version* function() pfMix_Linked_Version;
6443 -typedef int function (int frequency, Uint16 format, int channels, int chunksize) pfMix_OpenAudio;
6444 -typedef int function(int numchans) pfMix_AllocateChannels;
6445 -typedef int function(int* frequency, Uint16* format, int* channels) pfMix_QuerySpec;
6446 -typedef Mix_Chunk* function(SDL_RWops* src, int freesrc) pfMix_LoadWAV_RW;
6447 -typedef Mix_Music* function(char* file) pfMix_LoadMUS;
6448 -typedef Mix_Music* function(SDL_RWops* rw) pfMix_LoadMUS_RW;
6449 -typedef Mix_Chunk* function(Uint8* mem) pfMix_QuickLoad_WAV;
6450 -typedef Mix_Chunk* function(Uint8* mem, Uint32 len) pfMix_QuickLoad_RAW;
6451 -typedef void function(Mix_Chunk* chunk) pfMix_FreeChunk;
6452 -typedef void function(Mix_Music* music) pfMix_FreeMusic;
6453 -typedef Mix_MusicType function(Mix_Music* music) pfMix_GetMusicType;
6454 -typedef void function(void (*mix_func)(void* udata, Uint8* stream, int len), void* arg) pfMix_SetPostMix;
6455 -typedef void function(void (*mix_func)(void* udata, Uint8* stream, int len), void* arg) pfMix_HookMusic;
6456 -typedef void function(void (*music_finished)()) pfMix_HookMusicFinished;
6457 -typedef void* function() pfMix_GetMusicHookData;
6458 -typedef void function(void (*channel_finished)(int channel)) pfMix_ChannelFinished;
6459 -typedef int function(int chan, Mix_EffectFunc_t f, Mix_EffectDone_t d, void* arg) pfMix_RegisterEffect;
6460 -typedef int function(int channel, Mix_EffectFunc_t f) pfMix_UnregisterEffect;
6461 -typedef int function(int channel) pfMix_UnregisterAllEffects;
6462 -typedef int function(int channel, Uint8 left, Uint8 right) pfMix_SetPanning;
6463 -typedef int function(int channel, Sint16 angle, Uint8 distance) pfMix_SetPosition;
6464 -typedef int function(int channel, Uint8 distance) pfMix_SetDistance;
6465 -typedef int function(int channel, int flip) pfMix_SetReverseStereo;
6466 -typedef int function(int num) pfMix_ReserveChannels;
6467 -typedef int function(int which, int tag) pfMix_GroupChannel;
6468 -typedef int function(int from, int to, int tag) pfMix_GroupChannels;
6469 -typedef int function(int tag) pfMix_GroupAvailable;
6470 -typedef int function(int tag) pfMix_GroupCount;
6471 -typedef int function(int tag) pfMix_GroupOldest;
6472 -typedef int function(int tag) pfMix_GroupNewer;
6473 -typedef int function(int channel, Mix_Chunk* chunk, int loops, int ticks) pfMix_PlayChannelTimed;
6474 -typedef int function(Mix_Music* music, int loops) pfMix_PlayMusic;
6475 -typedef int function(Mix_Music* music, int loops, int ms) pfMix_FadeInMusic;
6476 -typedef int function(Mix_Music* music, int loops, int ms, double position) pfMix_FadeInMusicPos;
6477 -typedef int function(int channel, Mix_Chunk* chunk, int loops, int ms, int ticks) pfMix_FadeInChannelTimed;
6478 -typedef int function(int channel, int volume) pfMix_Volume;
6479 -typedef int function(Mix_Chunk* chunk, int volume) pfMix_VolumeChunk;
6480 -typedef int function(int volume) pfMix_VolumeMusic;
6481 -typedef int function(int channel) pfMix_HaltChannel;
6482 -typedef int function(int tag) pfMix_HaltGroup;
6483 -typedef int function() pfMix_HaltMusic;
6484 -typedef int function(int channel, int ticks) pfMix_ExpireChannel;
6485 -typedef int function(int which, int ms) pfMix_FadeOutChannel;
6486 -typedef int function(int tag, int ms) pfMix_FadeOutGroup;
6487 -typedef int function(int ms) pfMix_FadeOutMusic;
6488 -typedef Mix_Fading function() pfMix_FadingMusic;
6489 -typedef Mix_Fading function(int which) pfMix_FadingChannel;
6490 -typedef void function(int channel) pfMix_Pause;
6491 -typedef void function(int channel) pfMix_Resume;
6492 -typedef int function(int channel) pfMix_Paused;
6493 -typedef void function() pfMix_PauseMusic;
6494 -typedef void function() pfMix_ResumeMusic;
6495 -typedef void function() pfMix_RewindMusic;
6496 -typedef int function() pfMix_PausedMusic;
6497 -typedef int function(double position) pfMix_SetMusicPosition;
6498 -typedef int function(int channel) pfMix_Playing;
6499 -typedef int function() pfMix_PlayingMusic;
6500 -typedef int function(char* command) pfMix_SetMusicCMD;
6501 -typedef int function(int value) pfMix_SetSynchroValue;
6502 -typedef int function() pfMix_GetSynchroValue;
6503 -typedef Mix_Chunk* function(int channel) pfMix_GetChunk;
6504 -typedef void function() pfMix_CloseAudio;
6505 +extern (C) {
6506 +alias SDL_version* function() pfMix_Linked_Version;
6507 +alias int function (int frequency, Uint16 format, int channels, int chunksize) pfMix_OpenAudio;
6508 +alias int function(int numchans) pfMix_AllocateChannels;
6509 +alias int function(int* frequency, Uint16* format, int* channels) pfMix_QuerySpec;
6510 +alias Mix_Chunk* function(SDL_RWops* src, int freesrc) pfMix_LoadWAV_RW;
6511 +alias Mix_Music* function(char* file) pfMix_LoadMUS;
6512 +alias Mix_Music* function(SDL_RWops* rw) pfMix_LoadMUS_RW;
6513 +alias Mix_Chunk* function(Uint8* mem) pfMix_QuickLoad_WAV;
6514 +alias Mix_Chunk* function(Uint8* mem, Uint32 len) pfMix_QuickLoad_RAW;
6515 +alias void function(Mix_Chunk* chunk) pfMix_FreeChunk;
6516 +alias void function(Mix_Music* music) pfMix_FreeMusic;
6517 +alias Mix_MusicType function(Mix_Music* music) pfMix_GetMusicType;
6518 +alias void function(void (*mix_func)(void* udata, Uint8* stream, int len), void* arg) pfMix_SetPostMix;
6519 +alias void function(void (*mix_func)(void* udata, Uint8* stream, int len), void* arg) pfMix_HookMusic;
6520 +alias void function(void (*music_finished)()) pfMix_HookMusicFinished;
6521 +alias void* function() pfMix_GetMusicHookData;
6522 +alias void function(void (*channel_finished)(int channel)) pfMix_ChannelFinished;
6523 +alias int function(int chan, Mix_EffectFunc_t f, Mix_EffectDone_t d, void* arg) pfMix_RegisterEffect;
6524 +alias int function(int channel, Mix_EffectFunc_t f) pfMix_UnregisterEffect;
6525 +alias int function(int channel) pfMix_UnregisterAllEffects;
6526 +alias int function(int channel, Uint8 left, Uint8 right) pfMix_SetPanning;
6527 +alias int function(int channel, Sint16 angle, Uint8 distance) pfMix_SetPosition;
6528 +alias int function(int channel, Uint8 distance) pfMix_SetDistance;
6529 +alias int function(int channel, int flip) pfMix_SetReverseStereo;
6530 +alias int function(int num) pfMix_ReserveChannels;
6531 +alias int function(int which, int tag) pfMix_GroupChannel;
6532 +alias int function(int from, int to, int tag) pfMix_GroupChannels;
6533 +alias int function(int tag) pfMix_GroupAvailable;
6534 +alias int function(int tag) pfMix_GroupCount;
6535 +alias int function(int tag) pfMix_GroupOldest;
6536 +alias int function(int tag) pfMix_GroupNewer;
6537 +alias int function(int channel, Mix_Chunk* chunk, int loops, int ticks) pfMix_PlayChannelTimed;
6538 +alias int function(Mix_Music* music, int loops) pfMix_PlayMusic;
6539 +alias int function(Mix_Music* music, int loops, int ms) pfMix_FadeInMusic;
6540 +alias int function(Mix_Music* music, int loops, int ms, double position) pfMix_FadeInMusicPos;
6541 +alias int function(int channel, Mix_Chunk* chunk, int loops, int ms, int ticks) pfMix_FadeInChannelTimed;
6542 +alias int function(int channel, int volume) pfMix_Volume;
6543 +alias int function(Mix_Chunk* chunk, int volume) pfMix_VolumeChunk;
6544 +alias int function(int volume) pfMix_VolumeMusic;
6545 +alias int function(int channel) pfMix_HaltChannel;
6546 +alias int function(int tag) pfMix_HaltGroup;
6547 +alias int function() pfMix_HaltMusic;
6548 +alias int function(int channel, int ticks) pfMix_ExpireChannel;
6549 +alias int function(int which, int ms) pfMix_FadeOutChannel;
6550 +alias int function(int tag, int ms) pfMix_FadeOutGroup;
6551 +alias int function(int ms) pfMix_FadeOutMusic;
6552 +alias Mix_Fading function() pfMix_FadingMusic;
6553 +alias Mix_Fading function(int which) pfMix_FadingChannel;
6554 +alias void function(int channel) pfMix_Pause;
6555 +alias void function(int channel) pfMix_Resume;
6556 +alias int function(int channel) pfMix_Paused;
6557 +alias void function() pfMix_PauseMusic;
6558 +alias void function() pfMix_ResumeMusic;
6559 +alias void function() pfMix_RewindMusic;
6560 +alias int function() pfMix_PausedMusic;
6561 +alias int function(double position) pfMix_SetMusicPosition;
6562 +alias int function(int channel) pfMix_Playing;
6563 +alias int function() pfMix_PlayingMusic;
6564 +alias int function(char* command) pfMix_SetMusicCMD;
6565 +alias int function(int value) pfMix_SetSynchroValue;
6566 +alias int function() pfMix_GetSynchroValue;
6567 +alias Mix_Chunk* function(int channel) pfMix_GetChunk;
6568 +alias void function() pfMix_CloseAudio;
6569 +}
6571 pfMix_Linked_Version Mix_Linked_Version;
6572 pfMix_OpenAudio Mix_OpenAudio;
6573 @@ -268,8 +268,8 @@
6574 pfMix_GetSynchroValue Mix_GetSynchroValue;
6575 pfMix_GetChunk Mix_GetChunk;
6576 pfMix_CloseAudio Mix_CloseAudio;
6577 -}
6579 +
6580 //==============================================================================
6581 // Loader
6582 //==============================================================================
6583 Index: DerelictILU/derelict/devil/ilufuncs.d
6584 ===================================================================
6585 --- DerelictILU/derelict/devil/ilufuncs.d (revision 318)
6586 +++ DerelictILU/derelict/devil/ilufuncs.d (working copy)
6587 @@ -99,53 +99,53 @@
6588 );
6589 }
6591 -extern(System):
6592 +extern(System) {
6593 +alias ILboolean function() pfiluAlienify;
6594 +alias ILboolean function(ILuint Iter) pfiluBlurAvg;
6595 +alias ILboolean function(ILuint Iter) pfiluBlurGaussian;
6596 +alias ILboolean function() pfiluBuildMipmaps;
6597 +alias ILuint function() pfiluColoursUsed;
6598 +alias ILboolean function(ILuint Comp) pfiluCompareImage;
6599 +alias ILboolean function(ILfloat Contrast) pfiluContrast;
6600 +alias ILboolean function(ILuint XOff, ILuint YOff, ILuint ZOff, ILuint Width, ILuint Height, ILuint Depth) pfiluCrop;
6601 +alias ILvoid function(ILuint Id) pfiluDeleteImage;
6602 +alias ILboolean function() pfiluEdgeDetectE;
6603 +alias ILboolean function() pfiluEdgeDetectP;
6604 +alias ILboolean function() pfiluEdgeDetectS;
6605 +alias ILboolean function() pfiluEmboss;
6606 +alias ILboolean function(ILuint Width, ILuint Height, ILuint Depth) pfiluEnlargeCanvas;
6607 +alias ILboolean function(ILfloat XDim, ILfloat YDim, ILfloat ZDim) pfiluEnlargeImage;
6608 +alias ILboolean function() pfiluEqualize;
6609 +alias ILstring function(ILenum Error) pfiluErrorString;
6610 +alias ILboolean function() pfiluFlipImage;
6611 +alias ILboolean function(ILfloat Gamma) pfiluGammaCorrect;
6612 +alias ILuint function() pfiluGenImage;
6613 +alias ILvoid function(ILinfo *Info) pfiluGetImageInfo;
6614 +alias ILint function(ILenum Mode) pfiluGetInteger;
6615 +alias ILvoid function(ILenum Mode, ILint *Param) pfiluGetIntegerv;
6616 +alias ILstring function(ILenum StringName) pfiluGetString;
6617 +alias ILvoid function(ILenum PName, ILenum Param) pfiluImageParameter;
6618 +alias ILvoid function() pfiluInit;
6619 +alias ILboolean function() pfiluInvertAlpha;
6620 +alias ILuint function( ILstring FileName) pfiluLoadImage;
6621 +alias ILboolean function() pfiluMirror;
6622 +alias ILboolean function() pfiluNegative;
6623 +alias ILboolean function(ILclampf Tolerance) pfiluNoisify;
6624 +alias ILboolean function(ILuint PixSize) pfiluPixelize;
6625 +alias ILvoid function(ILpointf *Points, ILuint n) pfiluRegionfv;
6626 +alias ILvoid function(ILpointi *Points, ILuint n) pfiluRegioniv;
6627 +alias ILboolean function(ILubyte Red, ILubyte Green, ILubyte Blue, ILfloat Tolerance) pfiluReplaceColour;
6628 +alias ILboolean function(ILfloat Angle) pfiluRotate;
6629 +alias ILboolean function(ILfloat x, ILfloat y, ILfloat z, ILfloat Angle) pfiluRotate3D;
6630 +alias ILboolean function(ILfloat Saturation) pfiluSaturate1f;
6631 +alias ILboolean function(ILfloat r, ILfloat g, ILfloat b, ILfloat Saturation) pfiluSaturate4f;
6632 +alias ILboolean function(ILuint Width, ILuint Height, ILuint Depth) pfiluScale;
6633 +alias ILboolean function(ILfloat r, ILfloat g, ILfloat b) pfiluScaleColours;
6634 +alias ILboolean function(ILfloat Factor, ILuint Iter) pfiluSharpen;
6635 +alias ILboolean function() pfiluSwapColours;
6636 +alias ILboolean function(ILfloat Angle) pfiluWave;
6637 +}
6639 -typedef ILboolean function() pfiluAlienify;
6640 -typedef ILboolean function(ILuint Iter) pfiluBlurAvg;
6641 -typedef ILboolean function(ILuint Iter) pfiluBlurGaussian;
6642 -typedef ILboolean function() pfiluBuildMipmaps;
6643 -typedef ILuint function() pfiluColoursUsed;
6644 -typedef ILboolean function(ILuint Comp) pfiluCompareImage;
6645 -typedef ILboolean function(ILfloat Contrast) pfiluContrast;
6646 -typedef ILboolean function(ILuint XOff, ILuint YOff, ILuint ZOff, ILuint Width, ILuint Height, ILuint Depth) pfiluCrop;
6647 -typedef ILvoid function(ILuint Id) pfiluDeleteImage;
6648 -typedef ILboolean function() pfiluEdgeDetectE;
6649 -typedef ILboolean function() pfiluEdgeDetectP;
6650 -typedef ILboolean function() pfiluEdgeDetectS;
6651 -typedef ILboolean function() pfiluEmboss;
6652 -typedef ILboolean function(ILuint Width, ILuint Height, ILuint Depth) pfiluEnlargeCanvas;
6653 -typedef ILboolean function(ILfloat XDim, ILfloat YDim, ILfloat ZDim) pfiluEnlargeImage;
6654 -typedef ILboolean function() pfiluEqualize;
6655 -typedef ILstring function(ILenum Error) pfiluErrorString;
6656 -typedef ILboolean function() pfiluFlipImage;
6657 -typedef ILboolean function(ILfloat Gamma) pfiluGammaCorrect;
6658 -typedef ILuint function() pfiluGenImage;
6659 -typedef ILvoid function(ILinfo *Info) pfiluGetImageInfo;
6660 -typedef ILint function(ILenum Mode) pfiluGetInteger;
6661 -typedef ILvoid function(ILenum Mode, ILint *Param) pfiluGetIntegerv;
6662 -typedef ILstring function(ILenum StringName) pfiluGetString;
6663 -typedef ILvoid function(ILenum PName, ILenum Param) pfiluImageParameter;
6664 -typedef ILvoid function() pfiluInit;
6665 -typedef ILboolean function() pfiluInvertAlpha;
6666 -typedef ILuint function( ILstring FileName) pfiluLoadImage;
6667 -typedef ILboolean function() pfiluMirror;
6668 -typedef ILboolean function() pfiluNegative;
6669 -typedef ILboolean function(ILclampf Tolerance) pfiluNoisify;
6670 -typedef ILboolean function(ILuint PixSize) pfiluPixelize;
6671 -typedef ILvoid function(ILpointf *Points, ILuint n) pfiluRegionfv;
6672 -typedef ILvoid function(ILpointi *Points, ILuint n) pfiluRegioniv;
6673 -typedef ILboolean function(ILubyte Red, ILubyte Green, ILubyte Blue, ILfloat Tolerance) pfiluReplaceColour;
6674 -typedef ILboolean function(ILfloat Angle) pfiluRotate;
6675 -typedef ILboolean function(ILfloat x, ILfloat y, ILfloat z, ILfloat Angle) pfiluRotate3D;
6676 -typedef ILboolean function(ILfloat Saturation) pfiluSaturate1f;
6677 -typedef ILboolean function(ILfloat r, ILfloat g, ILfloat b, ILfloat Saturation) pfiluSaturate4f;
6678 -typedef ILboolean function(ILuint Width, ILuint Height, ILuint Depth) pfiluScale;
6679 -typedef ILboolean function(ILfloat r, ILfloat g, ILfloat b) pfiluScaleColours;
6680 -typedef ILboolean function(ILfloat Factor, ILuint Iter) pfiluSharpen;
6681 -typedef ILboolean function() pfiluSwapColours;
6682 -typedef ILboolean function(ILfloat Angle) pfiluWave;
6683 -
6684 pfiluAlienify iluAlienify;
6685 pfiluBlurAvg iluBlurAvg;
6686 pfiluBlurGaussian iluBlurGaussian;
6687 Index: DerelictSDLNet/derelict/sdl/net.d
6688 ===================================================================
6689 --- DerelictSDLNet/derelict/sdl/net.d (revision 318)
6690 +++ DerelictSDLNet/derelict/sdl/net.d (working copy)
6691 @@ -53,7 +53,7 @@
6692 Uint16 port;
6693 }
6695 -typedef void* TCPsocket;
6696 +alias void* TCPsocket;
6698 enum : uint
6699 {
6700 @@ -64,7 +64,7 @@
6701 SDLNET_MAX_UDPADDRESSES = 4,
6702 }
6704 -typedef void* UDPsocket;
6705 +alias void* UDPsocket;
6707 struct UDPpacket
6708 {
6709 @@ -76,7 +76,7 @@
6710 IPaddress address;
6711 }
6713 -typedef void* SDLNet_SocketSet;
6714 +alias void* SDLNet_SocketSet;
6716 struct _SDLNet_GenericSocket
6717 {
6718 @@ -156,52 +156,65 @@
6719 //==============================================================================
6720 extern(C)
6721 {
6722 -typedef SDL_version* function() pfSDLNet_Linked_Version;
6723 +alias SDL_version* function() pfSDLNet_Linked_Version;
6724 +
6725 +alias int function() pfSDLNet_Init;
6726 +alias void function() pfSDLNet_Quit;
6727 +
6728 +alias int function(IPaddress*, char*, Uint16) pfSDLNet_ResolveHost;
6729 +alias char* function(IPaddress*) pfSDLNet_ResolveIP;
6730 +
6731 +alias TCPsocket function(IPaddress*) pfSDLNet_TCP_Open;
6732 +alias TCPsocket function(TCPsocket) pfSDLNet_TCP_Accept;
6733 +alias IPaddress* function(TCPsocket) pfSDLNet_TCP_GetPeerAddress;
6734 +alias int function(TCPsocket,void*,int) pfSDLNet_TCP_Send;
6735 +alias int function(TCPsocket,void*,int) pfSDLNet_TCP_Recv;
6736 +alias void function(TCPsocket) pfSDLNet_TCP_Close;
6737 +
6738 +alias UDPpacket* function(int) pfSDLNet_AllocPacket;
6739 +alias int function(UDPpacket*) pfSDLNet_ResizePacket;
6740 +alias void function(UDPpacket*) pfSDLNet_FreePacket;
6741 +alias UDPpacket** function(int,int) pfSDLNet_AllocPacketV;
6742 +alias void function(UDPpacket**) pfSDLNet_FreePacketV;
6743 +
6744 +alias UDPsocket function(Uint16) pfSDLNet_UDP_Open;
6745 +alias int function(UDPsocket,int,IPaddress*) pfSDLNet_UDP_Bind;
6746 +alias void function(UDPsocket,int) pfSDLNet_UDP_Unbind;
6747 +alias IPaddress* function(UDPsocket,int) pfSDLNet_UDP_GetPeerAddress;
6748 +alias int function(UDPsocket,UDPpacket**,int) pfSDLNet_UDP_SendV;
6749 +alias int function(UDPsocket,int,UDPpacket*) pfSDLNet_UDP_Send;
6750 +alias int function(UDPsocket,UDPpacket**) pfSDLNet_UDP_RecvV;
6751 +alias int function(UDPsocket,UDPpacket*) pfSDLNet_UDP_Recv;
6752 +alias void function(UDPsocket) pfSDLNet_UDP_Close;
6753 +
6754 +alias SDLNet_SocketSet function(int) pfSDLNet_AllocSocketSet;
6755 +alias int function(SDLNet_SocketSet,SDLNet_GenericSocket) pfSDLNet_AddSocket;
6756 +alias int function(SDLNet_SocketSet,SDLNet_GenericSocket) pfSDLNet_DelSocket;
6757 +alias int function(SDLNet_SocketSet,Uint32) pfSDLNet_CheckSockets;
6758 +alias void function(SDLNet_SocketSet) pfSDLNet_FreeSocketSet;
6759 +} // extern(C)
6760 +
6761 pfSDLNet_Linked_Version SDLNet_Linked_Version;
6762 -
6763 -typedef int function() pfSDLNet_Init;
6764 -typedef void function() pfSDLNet_Quit;
6765 +
6766 pfSDLNet_Init SDLNet_Init;
6767 pfSDLNet_Quit SDLNet_Quit;
6768 -
6769 -typedef int function(IPaddress*, char*, Uint16) pfSDLNet_ResolveHost;
6770 -typedef char* function(IPaddress*) pfSDLNet_ResolveIP;
6771 +
6772 pfSDLNet_ResolveHost SDLNet_ResolveHost;
6773 -pfSDLNet_ResolveIP SDLNet_ResolveIP;
6774 -
6775 -typedef TCPsocket function(IPaddress*) pfSDLNet_TCP_Open;
6776 -typedef TCPsocket function(TCPsocket) pfSDLNet_TCP_Accept;
6777 -typedef IPaddress* function(TCPsocket) pfSDLNet_TCP_GetPeerAddress;
6778 -typedef int function(TCPsocket,void*,int) pfSDLNet_TCP_Send;
6779 -typedef int function(TCPsocket,void*,int) pfSDLNet_TCP_Recv;
6780 -typedef void function(TCPsocket) pfSDLNet_TCP_Close;
6781 +pfSDLNet_ResolveIP SDLNet_ResolveIP;
6782 +
6783 pfSDLNet_TCP_Open SDLNet_TCP_Open;
6784 pfSDLNet_TCP_Accept SDLNet_TCP_Accept;
6785 pfSDLNet_TCP_GetPeerAddress SDLNet_TCP_GetPeerAddress;
6786 pfSDLNet_TCP_Send SDLNet_TCP_Send;
6787 pfSDLNet_TCP_Recv SDLNet_TCP_Recv;
6788 pfSDLNet_TCP_Close SDLNet_TCP_Close;
6789 -
6790 -typedef UDPpacket* function(int) pfSDLNet_AllocPacket;
6791 -typedef int function(UDPpacket*) pfSDLNet_ResizePacket;
6792 -typedef void function(UDPpacket*) pfSDLNet_FreePacket;
6793 -typedef UDPpacket** function(int,int) pfSDLNet_AllocPacketV;
6794 -typedef void function(UDPpacket**) pfSDLNet_FreePacketV;
6795 +
6796 pfSDLNet_AllocPacket SDLNet_AllocPacket;
6797 pfSDLNet_ResizePacket SDLNet_ResizePacket;
6798 pfSDLNet_FreePacket SDLNet_FreePacket;
6799 pfSDLNet_AllocPacketV SDLNet_AllocPacketV;
6800 pfSDLNet_FreePacketV SDLNet_FreePacketV;
6801 -
6802 -typedef UDPsocket function(Uint16) pfSDLNet_UDP_Open;
6803 -typedef int function(UDPsocket,int,IPaddress*) pfSDLNet_UDP_Bind;
6804 -typedef void function(UDPsocket,int) pfSDLNet_UDP_Unbind;
6805 -typedef IPaddress* function(UDPsocket,int) pfSDLNet_UDP_GetPeerAddress;
6806 -typedef int function(UDPsocket,UDPpacket**,int) pfSDLNet_UDP_SendV;
6807 -typedef int function(UDPsocket,int,UDPpacket*) pfSDLNet_UDP_Send;
6808 -typedef int function(UDPsocket,UDPpacket**) pfSDLNet_UDP_RecvV;
6809 -typedef int function(UDPsocket,UDPpacket*) pfSDLNet_UDP_Recv;
6810 -typedef void function(UDPsocket) pfSDLNet_UDP_Close;
6811 +
6812 pfSDLNet_UDP_Open SDLNet_UDP_Open;
6813 pfSDLNet_UDP_Bind SDLNet_UDP_Bind;
6814 pfSDLNet_UDP_Unbind SDLNet_UDP_Unbind;
6815 @@ -211,12 +224,7 @@
6816 pfSDLNet_UDP_RecvV SDLNet_UDP_RecvV;
6817 pfSDLNet_UDP_Recv SDLNet_UDP_Recv;
6818 pfSDLNet_UDP_Close SDLNet_UDP_Close;
6819 -
6820 -typedef SDLNet_SocketSet function(int) pfSDLNet_AllocSocketSet;
6821 -typedef int function(SDLNet_SocketSet,SDLNet_GenericSocket) pfSDLNet_AddSocket;
6822 -typedef int function(SDLNet_SocketSet,SDLNet_GenericSocket) pfSDLNet_DelSocket;
6823 -typedef int function(SDLNet_SocketSet,Uint32) pfSDLNet_CheckSockets;
6824 -typedef void function(SDLNet_SocketSet) pfSDLNet_FreeSocketSet;
6825 +
6826 pfSDLNet_AllocSocketSet SDLNet_AllocSocketSet;
6827 pfSDLNet_AddSocket SDLNet_AddSocket;
6828 pfSDLNet_DelSocket SDLNet_DelSocket;
6829 @@ -224,7 +232,6 @@
6830 pfSDLNet_FreeSocketSet SDLNet_FreeSocketSet;
6833 -} // extern(C)
6835 //==============================================================================
6836 // LOADER
6837 Index: DerelictAL/derelict/openal/alcfuncs.d
6838 ===================================================================
6839 --- DerelictAL/derelict/openal/alcfuncs.d (revision 318)
6840 +++ DerelictAL/derelict/openal/alcfuncs.d (working copy)
6841 @@ -67,16 +67,34 @@
6843 }
6845 -extern(C):
6846 +extern(C) {
6847 +alias ALCcontext* function(ALCdevice*, in ALCint*) pfalcCreateContext;
6848 +alias ALCboolean function(ALCcontext*) pfalcMakeContextCurrent;
6849 +alias void function(ALCcontext*) pfalcProcessContext;
6850 +alias void function(ALCcontext*) pfalcSuspendContext;
6851 +alias void function(ALCcontext*) pfalcDestroyContext;
6852 +alias ALCcontext* function() pfalcGetCurrentContext;
6853 +alias ALCdevice* function(ALCcontext*) pfalcGetContextsDevice;
6855 +alias ALCdevice* function(in ALCchar*) pfalcOpenDevice;
6856 +alias ALCboolean function(ALCdevice*) pfalcCloseDevice;
6858 -typedef ALCcontext* function(ALCdevice*, in ALCint*) pfalcCreateContext;
6859 -typedef ALCboolean function(ALCcontext*) pfalcMakeContextCurrent;
6860 -typedef void function(ALCcontext*) pfalcProcessContext;
6861 -typedef void function(ALCcontext*) pfalcSuspendContext;
6862 -typedef void function(ALCcontext*) pfalcDestroyContext;
6863 -typedef ALCcontext* function() pfalcGetCurrentContext;
6864 -typedef ALCdevice* function(ALCcontext*) pfalcGetContextsDevice;
6865 +alias ALCenum function(ALCdevice*) pfalcGetError;
6866 +
6867 +alias ALCboolean function(ALCdevice*, in char*) pfalcIsExtensionPresent;
6868 +alias void* function(ALCdevice*, in char*) pfalcGetProcAddress;
6869 +alias ALCenum function(ALCdevice*, in char*) pfalcGetEnumValue;
6870 +
6871 +alias char* function(ALCdevice*, ALCenum) pfalcGetString;
6872 +alias void function(ALCdevice*, ALCenum, ALCsizei, ALCint*) pfalcGetIntegerv;
6873 +
6874 +alias ALCdevice* function(in char*, ALCuint, ALCenum, ALCsizei) pfalcCaptureOpenDevice;
6875 +alias ALCboolean function(ALCdevice*) pfalcCaptureCloseDevice;
6876 +alias void function(ALCdevice*) pfalcCaptureStart;
6877 +alias void function(ALCdevice*) pfalcCaptureStop;
6878 +alias void function(ALCdevice*, ALCvoid*, ALCsizei) pfalcCaptureSamples;
6879 +}
6880 +
6881 pfalcCreateContext alcCreateContext;
6882 pfalcMakeContextCurrent alcMakeContextCurrent;
6883 pfalcProcessContext alcProcessContext;
6884 @@ -84,34 +102,21 @@
6885 pfalcDestroyContext alcDestroyContext;
6886 pfalcGetCurrentContext alcGetCurrentContext;
6887 pfalcGetContextsDevice alcGetContextsDevice;
6888 -
6889 -typedef ALCdevice* function(in ALCchar*) pfalcOpenDevice;
6890 -typedef ALCboolean function(ALCdevice*) pfalcCloseDevice;
6891 +
6892 pfalcOpenDevice alcOpenDevice;
6893 pfalcCloseDevice alcCloseDevice;
6894 -
6895 -typedef ALCenum function(ALCdevice*) pfalcGetError;
6896 +
6897 pfalcGetError alcGetError;
6898 -
6899 -typedef ALCboolean function(ALCdevice*, in char*) pfalcIsExtensionPresent;
6900 -typedef void* function(ALCdevice*, in char*) pfalcGetProcAddress;
6901 -typedef ALCenum function(ALCdevice*, in char*) pfalcGetEnumValue;
6902 +
6903 pfalcIsExtensionPresent alcIsExtensionPresent;
6904 pfalcGetProcAddress alcGetProcAddress;
6905 pfalcGetEnumValue alcGetEnumValue;
6906 -
6907 -typedef char* function(ALCdevice*, ALCenum) pfalcGetString;
6908 -typedef void function(ALCdevice*, ALCenum, ALCsizei, ALCint*) pfalcGetIntegerv;
6909 +
6910 pfalcGetString alcGetString;
6911 pfalcGetIntegerv alcGetIntegerv;
6912 -
6913 -typedef ALCdevice* function(in char*, ALCuint, ALCenum, ALCsizei) pfalcCaptureOpenDevice;
6914 -typedef ALCboolean function(ALCdevice*) pfalcCaptureCloseDevice;
6915 -typedef void function(ALCdevice*) pfalcCaptureStart;
6916 -typedef void function(ALCdevice*) pfalcCaptureStop;
6917 -typedef void function(ALCdevice*, ALCvoid*, ALCsizei) pfalcCaptureSamples;
6918 +
6919 pfalcCaptureOpenDevice alcCaptureOpenDevice;
6920 pfalcCaptureCloseDevice alcCaptureCloseDevice;
6921 pfalcCaptureStart alcCaptureStart;
6922 pfalcCaptureStop alcCaptureStop;
6923 -pfalcCaptureSamples alcCaptureSamples;
6924 \ No newline at end of file
6925 +pfalcCaptureSamples alcCaptureSamples;
6926 Index: DerelictAL/derelict/openal/alfuncs.d
6927 ===================================================================
6928 --- DerelictAL/derelict/openal/alfuncs.d (revision 318)
6929 +++ DerelictAL/derelict/openal/alfuncs.d (working copy)
6930 @@ -126,7 +126,7 @@
6931 bindFunc(alDopplerVelocity)("alDopplerVelocity", lib);
6932 bindFunc(alSpeedOfSound)("alSpeedOfSound", lib);
6933 bindFunc(alDistanceModel)("alDistanceModel", lib);
6934 -
6935 +
6936 loadALC(lib);
6937 }
6939 @@ -142,25 +142,100 @@
6940 }
6943 -extern(C):
6944 +extern(C) {
6946 -typedef void function(ALenum) pfalEnable;
6947 -typedef void function(ALenum) pfalDisable;
6948 -typedef ALboolean function(ALenum) pfalIsEnabled;
6949 +alias void function(ALenum) pfalEnable;
6950 +alias void function(ALenum) pfalDisable;
6951 +alias ALboolean function(ALenum) pfalIsEnabled;
6952 +
6953 +alias char* function(ALenum) pfalGetString;
6954 +alias void function(ALenum, ALboolean*) pfalGetBooleanv;
6955 +alias void function(ALenum, ALint*) pfalGetIntegerv;
6956 +alias void function(ALenum, ALfloat*) pfalGetFloatv;
6957 +alias void function(ALenum, ALdouble*) pfalGetDoublev;
6958 +alias ALboolean function(ALenum) pfalGetBoolean;
6959 +alias ALint function(ALenum) pfalGetInteger;
6960 +alias ALfloat function(ALenum) pfalGetFloat;
6961 +alias ALdouble function(ALenum) pfalGetDouble;
6962 +alias ALenum function() pfalGetError;
6963 +
6964 +alias ALboolean function(in char*) pfalIsExtensionPresent;
6965 +alias ALboolean function(in char*) pfalGetProcAddress;
6966 +alias ALenum function(in char*) pfalGetEnumValue;
6967 +
6968 +alias void function(ALenum, ALfloat) pfalListenerf;
6969 +alias void function(ALenum, ALfloat, ALfloat, ALfloat) pfalListener3f;
6970 +alias void function(ALenum, in ALfloat*) pfalListenerfv;
6971 +alias void function(ALenum, ALint) pfalListeneri;
6972 +alias void function(ALenum, ALint, ALint, ALint) pfalListener3i;
6973 +alias void function(ALenum, in ALint*) pfalListeneriv;
6974 +
6975 +alias void function(ALenum, ALfloat*) pfalGetListenerf;
6976 +alias void function(ALenum, ALfloat*, ALfloat*, ALfloat*) pfalGetListener3f;
6977 +alias void function(ALenum, ALfloat*) pfalGetListenerfv;
6978 +alias void function(ALenum, ALint*) pfalGetListeneri;
6979 +alias void function(ALenum, ALint*, ALint*, ALint*) pfalGetListener3i;
6980 +alias void function(ALenum, ALint*) pfalGetListeneriv;
6981 +
6982 +alias void function(ALsizei, ALuint*) pfalGenSources;
6983 +alias void function(ALsizei, in ALuint*) pfalDeleteSources;
6984 +alias ALboolean function(ALuint) pfalIsSource;
6985 +alias void function(ALuint, ALenum, ALfloat) pfalSourcef;
6986 +alias void function(ALuint, ALenum, ALfloat, ALfloat, ALfloat) pfalSource3f;
6987 +alias void function(ALuint, ALenum, in ALfloat*) pfalSourcefv;
6988 +alias void function(ALuint, ALenum, ALint) pfalSourcei;
6989 +alias void function(ALuint, ALenum, ALint, ALint, ALint) pfalSource3i;
6990 +alias void function(ALuint, ALenum, in ALint*) pfalSourceiv;
6991 +
6992 +alias void function(ALuint, ALenum, ALfloat*) pfalGetSourcef;
6993 +alias void function(ALuint, ALenum, ALfloat*, ALfloat*, ALfloat*) pfalGetSource3f;
6994 +alias void function(ALuint, ALenum, ALfloat*) pfalGetSourcefv;
6995 +alias void function(ALuint, ALenum, ALint*) pfalGetSourcei;
6996 +alias void function(ALuint, ALenum, ALint*, ALint*, ALint*) pfalGetSource3i;
6997 +alias void function(ALuint, ALenum, ALint*) pfalGetSourceiv;
6998 +
6999 +alias void function(ALsizei, in ALuint*) pfalSourcePlayv;
7000 +alias void function(ALsizei, in ALuint*) pfalSourceStopv;
7001 +alias void function(ALsizei, in ALuint*) pfalSourceRewindv;
7002 +alias void function(ALsizei, in ALuint*) pfalSourcePausev;
7003 +alias void function(ALuint) pfalSourcePlay;
7004 +alias void function(ALuint) pfalSourcePause;
7005 +alias void function(ALuint) pfalSourceRewind;
7006 +alias void function(ALuint) pfalSourceStop;
7007 +
7008 +alias void function(ALuint, ALsizei, ALuint*) pfalSourceQueueBuffers;
7009 +alias void function(ALuint, ALsizei, ALuint*) pfalSourceUnqueueBuffers;
7010 +
7011 +alias void function(ALsizei, ALuint*) pfalGenBuffers;
7012 +alias void function(ALsizei, in ALuint*) pfalDeleteBuffers;
7013 +alias ALboolean function(ALuint) pfalIsBuffer;
7014 +alias void function(ALuint, ALenum, in ALvoid*, ALsizei, ALsizei) pfalBufferData;
7015 +
7016 +alias void function(ALuint, ALenum, ALfloat) pfalBufferf;
7017 +alias void function(ALuint, ALenum, ALfloat, ALfloat, ALfloat) pfalBuffer3f;
7018 +alias void function(ALuint, ALenum, in ALfloat*) pfalBufferfv;
7019 +alias void function(ALuint, ALenum, ALint) pfalBufferi;
7020 +alias void function(ALuint, ALenum, ALint, ALint, ALint) pfalBuffer3i;
7021 +alias void function(ALuint, ALenum, in ALint*) pfalBufferiv;
7022 +
7023 +alias void function(ALuint, ALenum, ALfloat*) pfalGetBufferf;
7024 +alias void function(ALuint, ALenum, ALfloat*, ALfloat*, ALfloat*) pfalGetBuffer3f;
7025 +alias void function(ALuint, ALenum, ALfloat*) pfalGetBufferfv;
7026 +alias void function(ALuint, ALenum, ALint*) pfalGetBufferi;
7027 +alias void function(ALuint, ALenum, ALint*, ALint*, ALint*) pfalGetBuffer3i;
7028 +alias void function(ALuint, ALenum, ALint*) pfalGetBufferiv;
7029 +
7030 +alias void function(ALfloat) pfalDopplerFactor;
7031 +alias void function(ALfloat) pfalDopplerVelocity;
7032 +alias void function(ALfloat) pfalSpeedOfSound;
7033 +alias void function(ALenum) pfalDistanceModel;
7034 +}
7035 +
7036 +
7037 pfalEnable alEnable;
7038 pfalDisable alDisable;
7039 pfalIsEnabled alIsEnabled;
7040 -
7041 -typedef char* function(ALenum) pfalGetString;
7042 -typedef void function(ALenum, ALboolean*) pfalGetBooleanv;
7043 -typedef void function(ALenum, ALint*) pfalGetIntegerv;
7044 -typedef void function(ALenum, ALfloat*) pfalGetFloatv;
7045 -typedef void function(ALenum, ALdouble*) pfalGetDoublev;
7046 -typedef ALboolean function(ALenum) pfalGetBoolean;
7047 -typedef ALint function(ALenum) pfalGetInteger;
7048 -typedef ALfloat function(ALenum) pfalGetFloat;
7049 -typedef ALdouble function(ALenum) pfalGetDouble;
7050 -typedef ALenum function() pfalGetError;
7051 +
7052 pfalGetString alGetString;
7053 pfalGetBooleanv alGetBooleanv;
7054 pfalGetIntegerv alGetIntegerv;
7055 @@ -171,19 +246,10 @@
7056 pfalGetDouble alGetDouble;
7057 pfalGetError alGetError;
7059 -typedef ALboolean function(in char*) pfalIsExtensionPresent;
7060 -typedef ALboolean function(in char*) pfalGetProcAddress;
7061 -typedef ALenum function(in char*) pfalGetEnumValue;
7062 pfalIsExtensionPresent alIsExtensionPresent;
7063 pfalGetProcAddress alGetProcAddress;
7064 pfalGetEnumValue alGetEnumValue;
7065 -
7066 -typedef void function(ALenum, ALfloat) pfalListenerf;
7067 -typedef void function(ALenum, ALfloat, ALfloat, ALfloat) pfalListener3f;
7068 -typedef void function(ALenum, in ALfloat*) pfalListenerfv;
7069 -typedef void function(ALenum, ALint) pfalListeneri;
7070 -typedef void function(ALenum, ALint, ALint, ALint) pfalListener3i;
7071 -typedef void function(ALenum, in ALint*) pfalListeneriv;
7072 +
7073 pfalListenerf alListenerf;
7074 pfalListener3f alListener3f;
7075 pfalListenerfv alListenerfv;
7076 @@ -191,13 +257,6 @@
7077 pfalListener3i alListener3i;
7078 pfalListeneriv alListeneriv;
7080 -typedef void function(ALenum, ALfloat*) pfalGetListenerf;
7081 -typedef void function(ALenum, ALfloat*, ALfloat*, ALfloat*) pfalGetListener3f;
7082 -typedef void function(ALenum, ALfloat*) pfalGetListenerfv;
7083 -typedef void function(ALenum, ALint*) pfalGetListeneri;
7084 -typedef void function(ALenum, ALint*, ALint*, ALint*) pfalGetListener3i;
7085 -typedef void function(ALenum, ALint*) pfalGetListeneriv;
7086 -
7087 pfalGetListenerf alGetListenerf;
7088 pfalGetListener3f alGetListener3f;
7089 pfalGetListenerfv alGetListenerfv;
7090 @@ -205,33 +264,17 @@
7091 pfalGetListener3i alGetListener3i;
7092 pfalGetListeneriv alGetListeneriv;
7094 -typedef void function(ALsizei, ALuint*) pfalGenSources;
7095 -typedef void function(ALsizei, in ALuint*) pfalDeleteSources;
7096 -typedef ALboolean function(ALuint) pfalIsSource;
7097 pfalGenSources alGenSources;
7098 pfalDeleteSources alDeleteSources;
7099 pfalIsSource alIsSource;
7100 -
7101 -typedef void function(ALuint, ALenum, ALfloat) pfalSourcef;
7102 -typedef void function(ALuint, ALenum, ALfloat, ALfloat, ALfloat) pfalSource3f;
7103 -typedef void function(ALuint, ALenum, in ALfloat*) pfalSourcefv;
7104 -typedef void function(ALuint, ALenum, ALint) pfalSourcei;
7105 -typedef void function(ALuint, ALenum, ALint, ALint, ALint) pfalSource3i;
7106 -typedef void function(ALuint, ALenum, in ALint*) pfalSourceiv;
7107 +
7108 pfalSourcef alSourcef;
7109 pfalSource3f alSource3f;
7110 pfalSourcefv alSourcefv;
7111 pfalSourcei alSourcei;
7112 pfalSource3i alSource3i;
7113 pfalSourceiv alSourceiv;
7114 -
7115 -
7116 -typedef void function(ALuint, ALenum, ALfloat*) pfalGetSourcef;
7117 -typedef void function(ALuint, ALenum, ALfloat*, ALfloat*, ALfloat*) pfalGetSource3f;
7118 -typedef void function(ALuint, ALenum, ALfloat*) pfalGetSourcefv;
7119 -typedef void function(ALuint, ALenum, ALint*) pfalGetSourcei;
7120 -typedef void function(ALuint, ALenum, ALint*, ALint*, ALint*) pfalGetSource3i;
7121 -typedef void function(ALuint, ALenum, ALint*) pfalGetSourceiv;
7122 +
7123 pfalGetSourcef alGetSourcef;
7124 pfalGetSource3f alGetSource3f;
7125 pfalGetSourcefv alGetSourcefv;
7126 @@ -239,14 +282,7 @@
7127 pfalGetSource3i alGetSource3i;
7128 pfalGetSourceiv alGetSourceiv;
7130 -typedef void function(ALsizei, in ALuint*) pfalSourcePlayv;
7131 -typedef void function(ALsizei, in ALuint*) pfalSourceStopv;
7132 -typedef void function(ALsizei, in ALuint*) pfalSourceRewindv;
7133 -typedef void function(ALsizei, in ALuint*) pfalSourcePausev;
7134 -typedef void function(ALuint) pfalSourcePlay;
7135 -typedef void function(ALuint) pfalSourcePause;
7136 -typedef void function(ALuint) pfalSourceRewind;
7137 -typedef void function(ALuint) pfalSourceStop;
7138 +
7139 pfalSourcePlayv alSourcePlayv;
7140 pfalSourceStopv alSourceStopv;
7141 pfalSourceRewindv alSourceRewindv;
7142 @@ -255,52 +291,30 @@
7143 pfalSourcePause alSourcePause;
7144 pfalSourceRewind alSourceRewind;
7145 pfalSourceStop alSourceStop;
7146 -
7147 -typedef void function(ALuint, ALsizei, ALuint*) pfalSourceQueueBuffers;
7148 -typedef void function(ALuint, ALsizei, ALuint*) pfalSourceUnqueueBuffers;
7149 +
7150 pfalSourceQueueBuffers alSourceQueueBuffers;
7151 pfalSourceUnqueueBuffers alSourceUnqueueBuffers;
7152 -
7153 -typedef void function(ALsizei, ALuint*) pfalGenBuffers;
7154 -typedef void function(ALsizei, in ALuint*) pfalDeleteBuffers;
7155 -typedef ALboolean function(ALuint) pfalIsBuffer;
7156 -typedef void function(ALuint, ALenum, in ALvoid*, ALsizei, ALsizei) pfalBufferData;
7157 +
7158 pfalGenBuffers alGenBuffers;
7159 pfalDeleteBuffers alDeleteBuffers;
7160 pfalIsBuffer alIsBuffer;
7161 pfalBufferData alBufferData;
7162 -
7163 -typedef void function(ALuint, ALenum, ALfloat) pfalBufferf;
7164 -typedef void function(ALuint, ALenum, ALfloat, ALfloat, ALfloat) pfalBuffer3f;
7165 -typedef void function(ALuint, ALenum, in ALfloat*) pfalBufferfv;
7166 -typedef void function(ALuint, ALenum, ALint) pfalBufferi;
7167 -typedef void function(ALuint, ALenum, ALint, ALint, ALint) pfalBuffer3i;
7168 -typedef void function(ALuint, ALenum, in ALint*) pfalBufferiv;
7169 +
7170 pfalBufferf alBufferf;
7171 pfalBuffer3f alBuffer3f;
7172 pfalBufferfv alBufferfv;
7173 pfalBufferi alBufferi;
7174 pfalBuffer3i alBuffer3i;
7175 pfalBufferiv alBufferiv;
7176 -
7177 -typedef void function(ALuint, ALenum, ALfloat*) pfalGetBufferf;
7178 -typedef void function(ALuint, ALenum, ALfloat*, ALfloat*, ALfloat*) pfalGetBuffer3f;
7179 -typedef void function(ALuint, ALenum, ALfloat*) pfalGetBufferfv;
7180 -typedef void function(ALuint, ALenum, ALint*) pfalGetBufferi;
7181 -typedef void function(ALuint, ALenum, ALint*, ALint*, ALint*) pfalGetBuffer3i;
7182 -typedef void function(ALuint, ALenum, ALint*) pfalGetBufferiv;
7183 +
7184 pfalGetBufferf alGetBufferf;
7185 pfalGetBuffer3f alGetBuffer3f;
7186 pfalGetBufferfv alGetBufferfv;
7187 pfalGetBufferi alGetBufferi;
7188 pfalGetBuffer3i alGetBuffer3i;
7189 pfalGetBufferiv alGetBufferiv;
7190 -
7191 -typedef void function(ALfloat) pfalDopplerFactor;
7192 -typedef void function(ALfloat) pfalDopplerVelocity;
7193 -typedef void function(ALfloat) pfalSpeedOfSound;
7194 -typedef void function(ALenum) pfalDistanceModel;
7195 +
7196 pfalDopplerFactor alDopplerFactor;
7197 pfalDopplerVelocity alDopplerVelocity;
7198 pfalSpeedOfSound alSpeedOfSound;
7199 -pfalDistanceModel alDistanceModel;
7200 \ No newline at end of file
7201 +pfalDistanceModel alDistanceModel;
7202 Index: DerelictSDLttf/derelict/sdl/ttf.d
7203 ===================================================================
7204 --- DerelictSDLttf/derelict/sdl/ttf.d (revision 318)
7205 +++ DerelictSDLttf/derelict/sdl/ttf.d (working copy)
7206 @@ -64,7 +64,7 @@
7207 alias SDL_GetError TTF_GetError;
7209 struct _TTF_Font {}
7210 -typedef _TTF_Font TTF_Font;
7211 +alias _TTF_Font TTF_Font;
7213 //==============================================================================
7214 // Macros
7215 @@ -85,38 +85,40 @@
7216 extern (C)
7217 {
7219 -typedef const SDL_version* function() pfTTF_Linked_Version;
7220 -typedef void function(int swapped) pfTTF_ByteSwappedUNICODE;
7221 -typedef int function() pfTTF_Init;
7222 -typedef TTF_Font * function (char *file, int ptsize) pfTTF_OpenFont;
7223 -typedef TTF_Font * function (char *file, int ptsize, long index) pfTTF_OpenFontIndex;
7224 -typedef TTF_Font * function (SDL_RWops *src, int freesrc, int ptsize) pfTTF_OpenFontRW;
7225 -typedef TTF_Font * function (SDL_RWops *src, int freesrc, int ptsize, long index) pfTTF_OpenFontIndexRW;
7226 -typedef int function (TTF_Font *font) pfTTF_GetFontStyle;
7227 -typedef void function (TTF_Font *font, int style) pfTTF_SetFontStyle;
7228 -typedef int function (TTF_Font *font) pfFontPropertyInt;
7229 -typedef long function (TTF_Font *font) pfFontPropertyLong;
7230 -typedef char* function (TTF_Font *font) pfFontPropertyString;
7231 -typedef int function (TTF_Font *font, Uint16 ch,
7232 +alias SDL_version* function() pfTTF_Linked_Version;
7233 +alias void function(int swapped) pfTTF_ByteSwappedUNICODE;
7234 +alias int function() pfTTF_Init;
7235 +alias TTF_Font * function (char *file, int ptsize) pfTTF_OpenFont;
7236 +alias TTF_Font * function (char *file, int ptsize, long index) pfTTF_OpenFontIndex;
7237 +alias TTF_Font * function (SDL_RWops *src, int freesrc, int ptsize) pfTTF_OpenFontRW;
7238 +alias TTF_Font * function (SDL_RWops *src, int freesrc, int ptsize, long index) pfTTF_OpenFontIndexRW;
7239 +alias int function (TTF_Font *font) pfTTF_GetFontStyle;
7240 +alias void function (TTF_Font *font, int style) pfTTF_SetFontStyle;
7241 +alias int function (TTF_Font *font) pfFontPropertyInt;
7242 +alias long function (TTF_Font *font) pfFontPropertyLong;
7243 +alias char* function (TTF_Font *font) pfFontPropertyString;
7244 +alias int function (TTF_Font *font, Uint16 ch,
7245 int *minx, int *maxx, int *miny, int *maxy, int *advance) pfTTF_GlyphMetrics;
7246 -typedef int function (TTF_Font *font, char *text, int *w, int *h) pfTTF_SizeText;
7247 -typedef int function (TTF_Font *font, char *text, int *w, int *h) pfTTF_SizeUTF8;
7248 -typedef int function (TTF_Font *font, Uint16 *text, int *w, int *h) pfTTF_SizeUNICODE;
7249 -typedef SDL_Surface * function (TTF_Font *font, char *text, SDL_Color fg) pfTTF_RenderText_Solid;
7250 -typedef SDL_Surface * function (TTF_Font *font, char *text, SDL_Color fg) pfTTF_RenderUTF8_Solid;
7251 -typedef SDL_Surface * function (TTF_Font *font, Uint16 *text, SDL_Color fg) pfTTF_RenderUNICODE_Solid;
7252 -typedef SDL_Surface * function (TTF_Font *font, Uint16 ch, SDL_Color fg) pfTTF_RenderGlyph_Solid;
7253 -typedef SDL_Surface * function (TTF_Font *font, char *text, SDL_Color fg, SDL_Color bg) pfTTF_RenderText_Shaded;
7254 -typedef SDL_Surface * function (TTF_Font *font, char *text, SDL_Color fg, SDL_Color bg) pfTTF_RenderUTF8_Shaded;
7255 -typedef SDL_Surface * function (TTF_Font *font, Uint16 *text, SDL_Color fg, SDL_Color bg) pfTTF_RenderUNICODE_Shaded;
7256 -typedef SDL_Surface * function (TTF_Font *font, Uint16 ch, SDL_Color fg, SDL_Color bg) pfTTF_RenderGlyph_Shaded;
7257 -typedef SDL_Surface * function (TTF_Font *font, char *text, SDL_Color fg) pfTTF_RenderText_Blended;
7258 -typedef SDL_Surface * function (TTF_Font *font, char *text, SDL_Color fg) pfTTF_RenderUTF8_Blended;
7259 -typedef SDL_Surface * function (TTF_Font *font, Uint16 *text, SDL_Color fg) pfTTF_RenderUNICODE_Blended;
7260 -typedef SDL_Surface * function (TTF_Font *font, Uint16 ch, SDL_Color fg) pfTTF_RenderGlyph_Blended;
7261 -typedef void function (TTF_Font *font) pfTTF_CloseFont;
7262 -typedef void function () pfTTF_Quit;
7263 -typedef int function () pfTTF_WasInit;
7264 +alias int function (TTF_Font *font, char *text, int *w, int *h) pfTTF_SizeText;
7265 +alias int function (TTF_Font *font, char *text, int *w, int *h) pfTTF_SizeUTF8;
7266 +alias int function (TTF_Font *font, Uint16 *text, int *w, int *h) pfTTF_SizeUNICODE;
7267 +alias SDL_Surface * function (TTF_Font *font, char *text, SDL_Color fg) pfTTF_RenderText_Solid;
7268 +alias SDL_Surface * function (TTF_Font *font, char *text, SDL_Color fg) pfTTF_RenderUTF8_Solid;
7269 +alias SDL_Surface * function (TTF_Font *font, Uint16 *text, SDL_Color fg) pfTTF_RenderUNICODE_Solid;
7270 +alias SDL_Surface * function (TTF_Font *font, Uint16 ch, SDL_Color fg) pfTTF_RenderGlyph_Solid;
7271 +alias SDL_Surface * function (TTF_Font *font, char *text, SDL_Color fg, SDL_Color bg) pfTTF_RenderText_Shaded;
7272 +alias SDL_Surface * function (TTF_Font *font, char *text, SDL_Color fg, SDL_Color bg) pfTTF_RenderUTF8_Shaded;
7273 +alias SDL_Surface * function (TTF_Font *font, Uint16 *text, SDL_Color fg, SDL_Color bg) pfTTF_RenderUNICODE_Shaded;
7274 +alias SDL_Surface * function (TTF_Font *font, Uint16 ch, SDL_Color fg, SDL_Color bg) pfTTF_RenderGlyph_Shaded;
7275 +alias SDL_Surface * function (TTF_Font *font, char *text, SDL_Color fg) pfTTF_RenderText_Blended;
7276 +alias SDL_Surface * function (TTF_Font *font, char *text, SDL_Color fg) pfTTF_RenderUTF8_Blended;
7277 +alias SDL_Surface * function (TTF_Font *font, Uint16 *text, SDL_Color fg) pfTTF_RenderUNICODE_Blended;
7278 +alias SDL_Surface * function (TTF_Font *font, Uint16 ch, SDL_Color fg) pfTTF_RenderGlyph_Blended;
7279 +alias void function (TTF_Font *font) pfTTF_CloseFont;
7280 +alias void function () pfTTF_Quit;
7281 +alias int function () pfTTF_WasInit;
7282 +}
7283 +
7284 pfTTF_Linked_Version TTF_Linked_Version;
7285 pfTTF_ByteSwappedUNICODE TTF_ByteSwappedUNICODE;
7286 pfTTF_Init TTF_Init;
7287 @@ -154,8 +156,6 @@
7288 pfTTF_Quit TTF_Quit;
7289 pfTTF_WasInit TTF_WasInit;
7291 -} // extern(C)
7292 -
7293 alias TTF_RenderText_Shaded TTF_RenderText;
7294 alias TTF_RenderUTF8_Shaded TTF_RenderUTF8;
7295 alias TTF_RenderUNICODE_Shaded TTF_RenderUNICODE;
7296 Index: DerelictGL/derelict/opengl/glfuncs.d
7297 ===================================================================
7298 --- DerelictGL/derelict/opengl/glfuncs.d (revision 318)
7299 +++ DerelictGL/derelict/opengl/glfuncs.d (working copy)
7300 @@ -379,360 +379,360 @@
7301 bindFunc(glInterleavedArrays)("glInterleavedArrays", lib);
7302 }
7304 -extern(System):
7305 +extern(System) {
7306 +alias void function(GLfloat c) pfglClearIndex;
7307 +alias void function(GLclampf,GLclampf,GLclampf,GLclampf) pfglClearColor;
7308 +alias void function(GLbitfield) pfglClear;
7309 +alias void function(GLuint) pfglIndexMask;
7310 +alias void function(GLboolean,GLboolean,GLboolean,GLboolean) pfglColorMask;
7311 +alias void function(GLenum,GLclampf) pfglAlphaFunc;
7312 +alias void function(GLenum,GLenum) pfglBlendFunc;
7313 +alias void function(GLenum) pfglLogicOp;
7314 +alias void function(GLenum) pfglCullFace;
7315 +alias void function(GLenum) pfglFrontFace;
7316 +alias void function(GLfloat) pfglPointSize;
7317 +alias void function(GLfloat) pfglLineWidth;
7318 +alias void function(GLint,GLushort) pfglLineStipple;
7319 +alias void function(GLenum,GLenum) pfglPolygonMode;
7320 +alias void function(GLfloat,GLfloat) pfglPolygonOffset;
7321 +alias void function(GLubyte*) pfglPolygonStipple;
7322 +alias void function(GLubyte*) pfglGetPolygonStipple;
7323 +alias void function(GLboolean) pfglEdgeFlag;
7324 +alias void function(GLboolean*)pfglEdgeFlagv;
7325 +alias void function(GLint,GLint,GLsizei,GLsizei) pfglScissor;
7326 +alias void function(GLenum,GLdouble*) pfglClipPlane;
7327 +alias void function(GLenum,GLdouble*) pfglGetClipPlane;
7328 +alias void function(GLenum) pfglDrawBuffer;
7329 +alias void function(GLenum) pfglReadBuffer;
7330 +alias void function(GLenum) pfglEnable;
7331 +alias void function(GLenum) pfglDisable;
7332 +alias GLboolean function(GLenum) pfglIsEnabled;
7333 +alias void function(GLenum) pfglEnableClientState;
7334 +alias void function(GLenum) pfglDisableClientState;
7335 +alias void function(GLenum,GLboolean*) pfglGetBooleanv;
7336 +alias void function(GLenum,GLdouble*) pfglGetDoublev;
7337 +alias void function(GLenum,GLfloat*) pfglGetFloatv;
7338 +alias void function(GLenum,GLint*) pfglGetIntegerv;
7339 +alias void function(GLbitfield) pfglPushAttrib;
7340 +alias void function() pfglPopAttrib;
7341 +alias void function(GLbitfield) pfglPushClientAttrib;
7342 +alias void function() pfglPopClientAttrib;
7343 +alias GLint function(GLenum) pfglRenderMode;
7344 +alias GLenum function() pfglGetError;
7345 +alias GLchar* function(GLenum) pfglGetString;
7346 +alias void function() pfglFinish;
7347 +alias void function() pfglFlush;
7348 +alias void function(GLenum,GLenum) pfglHint;
7350 -typedef void function(GLfloat c) pfglClearIndex;
7351 -typedef void function(GLclampf,GLclampf,GLclampf,GLclampf) pfglClearColor;
7352 -typedef void function(GLbitfield) pfglClear;
7353 -typedef void function(GLuint) pfglIndexMask;
7354 -typedef void function(GLboolean,GLboolean,GLboolean,GLboolean) pfglColorMask;
7355 -typedef void function(GLenum,GLclampf) pfglAlphaFunc;
7356 -typedef void function(GLenum,GLenum) pfglBlendFunc;
7357 -typedef void function(GLenum) pfglLogicOp;
7358 -typedef void function(GLenum) pfglCullFace;
7359 -typedef void function(GLenum) pfglFrontFace;
7360 -typedef void function(GLfloat) pfglPointSize;
7361 -typedef void function(GLfloat) pfglLineWidth;
7362 -typedef void function(GLint,GLushort) pfglLineStipple;
7363 -typedef void function(GLenum,GLenum) pfglPolygonMode;
7364 -typedef void function(GLfloat,GLfloat) pfglPolygonOffset;
7365 -typedef void function(GLubyte*) pfglPolygonStipple;
7366 -typedef void function(GLubyte*) pfglGetPolygonStipple;
7367 -typedef void function(GLboolean) pfglEdgeFlag;
7368 -typedef void function(GLboolean*)pfglEdgeFlagv;
7369 -typedef void function(GLint,GLint,GLsizei,GLsizei) pfglScissor;
7370 -typedef void function(GLenum,GLdouble*) pfglClipPlane;
7371 -typedef void function(GLenum,GLdouble*) pfglGetClipPlane;
7372 -typedef void function(GLenum) pfglDrawBuffer;
7373 -typedef void function(GLenum) pfglReadBuffer;
7374 -typedef void function(GLenum) pfglEnable;
7375 -typedef void function(GLenum) pfglDisable;
7376 -typedef GLboolean function(GLenum) pfglIsEnabled;
7377 -typedef void function(GLenum) pfglEnableClientState;
7378 -typedef void function(GLenum) pfglDisableClientState;
7379 -typedef void function(GLenum,GLboolean*) pfglGetBooleanv;
7380 -typedef void function(GLenum,GLdouble*) pfglGetDoublev;
7381 -typedef void function(GLenum,GLfloat*) pfglGetFloatv;
7382 -typedef void function(GLenum,GLint*) pfglGetIntegerv;
7383 -typedef void function(GLbitfield) pfglPushAttrib;
7384 -typedef void function() pfglPopAttrib;
7385 -typedef void function(GLbitfield) pfglPushClientAttrib;
7386 -typedef void function() pfglPopClientAttrib;
7387 -typedef GLint function(GLenum) pfglRenderMode;
7388 -typedef GLenum function() pfglGetError;
7389 -typedef GLchar* function(GLenum) pfglGetString;
7390 -typedef void function() pfglFinish;
7391 -typedef void function() pfglFlush;
7392 -typedef void function(GLenum,GLenum) pfglHint;
7393 +alias void function(GLclampd) pfglClearDepth;
7394 +alias void function(GLenum) pfglDepthFunc;
7395 +alias void function(GLboolean) pfglDepthMask;
7396 +alias void function(GLclampd,GLclampd) pfglDepthRange;
7398 -typedef void function(GLclampd) pfglClearDepth;
7399 -typedef void function(GLenum) pfglDepthFunc;
7400 -typedef void function(GLboolean) pfglDepthMask;
7401 -typedef void function(GLclampd,GLclampd) pfglDepthRange;
7402 +alias void function(GLfloat,GLfloat,GLfloat,GLfloat) pfglClearAccum;
7403 +alias void function(GLenum,GLfloat) pfglAccum;
7405 -typedef void function(GLfloat,GLfloat,GLfloat,GLfloat) pfglClearAccum;
7406 -typedef void function(GLenum,GLfloat) pfglAccum;
7407 +alias void function(GLenum) pfglMatrixMode;
7408 +alias void function(GLdouble,GLdouble,GLdouble,GLdouble,GLdouble,GLdouble) pfglOrtho;
7409 +alias void function(GLdouble,GLdouble,GLdouble,GLdouble,GLdouble,GLdouble) pfglFrustum;
7410 +alias void function(GLint,GLint,GLsizei,GLsizei) pfglViewport;
7411 +alias void function() pfglPushMatrix;
7412 +alias void function() pfglPopMatrix;
7413 +alias void function() pfglLoadIdentity;
7414 +alias void function(GLdouble*) pfglLoadMatrixd;
7415 +alias void function(GLfloat*) pfglLoadMatrixf;
7416 +alias void function(GLdouble*) pfglMultMatrixd;
7417 +alias void function(GLfloat*) pfglMultMatrixf;
7418 +alias void function(GLdouble,GLdouble,GLdouble,GLdouble) pfglRotated;
7419 +alias void function(GLfloat,GLfloat,GLfloat,GLfloat) pfglRotatef;
7420 +alias void function(GLdouble,GLdouble,GLdouble) pfglScaled;
7421 +alias void function(GLfloat,GLfloat,GLfloat) pfglScalef;
7422 +alias void function(GLdouble,GLdouble,GLdouble) pfglTranslated;
7423 +alias void function(GLfloat,GLfloat,GLfloat) pfglTranslatef;
7425 -typedef void function(GLenum) pfglMatrixMode;
7426 -typedef void function(GLdouble,GLdouble,GLdouble,GLdouble,GLdouble,GLdouble) pfglOrtho;
7427 -typedef void function(GLdouble,GLdouble,GLdouble,GLdouble,GLdouble,GLdouble) pfglFrustum;
7428 -typedef void function(GLint,GLint,GLsizei,GLsizei) pfglViewport;
7429 -typedef void function() pfglPushMatrix;
7430 -typedef void function() pfglPopMatrix;
7431 -typedef void function() pfglLoadIdentity;
7432 -typedef void function(GLdouble*) pfglLoadMatrixd;
7433 -typedef void function(GLfloat*) pfglLoadMatrixf;
7434 -typedef void function(GLdouble*) pfglMultMatrixd;
7435 -typedef void function(GLfloat*) pfglMultMatrixf;
7436 -typedef void function(GLdouble,GLdouble,GLdouble,GLdouble) pfglRotated;
7437 -typedef void function(GLfloat,GLfloat,GLfloat,GLfloat) pfglRotatef;
7438 -typedef void function(GLdouble,GLdouble,GLdouble) pfglScaled;
7439 -typedef void function(GLfloat,GLfloat,GLfloat) pfglScalef;
7440 -typedef void function(GLdouble,GLdouble,GLdouble) pfglTranslated;
7441 -typedef void function(GLfloat,GLfloat,GLfloat) pfglTranslatef;
7442 +alias GLboolean function(GLuint) pfglIsList;
7443 +alias void function(GLuint,GLsizei) pfglDeleteLists;
7444 +alias GLuint function(GLsizei) pfglGenLists;
7445 +alias void function(GLuint,GLenum) pfglNewList;
7446 +alias void function() pfglEndList;
7447 +alias void function(GLuint) pfglCallList;
7448 +alias void function(GLsizei,GLenum,GLvoid*) pfglCallLists;
7449 +alias void function(GLuint) pfglListBase;
7451 -typedef GLboolean function(GLuint) pfglIsList;
7452 -typedef void function(GLuint,GLsizei) pfglDeleteLists;
7453 -typedef GLuint function(GLsizei) pfglGenLists;
7454 -typedef void function(GLuint,GLenum) pfglNewList;
7455 -typedef void function() pfglEndList;
7456 -typedef void function(GLuint) pfglCallList;
7457 -typedef void function(GLsizei,GLenum,GLvoid*) pfglCallLists;
7458 -typedef void function(GLuint) pfglListBase;
7459 +alias void function(GLenum) pfglBegin;
7460 +alias void function() pfglEnd;
7461 +alias void function(GLdouble,GLdouble) pfglVertex2d;
7462 +alias void function(GLfloat,GLfloat) pfglVertex2f;
7463 +alias void function(GLint,GLint) pfglVertex2i;
7464 +alias void function(GLshort,GLshort) pfglVertex2s;
7465 +alias void function(GLdouble,GLdouble,GLdouble) pfglVertex3d;
7466 +alias void function(GLfloat,GLfloat,GLfloat) pfglVertex3f;
7467 +alias void function(GLint,GLint,GLint) pfglVertex3i;
7468 +alias void function(GLshort,GLshort,GLshort) pfglVertex3s;
7469 +alias void function(GLdouble,GLdouble,GLdouble,GLdouble) pfglVertex4d;
7470 +alias void function(GLfloat,GLfloat,GLfloat,GLfloat) pfglVertex4f;
7471 +alias void function(GLint,GLint,GLint,GLint) pfglVertex4i;
7472 +alias void function(GLshort,GLshort,GLshort,GLshort) pfglVertex4s;
7473 +alias void function(GLdouble*) pfglVertex2dv;
7474 +alias void function(GLfloat*) pfglVertex2fv;
7475 +alias void function(GLint*) pfglVertex2iv;
7476 +alias void function(GLshort*) pfglVertex2sv;
7477 +alias void function(GLdouble*) pfglVertex3dv;
7478 +alias void function(GLfloat*) pfglVertex3fv;
7479 +alias void function(GLint*) pfglVertex3iv;
7480 +alias void function(GLshort*) pfglVertex3sv;
7481 +alias void function(GLdouble*) pfglVertex4dv;
7482 +alias void function(GLfloat*) pfglVertex4fv;
7483 +alias void function(GLint*) pfglVertex4iv;
7484 +alias void function(GLshort*) pfglVertex4sv;
7485 +alias void function(GLbyte,GLbyte,GLbyte) pfglNormal3b;
7486 +alias void function(GLdouble,GLdouble,GLdouble) pfglNormal3d;
7487 +alias void function(GLfloat,GLfloat,GLfloat) pfglNormal3f;
7488 +alias void function(GLint,GLint,GLint) pfglNormal3i;
7489 +alias void function(GLshort,GLshort,GLshort) pfglNormal3s;
7490 +alias void function(GLbyte*) pfglNormal3bv;
7491 +alias void function(GLdouble*) pfglNormal3dv;
7492 +alias void function(GLfloat*) pfglNormal3fv;
7493 +alias void function(GLint*) pfglNormal3iv;
7494 +alias void function(GLshort*) pfglNormal3sv;
7495 +alias void function(GLdouble) pfglIndexd;
7496 +alias void function(GLfloat) pfglIndexf;
7497 +alias void function(GLint) pfglIndexi;
7498 +alias void function(GLshort) pfglIndexs;
7499 +alias void function(GLubyte) pfglIndexub;
7500 +alias void function(GLdouble*) pfglIndexdv;
7501 +alias void function(GLfloat*) pfglIndexfv;
7502 +alias void function(GLint*) pfglIndexiv;
7503 +alias void function(GLshort*) pfglIndexsv;
7504 +alias void function(GLubyte*) pfglIndexubv;
7505 +alias void function(GLbyte,GLbyte,GLbyte) pfglColor3b;
7506 +alias void function(GLdouble,GLdouble,GLdouble) pfglColor3d;
7507 +alias void function(GLfloat,GLfloat,GLfloat) pfglColor3f;
7508 +alias void function(GLint,GLint,GLint) pfglColor3i;
7509 +alias void function(GLshort,GLshort,GLshort) pfglColor3s;
7510 +alias void function(GLubyte,GLubyte,GLubyte) pfglColor3ub;
7511 +alias void function(GLuint,GLuint,GLuint) pfglColor3ui;
7512 +alias void function(GLushort,GLushort,GLushort) pfglColor3us;
7513 +alias void function(GLbyte,GLbyte,GLbyte,GLbyte) pfglColor4b;
7514 +alias void function(GLdouble,GLdouble,GLdouble,GLdouble) pfglColor4d;
7515 +alias void function(GLfloat,GLfloat,GLfloat,GLfloat) pfglColor4f;
7516 +alias void function(GLint,GLint,GLint,GLint) pfglColor4i;
7517 +alias void function(GLshort,GLshort,GLshort,GLshort) pfglColor4s;
7518 +alias void function(GLubyte,GLubyte,GLubyte,GLubyte) pfglColor4ub;
7519 +alias void function(GLuint,GLuint,GLuint,GLuint) pfglColor4ui;
7520 +alias void function(GLushort,GLushort,GLushort,GLushort) pfglColor4us;
7521 +alias void function(GLbyte*) pfglColor3bv;
7522 +alias void function(GLdouble*) pfglColor3dv;
7523 +alias void function(GLfloat*) pfglColor3fv;
7524 +alias void function(GLint*) pfglColor3iv;
7525 +alias void function(GLshort*) pfglColor3sv;
7526 +alias void function(GLubyte*) pfglColor3ubv;
7527 +alias void function(GLuint*) pfglColor3uiv;
7528 +alias void function(GLushort*) pfglColor3usv;
7529 +alias void function(GLbyte*) pfglColor4bv;
7530 +alias void function(GLdouble*) pfglColor4dv;
7531 +alias void function(GLfloat*) pfglColor4fv;
7532 +alias void function(GLint*) pfglColor4iv;
7533 +alias void function(GLshort*) pfglColor4sv;
7534 +alias void function(GLubyte*) pfglColor4ubv;
7535 +alias void function(GLuint*) pfglColor4uiv;
7536 +alias void function(GLushort) pfglColor4usv;
7537 +alias void function(GLdouble) pfglTexCoord1d;
7538 +alias void function(GLfloat) pfglTexCoord1f;
7539 +alias void function(GLint) pfglTexCoord1i;
7540 +alias void function(GLshort) pfglTexCoord1s;
7541 +alias void function(GLdouble,GLdouble) pfglTexCoord2d;
7542 +alias void function(GLfloat,GLfloat) pfglTexCoord2f;
7543 +alias void function(GLint,GLint) pfglTexCoord2i;
7544 +alias void function(GLshort,GLshort) pfglTexCoord2s;
7545 +alias void function(GLdouble,GLdouble,GLdouble) pfglTexCoord3d;
7546 +alias void function(GLfloat,GLfloat,GLfloat) pfglTexCoord3f;
7547 +alias void function(GLint,GLint,GLint) pfglTexCoord3i;
7548 +alias void function(GLshort,GLshort,GLshort) pfglTexCoord3s;
7549 +alias void function(GLdouble,GLdouble,GLdouble,GLdouble) pfglTexCoord4d;
7550 +alias void function(GLfloat,GLfloat,GLfloat,GLfloat) pfglTexCoord4f;
7551 +alias void function(GLint,GLint,GLint,GLint) pfglTexCoord4i;
7552 +alias void function(GLshort,GLshort,GLshort,GLshort) pfglTexCoord4s;
7553 +alias void function(GLdouble*) pfglTexCoord1dv;
7554 +alias void function(GLfloat*) pfglTexCoord1fv;
7555 +alias void function(GLint*) pfglTexCoord1iv;
7556 +alias void function(GLshort*) pfglTexCoord1sv;
7557 +alias void function(GLdouble*) pfglTexCoord2dv;
7558 +alias void function(GLfloat*) pfglTexCoord2fv;
7559 +alias void function(GLint*) pfglTexCoord2iv;
7560 +alias void function(GLshort*) pfglTexCoord2sv;
7561 +alias void function(GLdouble*) pfglTexCoord3dv;
7562 +alias void function(GLfloat*) pfglTexCoord3fv;
7563 +alias void function(GLint*) pfglTexCoord3iv;
7564 +alias void function(GLshort*) pfglTexCoord3sv;
7565 +alias void function(GLdouble*) pfglTexCoord4dv;
7566 +alias void function(GLfloat*) pfglTexCoord4fv;
7567 +alias void function(GLint*) pfglTexCoord4iv;
7568 +alias void function(GLshort*) pfglTexCoord4sv;
7569 +alias void function(GLdouble,GLdouble) pfglRasterPos2d;
7570 +alias void function(GLfloat,GLfloat) pfglRasterPos2f;
7571 +alias void function(GLint,GLint) pfglRasterPos2i;
7572 +alias void function(GLshort,GLshort) pfglRasterPos2s;
7573 +alias void function(GLdouble,GLdouble,GLdouble) pfglRasterPos3d;
7574 +alias void function(GLfloat,GLfloat,GLfloat) pfglRasterPos3f;
7575 +alias void function(GLint,GLint,GLint) pfglRasterPos3i;
7576 +alias void function(GLshort,GLshort,GLshort) pfglRasterPos3s;
7577 +alias void function(GLdouble,GLdouble,GLdouble,GLdouble) pfglRasterPos4d;
7578 +alias void function(GLfloat,GLfloat,GLfloat,GLfloat) pfglRasterPos4f;
7579 +alias void function(GLint,GLint,GLint,GLint) pfglRasterPos4i;
7580 +alias void function(GLshort,GLshort,GLshort,GLshort) pfglRasterPos4s;
7581 +alias void function(GLdouble*) pfglRasterPos2dv;
7582 +alias void function(GLfloat*) pfglRasterPos2fv;
7583 +alias void function(GLint*) pfglRasterPos2iv;
7584 +alias void function(GLshort*) pfglRasterPos2sv;
7585 +alias void function(GLdouble*) pfglRasterPos3dv;
7586 +alias void function(GLfloat*) pfglRasterPos3fv;
7587 +alias void function(GLint*) pfglRasterPos3iv;
7588 +alias void function(GLshort*) pfglRasterPos3sv;
7589 +alias void function(GLdouble*) pfglRasterPos4dv;
7590 +alias void function(GLfloat*) pfglRasterPos4fv;
7591 +alias void function(GLint*) pfglRasterPos4iv;
7592 +alias void function(GLshort*) pfglRasterPos4sv;
7593 +alias void function(GLdouble,GLdouble,GLdouble,GLdouble) pfglRectd;
7594 +alias void function(GLfloat,GLfloat,GLfloat,GLfloat) pfglRectf;
7595 +alias void function(GLint,GLint,GLint,GLint) pfglRecti;
7596 +alias void function(GLshort,GLshort,GLshort,GLshort) pfglRects;
7597 +alias void function(GLdouble*) pfglRectdv;
7598 +alias void function(GLfloat*) pfglRectfv;
7599 +alias void function(GLint*) pfglRectiv;
7600 +alias void function(GLshort*) pfglRectsv;
7602 -typedef void function(GLenum) pfglBegin;
7603 -typedef void function() pfglEnd;
7604 -typedef void function(GLdouble,GLdouble) pfglVertex2d;
7605 -typedef void function(GLfloat,GLfloat) pfglVertex2f;
7606 -typedef void function(GLint,GLint) pfglVertex2i;
7607 -typedef void function(GLshort,GLshort) pfglVertex2s;
7608 -typedef void function(GLdouble,GLdouble,GLdouble) pfglVertex3d;
7609 -typedef void function(GLfloat,GLfloat,GLfloat) pfglVertex3f;
7610 -typedef void function(GLint,GLint,GLint) pfglVertex3i;
7611 -typedef void function(GLshort,GLshort,GLshort) pfglVertex3s;
7612 -typedef void function(GLdouble,GLdouble,GLdouble,GLdouble) pfglVertex4d;
7613 -typedef void function(GLfloat,GLfloat,GLfloat,GLfloat) pfglVertex4f;
7614 -typedef void function(GLint,GLint,GLint,GLint) pfglVertex4i;
7615 -typedef void function(GLshort,GLshort,GLshort,GLshort) pfglVertex4s;
7616 -typedef void function(GLdouble*) pfglVertex2dv;
7617 -typedef void function(GLfloat*) pfglVertex2fv;
7618 -typedef void function(GLint*) pfglVertex2iv;
7619 -typedef void function(GLshort*) pfglVertex2sv;
7620 -typedef void function(GLdouble*) pfglVertex3dv;
7621 -typedef void function(GLfloat*) pfglVertex3fv;
7622 -typedef void function(GLint*) pfglVertex3iv;
7623 -typedef void function(GLshort*) pfglVertex3sv;
7624 -typedef void function(GLdouble*) pfglVertex4dv;
7625 -typedef void function(GLfloat*) pfglVertex4fv;
7626 -typedef void function(GLint*) pfglVertex4iv;
7627 -typedef void function(GLshort*) pfglVertex4sv;
7628 -typedef void function(GLbyte,GLbyte,GLbyte) pfglNormal3b;
7629 -typedef void function(GLdouble,GLdouble,GLdouble) pfglNormal3d;
7630 -typedef void function(GLfloat,GLfloat,GLfloat) pfglNormal3f;
7631 -typedef void function(GLint,GLint,GLint) pfglNormal3i;
7632 -typedef void function(GLshort,GLshort,GLshort) pfglNormal3s;
7633 -typedef void function(GLbyte*) pfglNormal3bv;
7634 -typedef void function(GLdouble*) pfglNormal3dv;
7635 -typedef void function(GLfloat*) pfglNormal3fv;
7636 -typedef void function(GLint*) pfglNormal3iv;
7637 -typedef void function(GLshort*) pfglNormal3sv;
7638 -typedef void function(GLdouble) pfglIndexd;
7639 -typedef void function(GLfloat) pfglIndexf;
7640 -typedef void function(GLint) pfglIndexi;
7641 -typedef void function(GLshort) pfglIndexs;
7642 -typedef void function(GLubyte) pfglIndexub;
7643 -typedef void function(GLdouble*) pfglIndexdv;
7644 -typedef void function(GLfloat*) pfglIndexfv;
7645 -typedef void function(GLint*) pfglIndexiv;
7646 -typedef void function(GLshort*) pfglIndexsv;
7647 -typedef void function(GLubyte*) pfglIndexubv;
7648 -typedef void function(GLbyte,GLbyte,GLbyte) pfglColor3b;
7649 -typedef void function(GLdouble,GLdouble,GLdouble) pfglColor3d;
7650 -typedef void function(GLfloat,GLfloat,GLfloat) pfglColor3f;
7651 -typedef void function(GLint,GLint,GLint) pfglColor3i;
7652 -typedef void function(GLshort,GLshort,GLshort) pfglColor3s;
7653 -typedef void function(GLubyte,GLubyte,GLubyte) pfglColor3ub;
7654 -typedef void function(GLuint,GLuint,GLuint) pfglColor3ui;
7655 -typedef void function(GLushort,GLushort,GLushort) pfglColor3us;
7656 -typedef void function(GLbyte,GLbyte,GLbyte,GLbyte) pfglColor4b;
7657 -typedef void function(GLdouble,GLdouble,GLdouble,GLdouble) pfglColor4d;
7658 -typedef void function(GLfloat,GLfloat,GLfloat,GLfloat) pfglColor4f;
7659 -typedef void function(GLint,GLint,GLint,GLint) pfglColor4i;
7660 -typedef void function(GLshort,GLshort,GLshort,GLshort) pfglColor4s;
7661 -typedef void function(GLubyte,GLubyte,GLubyte,GLubyte) pfglColor4ub;
7662 -typedef void function(GLuint,GLuint,GLuint,GLuint) pfglColor4ui;
7663 -typedef void function(GLushort,GLushort,GLushort,GLushort) pfglColor4us;
7664 -typedef void function(GLbyte*) pfglColor3bv;
7665 -typedef void function(GLdouble*) pfglColor3dv;
7666 -typedef void function(GLfloat*) pfglColor3fv;
7667 -typedef void function(GLint*) pfglColor3iv;
7668 -typedef void function(GLshort*) pfglColor3sv;
7669 -typedef void function(GLubyte*) pfglColor3ubv;
7670 -typedef void function(GLuint*) pfglColor3uiv;
7671 -typedef void function(GLushort*) pfglColor3usv;
7672 -typedef void function(GLbyte*) pfglColor4bv;
7673 -typedef void function(GLdouble*) pfglColor4dv;
7674 -typedef void function(GLfloat*) pfglColor4fv;
7675 -typedef void function(GLint*) pfglColor4iv;
7676 -typedef void function(GLshort*) pfglColor4sv;
7677 -typedef void function(GLubyte*) pfglColor4ubv;
7678 -typedef void function(GLuint*) pfglColor4uiv;
7679 -typedef void function(GLushort) pfglColor4usv;
7680 -typedef void function(GLdouble) pfglTexCoord1d;
7681 -typedef void function(GLfloat) pfglTexCoord1f;
7682 -typedef void function(GLint) pfglTexCoord1i;
7683 -typedef void function(GLshort) pfglTexCoord1s;
7684 -typedef void function(GLdouble,GLdouble) pfglTexCoord2d;
7685 -typedef void function(GLfloat,GLfloat) pfglTexCoord2f;
7686 -typedef void function(GLint,GLint) pfglTexCoord2i;
7687 -typedef void function(GLshort,GLshort) pfglTexCoord2s;
7688 -typedef void function(GLdouble,GLdouble,GLdouble) pfglTexCoord3d;
7689 -typedef void function(GLfloat,GLfloat,GLfloat) pfglTexCoord3f;
7690 -typedef void function(GLint,GLint,GLint) pfglTexCoord3i;
7691 -typedef void function(GLshort,GLshort,GLshort) pfglTexCoord3s;
7692 -typedef void function(GLdouble,GLdouble,GLdouble,GLdouble) pfglTexCoord4d;
7693 -typedef void function(GLfloat,GLfloat,GLfloat,GLfloat) pfglTexCoord4f;
7694 -typedef void function(GLint,GLint,GLint,GLint) pfglTexCoord4i;
7695 -typedef void function(GLshort,GLshort,GLshort,GLshort) pfglTexCoord4s;
7696 -typedef void function(GLdouble*) pfglTexCoord1dv;
7697 -typedef void function(GLfloat*) pfglTexCoord1fv;
7698 -typedef void function(GLint*) pfglTexCoord1iv;
7699 -typedef void function(GLshort*) pfglTexCoord1sv;
7700 -typedef void function(GLdouble*) pfglTexCoord2dv;
7701 -typedef void function(GLfloat*) pfglTexCoord2fv;
7702 -typedef void function(GLint*) pfglTexCoord2iv;
7703 -typedef void function(GLshort*) pfglTexCoord2sv;
7704 -typedef void function(GLdouble*) pfglTexCoord3dv;
7705 -typedef void function(GLfloat*) pfglTexCoord3fv;
7706 -typedef void function(GLint*) pfglTexCoord3iv;
7707 -typedef void function(GLshort*) pfglTexCoord3sv;
7708 -typedef void function(GLdouble*) pfglTexCoord4dv;
7709 -typedef void function(GLfloat*) pfglTexCoord4fv;
7710 -typedef void function(GLint*) pfglTexCoord4iv;
7711 -typedef void function(GLshort*) pfglTexCoord4sv;
7712 -typedef void function(GLdouble,GLdouble) pfglRasterPos2d;
7713 -typedef void function(GLfloat,GLfloat) pfglRasterPos2f;
7714 -typedef void function(GLint,GLint) pfglRasterPos2i;
7715 -typedef void function(GLshort,GLshort) pfglRasterPos2s;
7716 -typedef void function(GLdouble,GLdouble,GLdouble) pfglRasterPos3d;
7717 -typedef void function(GLfloat,GLfloat,GLfloat) pfglRasterPos3f;
7718 -typedef void function(GLint,GLint,GLint) pfglRasterPos3i;
7719 -typedef void function(GLshort,GLshort,GLshort) pfglRasterPos3s;
7720 -typedef void function(GLdouble,GLdouble,GLdouble,GLdouble) pfglRasterPos4d;
7721 -typedef void function(GLfloat,GLfloat,GLfloat,GLfloat) pfglRasterPos4f;
7722 -typedef void function(GLint,GLint,GLint,GLint) pfglRasterPos4i;
7723 -typedef void function(GLshort,GLshort,GLshort,GLshort) pfglRasterPos4s;
7724 -typedef void function(GLdouble*) pfglRasterPos2dv;
7725 -typedef void function(GLfloat*) pfglRasterPos2fv;
7726 -typedef void function(GLint*) pfglRasterPos2iv;
7727 -typedef void function(GLshort*) pfglRasterPos2sv;
7728 -typedef void function(GLdouble*) pfglRasterPos3dv;
7729 -typedef void function(GLfloat*) pfglRasterPos3fv;
7730 -typedef void function(GLint*) pfglRasterPos3iv;
7731 -typedef void function(GLshort*) pfglRasterPos3sv;
7732 -typedef void function(GLdouble*) pfglRasterPos4dv;
7733 -typedef void function(GLfloat*) pfglRasterPos4fv;
7734 -typedef void function(GLint*) pfglRasterPos4iv;
7735 -typedef void function(GLshort*) pfglRasterPos4sv;
7736 -typedef void function(GLdouble,GLdouble,GLdouble,GLdouble) pfglRectd;
7737 -typedef void function(GLfloat,GLfloat,GLfloat,GLfloat) pfglRectf;
7738 -typedef void function(GLint,GLint,GLint,GLint) pfglRecti;
7739 -typedef void function(GLshort,GLshort,GLshort,GLshort) pfglRects;
7740 -typedef void function(GLdouble*) pfglRectdv;
7741 -typedef void function(GLfloat*) pfglRectfv;
7742 -typedef void function(GLint*) pfglRectiv;
7743 -typedef void function(GLshort*) pfglRectsv;
7744 +alias void function(GLenum) pfglShadeModel;
7745 +alias void function(GLenum,GLenum,GLfloat) pfglLightf;
7746 +alias void function(GLenum,GLenum,GLint) pfglLighti;
7747 +alias void function(GLenum,GLenum,GLfloat*) pfglLightfv;
7748 +alias void function(GLenum,GLenum,GLint*) pfglLightiv;
7749 +alias void function(GLenum,GLenum,GLfloat*) pfglGetLightfv;
7750 +alias void function(GLenum,GLenum,GLint*) pfglGetLightiv;
7751 +alias void function(GLenum,GLfloat) pfglLightModelf;
7752 +alias void function(GLenum,GLint) pfglLightModeli;
7753 +alias void function(GLenum,GLfloat*) pfglLightModelfv;
7754 +alias void function(GLenum,GLint*) pfglLightModeliv;
7755 +alias void function(GLenum,GLenum,GLfloat) pfglMaterialf;
7756 +alias void function(GLenum,GLenum,GLint) pfglMateriali;
7757 +alias void function(GLenum,GLenum,GLfloat*) pfglMaterialfv;
7758 +alias void function(GLenum,GLenum,GLint*) pfglMaterialiv;
7759 +alias void function(GLenum,GLenum,GLfloat*) pfglGetMaterialfv;
7760 +alias void function(GLenum,GLenum,GLint*) pfglGetMaterialiv;
7761 +alias void function(GLenum,GLenum) pfglColorMaterial;
7763 -typedef void function(GLenum) pfglShadeModel;
7764 -typedef void function(GLenum,GLenum,GLfloat) pfglLightf;
7765 -typedef void function(GLenum,GLenum,GLint) pfglLighti;
7766 -typedef void function(GLenum,GLenum,GLfloat*) pfglLightfv;
7767 -typedef void function(GLenum,GLenum,GLint*) pfglLightiv;
7768 -typedef void function(GLenum,GLenum,GLfloat*) pfglGetLightfv;
7769 -typedef void function(GLenum,GLenum,GLint*) pfglGetLightiv;
7770 -typedef void function(GLenum,GLfloat) pfglLightModelf;
7771 -typedef void function(GLenum,GLint) pfglLightModeli;
7772 -typedef void function(GLenum,GLfloat*) pfglLightModelfv;
7773 -typedef void function(GLenum,GLint*) pfglLightModeliv;
7774 -typedef void function(GLenum,GLenum,GLfloat) pfglMaterialf;
7775 -typedef void function(GLenum,GLenum,GLint) pfglMateriali;
7776 -typedef void function(GLenum,GLenum,GLfloat*) pfglMaterialfv;
7777 -typedef void function(GLenum,GLenum,GLint*) pfglMaterialiv;
7778 -typedef void function(GLenum,GLenum,GLfloat*) pfglGetMaterialfv;
7779 -typedef void function(GLenum,GLenum,GLint*) pfglGetMaterialiv;
7780 -typedef void function(GLenum,GLenum) pfglColorMaterial;
7781 +alias void function(GLfloat,GLfloat) pfglPixelZoom;
7782 +alias void function(GLenum,GLfloat) pfglPixelStoref;
7783 +alias void function(GLenum,GLint) pfglPixelStorei;
7784 +alias void function(GLenum,GLfloat) pfglPixelTransferf;
7785 +alias void function(GLenum,GLint) pfglPixelTransferi;
7786 +alias void function(GLenum,GLint,GLfloat*) pfglPixelMapfv;
7787 +alias void function(GLenum,GLint,GLuint*) pfglPixelMapuiv;
7788 +alias void function(GLenum,GLint,GLushort*) pfglPixelMapusv;
7789 +alias void function(GLenum,GLfloat*) pfglGetPixelMapfv;
7790 +alias void function(GLenum,GLuint*) pfglGetPixelMapuiv;
7791 +alias void function(GLenum,GLushort*) pfglGetPixelMapusv;
7792 +alias void function(GLsizei,GLsizei,GLfloat,GLfloat,GLfloat,GLfloat,GLubyte*) pfglBitmap;
7793 +alias void function(GLint,GLint,GLsizei,GLsizei,GLenum,GLenum,GLvoid*) pfglReadPixels;
7794 +alias void function(GLsizei,GLsizei,GLenum,GLenum,GLvoid*) pfglDrawPixels;
7795 +alias void function(GLint,GLint,GLsizei,GLsizei,GLenum) pfglCopyPixels;
7797 -typedef void function(GLfloat,GLfloat) pfglPixelZoom;
7798 -typedef void function(GLenum,GLfloat) pfglPixelStoref;
7799 -typedef void function(GLenum,GLint) pfglPixelStorei;
7800 -typedef void function(GLenum,GLfloat) pfglPixelTransferf;
7801 -typedef void function(GLenum,GLint) pfglPixelTransferi;
7802 -typedef void function(GLenum,GLint,GLfloat*) pfglPixelMapfv;
7803 -typedef void function(GLenum,GLint,GLuint*) pfglPixelMapuiv;
7804 -typedef void function(GLenum,GLint,GLushort*) pfglPixelMapusv;
7805 -typedef void function(GLenum,GLfloat*) pfglGetPixelMapfv;
7806 -typedef void function(GLenum,GLuint*) pfglGetPixelMapuiv;
7807 -typedef void function(GLenum,GLushort*) pfglGetPixelMapusv;
7808 -typedef void function(GLsizei,GLsizei,GLfloat,GLfloat,GLfloat,GLfloat,GLubyte*) pfglBitmap;
7809 -typedef void function(GLint,GLint,GLsizei,GLsizei,GLenum,GLenum,GLvoid*) pfglReadPixels;
7810 -typedef void function(GLsizei,GLsizei,GLenum,GLenum,GLvoid*) pfglDrawPixels;
7811 -typedef void function(GLint,GLint,GLsizei,GLsizei,GLenum) pfglCopyPixels;
7812 +alias void function(GLenum,GLint,GLuint) pfglStencilFunc;
7813 +alias void function(GLuint) pfglStencilMask;
7814 +alias void function(GLenum,GLenum,GLenum) pfglStencilOp;
7815 +alias void function(GLint) pfglClearStencil;
7817 -typedef void function(GLenum,GLint,GLuint) pfglStencilFunc;
7818 -typedef void function(GLuint) pfglStencilMask;
7819 -typedef void function(GLenum,GLenum,GLenum) pfglStencilOp;
7820 -typedef void function(GLint) pfglClearStencil;
7821 +alias void function(GLenum,GLenum,GLdouble) pfglTexGend;
7822 +alias void function(GLenum,GLenum,GLfloat) pfglTexGenf;
7823 +alias void function(GLenum,GLenum,GLint) pfglTexGeni;
7824 +alias void function(GLenum,GLenum,GLdouble*) pfglTexGendv;
7825 +alias void function(GLenum,GLenum,GLfloat*) pfglTexGenfv;
7826 +alias void function(GLenum,GLenum,GLint*) pfglTexGeniv;
7827 +alias void function(GLenum,GLenum,GLdouble*) pfglGetTexGendv;
7828 +alias void function(GLenum,GLenum,GLfloat*) pfglGetTexGenfv;
7829 +alias void function(GLenum,GLenum,GLint*) pfglGetTexGeniv;
7830 +alias void function(GLenum,GLenum,GLfloat) pfglTexEnvf;
7831 +alias void function(GLenum,GLenum,GLint) pfglTexEnvi;
7832 +alias void function(GLenum,GLenum,GLfloat*) pfglTexEnvfv;
7833 +alias void function(GLenum,GLenum,GLint*) pfglTexEnviv;
7834 +alias void function(GLenum,GLenum,GLfloat*) pfglGetTexEnvfv;
7835 +alias void function(GLenum,GLenum,GLint*) pfglGetTexEnviv;
7836 +alias void function(GLenum,GLenum,GLfloat) pfglTexParameterf;
7837 +alias void function(GLenum,GLenum,GLint) pfglTexParameteri;
7838 +alias void function(GLenum,GLenum,GLfloat*) pfglTexParameterfv;
7839 +alias void function(GLenum,GLenum,GLint*) pfglTexParameteriv;
7840 +alias void function(GLenum,GLenum,GLfloat*) pfglGetTexParameterfv;
7841 +alias void function(GLenum,GLenum,GLint*) pfglGetTexParameteriv;
7842 +alias void function(GLenum,GLint,GLenum,GLfloat*) pfglGetTexLevelParameterfv;
7843 +alias void function(GLenum,GLint,GLenum,GLint*) pfglGetTexLevelParameteriv;
7844 +alias void function(GLenum,GLint,GLint,GLsizei,GLint,GLenum,GLenum,GLvoid*) pfglTexImage1D;
7845 +alias void function(GLenum,GLint,GLint,GLsizei,GLsizei,GLint,GLenum,GLenum,GLvoid*) pfglTexImage2D;
7846 +alias void function(GLenum,GLint,GLenum,GLenum,GLvoid*) pfglGetTexImage;
7848 -typedef void function(GLenum,GLenum,GLdouble) pfglTexGend;
7849 -typedef void function(GLenum,GLenum,GLfloat) pfglTexGenf;
7850 -typedef void function(GLenum,GLenum,GLint) pfglTexGeni;
7851 -typedef void function(GLenum,GLenum,GLdouble*) pfglTexGendv;
7852 -typedef void function(GLenum,GLenum,GLfloat*) pfglTexGenfv;
7853 -typedef void function(GLenum,GLenum,GLint*) pfglTexGeniv;
7854 -typedef void function(GLenum,GLenum,GLdouble*) pfglGetTexGendv;
7855 -typedef void function(GLenum,GLenum,GLfloat*) pfglGetTexGenfv;
7856 -typedef void function(GLenum,GLenum,GLint*) pfglGetTexGeniv;
7857 -typedef void function(GLenum,GLenum,GLfloat) pfglTexEnvf;
7858 -typedef void function(GLenum,GLenum,GLint) pfglTexEnvi;
7859 -typedef void function(GLenum,GLenum,GLfloat*) pfglTexEnvfv;
7860 -typedef void function(GLenum,GLenum,GLint*) pfglTexEnviv;
7861 -typedef void function(GLenum,GLenum,GLfloat*) pfglGetTexEnvfv;
7862 -typedef void function(GLenum,GLenum,GLint*) pfglGetTexEnviv;
7863 -typedef void function(GLenum,GLenum,GLfloat) pfglTexParameterf;
7864 -typedef void function(GLenum,GLenum,GLint) pfglTexParameteri;
7865 -typedef void function(GLenum,GLenum,GLfloat*) pfglTexParameterfv;
7866 -typedef void function(GLenum,GLenum,GLint*) pfglTexParameteriv;
7867 -typedef void function(GLenum,GLenum,GLfloat*) pfglGetTexParameterfv;
7868 -typedef void function(GLenum,GLenum,GLint*) pfglGetTexParameteriv;
7869 -typedef void function(GLenum,GLint,GLenum,GLfloat*) pfglGetTexLevelParameterfv;
7870 -typedef void function(GLenum,GLint,GLenum,GLint*) pfglGetTexLevelParameteriv;
7871 -typedef void function(GLenum,GLint,GLint,GLsizei,GLint,GLenum,GLenum,GLvoid*) pfglTexImage1D;
7872 -typedef void function(GLenum,GLint,GLint,GLsizei,GLsizei,GLint,GLenum,GLenum,GLvoid*) pfglTexImage2D;
7873 -typedef void function(GLenum,GLint,GLenum,GLenum,GLvoid*) pfglGetTexImage;
7874 +alias void function(GLenum,GLdouble,GLdouble,GLint,GLint,GLdouble*) pfglMap1d;
7875 +alias void function(GLenum,GLfloat,GLfloat,GLint,GLint,GLfloat*) pfglMap1f;
7876 +alias void function(GLenum,GLdouble,GLdouble,GLint,GLint,GLdouble,GLdouble,GLint,GLint,GLdouble*) pfglMap2d;
7877 +alias void function(GLenum,GLfloat,GLfloat,GLint,GLint,GLfloat,GLfloat,GLint,GLint,GLfloat*) pfglMap2f;
7878 +alias void function(GLenum,GLenum,GLdouble*) pfglGetMapdv;
7879 +alias void function(GLenum,GLenum,GLfloat*) pfglGetMapfv;
7880 +alias void function(GLenum,GLenum,GLint*) pfglGetMapiv;
7881 +alias void function(GLdouble) pfglEvalCoord1d;
7882 +alias void function(GLfloat) pfglEvalCoord1f;
7883 +alias void function(GLdouble*) pfglEvalCoord1dv;
7884 +alias void function(GLfloat*) pfglEvalCoord1fv;
7885 +alias void function(GLdouble,GLdouble) pfglEvalCoord2d;
7886 +alias void function(GLfloat,GLfloat) pfglEvalCoord2f;
7887 +alias void function(GLdouble*) pfglEvalCoord2dv;
7888 +alias void function(GLfloat*) pfglEvalCoord2fv;
7889 +alias void function(GLint,GLdouble,GLdouble) pfglMapGrid1d;
7890 +alias void function(GLint,GLfloat,GLfloat) pfglMapGrid1f;
7891 +alias void function(GLint,GLdouble,GLdouble,GLint,GLdouble,GLdouble) pfglMapGrid2d;
7892 +alias void function(GLint,GLfloat,GLfloat,GLint,GLfloat,GLfloat) pfglMapGrid2f;
7893 +alias void function(GLint) pfglEvalPoint1;
7894 +alias void function(GLint,GLint) pfglEvalPoint2;
7895 +alias void function(GLenum,GLint,GLint) pfglEvalMesh1;
7896 +alias void function(GLenum,GLint,GLint,GLint,GLint) pfglEvalMesh2;
7898 -typedef void function(GLenum,GLdouble,GLdouble,GLint,GLint,GLdouble*) pfglMap1d;
7899 -typedef void function(GLenum,GLfloat,GLfloat,GLint,GLint,GLfloat*) pfglMap1f;
7900 -typedef void function(GLenum,GLdouble,GLdouble,GLint,GLint,GLdouble,GLdouble,GLint,GLint,GLdouble*) pfglMap2d;
7901 -typedef void function(GLenum,GLfloat,GLfloat,GLint,GLint,GLfloat,GLfloat,GLint,GLint,GLfloat*) pfglMap2f;
7902 -typedef void function(GLenum,GLenum,GLdouble*) pfglGetMapdv;
7903 -typedef void function(GLenum,GLenum,GLfloat*) pfglGetMapfv;
7904 -typedef void function(GLenum,GLenum,GLint*) pfglGetMapiv;
7905 -typedef void function(GLdouble) pfglEvalCoord1d;
7906 -typedef void function(GLfloat) pfglEvalCoord1f;
7907 -typedef void function(GLdouble*) pfglEvalCoord1dv;
7908 -typedef void function(GLfloat*) pfglEvalCoord1fv;
7909 -typedef void function(GLdouble,GLdouble) pfglEvalCoord2d;
7910 -typedef void function(GLfloat,GLfloat) pfglEvalCoord2f;
7911 -typedef void function(GLdouble*) pfglEvalCoord2dv;
7912 -typedef void function(GLfloat*) pfglEvalCoord2fv;
7913 -typedef void function(GLint,GLdouble,GLdouble) pfglMapGrid1d;
7914 -typedef void function(GLint,GLfloat,GLfloat) pfglMapGrid1f;
7915 -typedef void function(GLint,GLdouble,GLdouble,GLint,GLdouble,GLdouble) pfglMapGrid2d;
7916 -typedef void function(GLint,GLfloat,GLfloat,GLint,GLfloat,GLfloat) pfglMapGrid2f;
7917 -typedef void function(GLint) pfglEvalPoint1;
7918 -typedef void function(GLint,GLint) pfglEvalPoint2;
7919 -typedef void function(GLenum,GLint,GLint) pfglEvalMesh1;
7920 -typedef void function(GLenum,GLint,GLint,GLint,GLint) pfglEvalMesh2;
7921 +alias void function(GLenum,GLfloat) pfglFogf;
7922 +alias void function(GLenum,GLint) pfglFogi;
7923 +alias void function(GLenum,GLfloat*) pfglFogfv;
7924 +alias void function(GLenum,GLint*) pfglFogiv;
7926 -typedef void function(GLenum,GLfloat) pfglFogf;
7927 -typedef void function(GLenum,GLint) pfglFogi;
7928 -typedef void function(GLenum,GLfloat*) pfglFogfv;
7929 -typedef void function(GLenum,GLint*) pfglFogiv;
7930 +alias void function(GLsizei,GLenum,GLfloat*) pfglFeedbackBuffer;
7931 +alias void function(GLfloat) pfglPassThrough;
7932 +alias void function(GLsizei,GLuint*) pfglSelectBuffer;
7933 +alias void function() pfglInitNames;
7934 +alias void function(GLuint) pfglLoadName;
7935 +alias void function(GLuint) pfglPushName;
7936 +alias void function() pfglPopName;
7938 -typedef void function(GLsizei,GLenum,GLfloat*) pfglFeedbackBuffer;
7939 -typedef void function(GLfloat) pfglPassThrough;
7940 -typedef void function(GLsizei,GLuint*) pfglSelectBuffer;
7941 -typedef void function() pfglInitNames;
7942 -typedef void function(GLuint) pfglLoadName;
7943 -typedef void function(GLuint) pfglPushName;
7944 -typedef void function() pfglPopName;
7945 +alias void function(GLsizei,GLuint*) pfglGenTextures;
7946 +alias void function(GLsizei,GLuint*) pfglDeleteTextures;
7947 +alias void function(GLenum,GLuint) pfglBindTexture;
7948 +alias void function(GLsizei,GLuint*,GLclampf*) pfglPrioritizeTextures;
7949 +alias GLboolean function(GLsizei,GLuint*,GLboolean*) pfglAreTexturesResident;
7950 +alias GLboolean function(GLuint) pfglIsTexture;
7952 -typedef void function(GLsizei,GLuint*) pfglGenTextures;
7953 -typedef void function(GLsizei,GLuint*) pfglDeleteTextures;
7954 -typedef void function(GLenum,GLuint) pfglBindTexture;
7955 -typedef void function(GLsizei,GLuint*,GLclampf*) pfglPrioritizeTextures;
7956 -typedef GLboolean function(GLsizei,GLuint*,GLboolean*) pfglAreTexturesResident;
7957 -typedef GLboolean function(GLuint) pfglIsTexture;
7958 +alias void function(GLenum,GLint,GLint,GLsizei,GLenum,GLenum,GLvoid*) pfglTexSubImage1D;
7959 +alias void function(GLenum,GLint,GLint,GLint,GLsizei,GLsizei,GLenum,GLenum,GLvoid*) pfglTexSubImage2D;
7960 +alias void function(GLenum,GLint,GLenum,GLint,GLint,GLsizei,GLint) pfglCopyTexImage1D;
7961 +alias void function(GLenum,GLint,GLenum,GLint,GLint,GLsizei,GLsizei,GLint) pfglCopyTexImage2D;
7962 +alias void function(GLenum,GLint,GLint,GLint,GLint,GLsizei) pfglCopyTexSubImage1D;
7963 +alias void function(GLenum,GLint,GLint,GLint,GLint,GLint,GLsizei,GLsizei) pfglCopyTexSubImage2D;
7965 -typedef void function(GLenum,GLint,GLint,GLsizei,GLenum,GLenum,GLvoid*) pfglTexSubImage1D;
7966 -typedef void function(GLenum,GLint,GLint,GLint,GLsizei,GLsizei,GLenum,GLenum,GLvoid*) pfglTexSubImage2D;
7967 -typedef void function(GLenum,GLint,GLenum,GLint,GLint,GLsizei,GLint) pfglCopyTexImage1D;
7968 -typedef void function(GLenum,GLint,GLenum,GLint,GLint,GLsizei,GLsizei,GLint) pfglCopyTexImage2D;
7969 -typedef void function(GLenum,GLint,GLint,GLint,GLint,GLsizei) pfglCopyTexSubImage1D;
7970 -typedef void function(GLenum,GLint,GLint,GLint,GLint,GLint,GLsizei,GLsizei) pfglCopyTexSubImage2D;
7971 +alias void function(GLint,GLenum,GLsizei,GLvoid*) pfglVertexPointer;
7972 +alias void function(GLenum,GLsizei,GLvoid*) pfglNormalPointer;
7973 +alias void function(GLint,GLenum,GLsizei,GLvoid*) pfglColorPointer;
7974 +alias void function(GLenum,GLsizei,GLvoid*) pfglIndexPointer;
7975 +alias void function(GLint,GLenum,GLsizei,GLvoid*) pfglTexCoordPointer;
7976 +alias void function(GLsizei,GLvoid*) pfglEdgeFlagPointer;
7977 +alias void function(GLenum,GLvoid**) pfglGetPointerv;
7978 +alias void function(GLint) pfglArrayElement;
7979 +alias void function(GLenum,GLint,GLsizei) pfglDrawArrays;
7980 +alias void function(GLenum,GLsizei,GLenum,GLvoid*) pfglDrawElements;
7981 +alias void function(GLenum,GLsizei,GLvoid*) pfglInterleavedArrays;
7982 +}
7984 -typedef void function(GLint,GLenum,GLsizei,GLvoid*) pfglVertexPointer;
7985 -typedef void function(GLenum,GLsizei,GLvoid*) pfglNormalPointer;
7986 -typedef void function(GLint,GLenum,GLsizei,GLvoid*) pfglColorPointer;
7987 -typedef void function(GLenum,GLsizei,GLvoid*) pfglIndexPointer;
7988 -typedef void function(GLint,GLenum,GLsizei,GLvoid*) pfglTexCoordPointer;
7989 -typedef void function(GLsizei,GLvoid*) pfglEdgeFlagPointer;
7990 -typedef void function(GLenum,GLvoid**) pfglGetPointerv;
7991 -typedef void function(GLint) pfglArrayElement;
7992 -typedef void function(GLenum,GLint,GLsizei) pfglDrawArrays;
7993 -typedef void function(GLenum,GLsizei,GLenum,GLvoid*) pfglDrawElements;
7994 -typedef void function(GLenum,GLsizei,GLvoid*) pfglInterleavedArrays;
7995 -
7996 pfglClearIndex glClearIndex;
7997 pfglClearColor glClearColor;
7998 pfglClear glClear;
7999 Index: DerelictGL/derelict/opengl/glext.d
8000 ===================================================================
8001 --- DerelictGL/derelict/opengl/glext.d (revision 318)
8002 +++ DerelictGL/derelict/opengl/glext.d (working copy)
8003 @@ -32,7 +32,8 @@
8004 module derelict.opengl.glext;
8006 public
8007 -{
8008 +{
8009 + /*
8010 // ARB
8011 import derelict.opengl.extension.arb.color_buffer_float;
8012 import derelict.opengl.extension.arb.depth_texture;
8013 @@ -219,5 +220,5 @@
8015 // SGIS
8016 import derelict.opengl.extension.sgis.generate_mipmap;
8017 -
8018 + */
8019 } // public
8020 Index: DerelictGL/derelict/opengl/gl20.d
8021 ===================================================================
8022 --- DerelictGL/derelict/opengl/gl20.d (revision 318)
8023 +++ DerelictGL/derelict/opengl/gl20.d (working copy)
8024 @@ -325,102 +325,102 @@
8025 GL_STENCIL_BACK_WRITEMASK = 0x8CA5,
8026 }
8028 -extern(System):
8029 +extern(System) {
8030 +alias GLvoid function(GLenum, GLenum) pfglBlendEquationSeparate;
8031 +alias GLvoid function(GLsizei, GLenum*) pfglDrawBuffers;
8032 +alias GLvoid function(GLenum, GLenum, GLenum, GLenum) pfglStencilOpSeparate;
8033 +alias GLvoid function(GLenum, GLenum, GLint, GLuint) pfglStencilFuncSeparate;
8034 +alias GLvoid function(GLenum, GLuint) pfglStencilMaskSeparate;
8035 +alias GLvoid function(GLuint, GLuint) pfglAttachShader;
8036 +alias GLvoid function(GLuint, GLuint, GLchar*) pfglBindAttribLocation;
8037 +alias GLvoid function(GLuint) pfglCompileShader;
8038 +alias GLuint function() pfglCreateProgram;
8039 +alias GLuint function(GLenum) pfglCreateShader;
8040 +alias GLvoid function(GLuint) pfglDeleteProgram;
8041 +alias GLvoid function(GLuint) pfglDeleteShader;
8042 +alias GLvoid function(GLuint, GLuint) pfglDetachShader;
8043 +alias GLvoid function(GLuint) pfglDisableVertexAttribArray;
8044 +alias GLvoid function(GLuint) pfglEnableVertexAttribArray;
8045 +alias GLvoid function(GLuint, GLuint, GLsizei, GLsizei*, GLint*, GLenum*, GLchar*) pfglGetActiveAttrib;
8046 +alias GLvoid function(GLuint, GLuint, GLsizei, GLsizei*, GLint*, GLenum*, GLchar*) pfglGetActiveUniform;
8047 +alias GLvoid function(GLuint, GLsizei, GLsizei*, GLuint*) pfglGetAttachedShaders;
8048 +alias GLint function(GLuint, GLchar*) pfglGetAttribLocation;
8049 +alias GLvoid function(GLuint, GLenum, GLint*) pfglGetProgramiv;
8050 +alias GLvoid function(GLuint, GLsizei, GLsizei*, GLchar*) pfglGetProgramInfoLog;
8051 +alias GLvoid function(GLuint, GLenum, GLint *) pfglGetShaderiv;
8052 +alias GLvoid function(GLuint, GLsizei, GLsizei*, GLchar*) pfglGetShaderInfoLog;
8053 +alias GLvoid function(GLuint, GLsizei, GLsizei*, GLchar*) pfglGetShaderSource;
8054 +alias GLint function(GLuint, GLchar*) pfglGetUniformLocation;
8055 +alias GLvoid function(GLuint, GLint, GLfloat*) pfglGetUniformfv;
8056 +alias GLvoid function(GLuint, GLint, GLint*) pfglGetUniformiv;
8057 +alias GLvoid function(GLuint, GLenum, GLdouble*) pfglGetVertexAttribdv;
8058 +alias GLvoid function(GLuint, GLenum, GLfloat*) pfglGetVertexAttribfv;
8059 +alias GLvoid function(GLuint, GLenum, GLint*) pfglGetVertexAttribiv;
8060 +alias GLvoid function(GLuint, GLenum, GLvoid**) pfglGetVertexAttribPointerv;
8061 +alias GLboolean function(GLuint) pfglIsProgram;
8062 +alias GLboolean function(GLuint) pfglIsShader;
8063 +alias GLvoid function(GLuint) pfglLinkProgram;
8064 +alias GLvoid function(GLuint, GLsizei, GLchar**, GLint*) pfglShaderSource;
8065 +alias GLvoid function(GLuint) pfglUseProgram;
8066 +alias GLvoid function(GLint, GLfloat) pfglUniform1f;
8067 +alias GLvoid function(GLint, GLfloat, GLfloat) pfglUniform2f;
8068 +alias GLvoid function(GLint, GLfloat, GLfloat, GLfloat) pfglUniform3f;
8069 +alias GLvoid function(GLint, GLfloat, GLfloat, GLfloat, GLfloat) pfglUniform4f;
8070 +alias GLvoid function(GLint, GLint) pfglUniform1i;
8071 +alias GLvoid function(GLint, GLint, GLint) pfglUniform2i;
8072 +alias GLvoid function(GLint, GLint, GLint, GLint) pfglUniform3i;
8073 +alias GLvoid function(GLint, GLint, GLint, GLint, GLint) pfglUniform4i;
8074 +alias GLvoid function(GLint, GLsizei, GLfloat*) pfglUniform1fv;
8075 +alias GLvoid function(GLint, GLsizei, GLfloat*) pfglUniform2fv;
8076 +alias GLvoid function(GLint, GLsizei, GLfloat*) pfglUniform3fv;
8077 +alias GLvoid function(GLint, GLsizei, GLfloat*) pfglUniform4fv;
8078 +alias GLvoid function(GLint, GLsizei, GLint*) pfglUniform1iv;
8079 +alias GLvoid function(GLint, GLsizei, GLint*) pfglUniform2iv;
8080 +alias GLvoid function(GLint, GLsizei, GLint*) pfglUniform3iv;
8081 +alias GLvoid function(GLint, GLsizei, GLint*) pfglUniform4iv;
8082 +alias GLvoid function(GLint, GLsizei, GLboolean, GLfloat*) pfglUniformMatrix2fv;
8083 +alias GLvoid function(GLint, GLsizei, GLboolean, GLfloat*) pfglUniformMatrix3fv;
8084 +alias GLvoid function(GLint, GLsizei, GLboolean, GLfloat*) pfglUniformMatrix4fv;
8085 +alias GLvoid function(GLuint) pfglValidateProgram;
8086 +alias GLvoid function(GLuint, GLdouble) pfglVertexAttrib1d;
8087 +alias GLvoid function(GLuint, GLdouble*) pfglVertexAttrib1dv;
8088 +alias GLvoid function(GLuint, GLfloat) pfglVertexAttrib1f;
8089 +alias GLvoid function(GLuint, GLfloat*) pfglVertexAttrib1fv;
8090 +alias GLvoid function(GLuint, GLshort) pfglVertexAttrib1s;
8091 +alias GLvoid function(GLuint, GLshort*) pfglVertexAttrib1sv;
8092 +alias GLvoid function(GLuint, GLdouble, GLdouble) pfglVertexAttrib2d;
8093 +alias GLvoid function(GLuint, GLdouble*) pfglVertexAttrib2dv;
8094 +alias GLvoid function(GLuint, GLfloat, GLfloat) pfglVertexAttrib2f;
8095 +alias GLvoid function(GLuint, GLfloat*) pfglVertexAttrib2fv;
8096 +alias GLvoid function(GLuint, GLshort, GLshort) pfglVertexAttrib2s;
8097 +alias GLvoid function(GLuint, GLshort*) pfglVertexAttrib2sv;
8098 +alias GLvoid function(GLuint, GLdouble, GLdouble, GLdouble) pfglVertexAttrib3d;
8099 +alias GLvoid function(GLuint, GLdouble*) pfglVertexAttrib3dv;
8100 +alias GLvoid function(GLuint, GLfloat, GLfloat, GLfloat) pfglVertexAttrib3f;
8101 +alias GLvoid function(GLuint, GLfloat*) pfglVertexAttrib3fv;
8102 +alias GLvoid function(GLuint, GLshort, GLshort, GLshort) pfglVertexAttrib3s;
8103 +alias GLvoid function(GLuint, GLshort*) pfglVertexAttrib3sv;
8104 +alias GLvoid function(GLuint, GLbyte*) pfglVertexAttrib4Nbv;
8105 +alias GLvoid function(GLuint, GLint*) pfglVertexAttrib4Niv;
8106 +alias GLvoid function(GLuint, GLshort*) pfglVertexAttrib4Nsv;
8107 +alias GLvoid function(GLuint, GLubyte, GLubyte, GLubyte, GLubyte) pfglVertexAttrib4Nub;
8108 +alias GLvoid function(GLuint, GLubyte*) pfglVertexAttrib4Nubv;
8109 +alias GLvoid function(GLuint, GLuint*) pfglVertexAttrib4Nuiv;
8110 +alias GLvoid function(GLuint, GLushort*) pfglVertexAttrib4Nusv;
8111 +alias GLvoid function(GLuint, GLbyte*) pfglVertexAttrib4bv;
8112 +alias GLvoid function(GLuint, GLdouble, GLdouble, GLdouble, GLdouble) pfglVertexAttrib4d;
8113 +alias GLvoid function(GLuint, GLdouble*) pfglVertexAttrib4dv;
8114 +alias GLvoid function(GLuint, GLfloat, GLfloat, GLfloat, GLfloat) pfglVertexAttrib4f;
8115 +alias GLvoid function(GLuint, GLfloat*) pfglVertexAttrib4fv;
8116 +alias GLvoid function(GLuint, GLint*) pfglVertexAttrib4iv;
8117 +alias GLvoid function(GLuint, GLshort, GLshort, GLshort, GLshort) pfglVertexAttrib4s;
8118 +alias GLvoid function(GLuint, GLshort*) pfglVertexAttrib4sv;
8119 +alias GLvoid function(GLuint, GLubyte*) pfglVertexAttrib4ubv;
8120 +alias GLvoid function(GLuint, GLuint*) pfglVertexAttrib4uiv;
8121 +alias GLvoid function(GLuint, GLushort*) pfglVertexAttrib4usv;
8122 +alias GLvoid function(GLuint, GLint, GLenum, GLboolean, GLsizei, GLvoid*) pfglVertexAttribPointer;
8123 +}
8125 -typedef GLvoid function(GLenum, GLenum) pfglBlendEquationSeparate;
8126 -typedef GLvoid function(GLsizei, GLenum*) pfglDrawBuffers;
8127 -typedef GLvoid function(GLenum, GLenum, GLenum, GLenum) pfglStencilOpSeparate;
8128 -typedef GLvoid function(GLenum, GLenum, GLint, GLuint) pfglStencilFuncSeparate;
8129 -typedef GLvoid function(GLenum, GLuint) pfglStencilMaskSeparate;
8130 -typedef GLvoid function(GLuint, GLuint) pfglAttachShader;
8131 -typedef GLvoid function(GLuint, GLuint, GLchar*) pfglBindAttribLocation;
8132 -typedef GLvoid function(GLuint) pfglCompileShader;
8133 -typedef GLuint function() pfglCreateProgram;
8134 -typedef GLuint function(GLenum) pfglCreateShader;
8135 -typedef GLvoid function(GLuint) pfglDeleteProgram;
8136 -typedef GLvoid function(GLuint) pfglDeleteShader;
8137 -typedef GLvoid function(GLuint, GLuint) pfglDetachShader;
8138 -typedef GLvoid function(GLuint) pfglDisableVertexAttribArray;
8139 -typedef GLvoid function(GLuint) pfglEnableVertexAttribArray;
8140 -typedef GLvoid function(GLuint, GLuint, GLsizei, GLsizei*, GLint*, GLenum*, GLchar*) pfglGetActiveAttrib;
8141 -typedef GLvoid function(GLuint, GLuint, GLsizei, GLsizei*, GLint*, GLenum*, GLchar*) pfglGetActiveUniform;
8142 -typedef GLvoid function(GLuint, GLsizei, GLsizei*, GLuint*) pfglGetAttachedShaders;
8143 -typedef GLint function(GLuint, GLchar*) pfglGetAttribLocation;
8144 -typedef GLvoid function(GLuint, GLenum, GLint*) pfglGetProgramiv;
8145 -typedef GLvoid function(GLuint, GLsizei, GLsizei*, GLchar*) pfglGetProgramInfoLog;
8146 -typedef GLvoid function(GLuint, GLenum, GLint *) pfglGetShaderiv;
8147 -typedef GLvoid function(GLuint, GLsizei, GLsizei*, GLchar*) pfglGetShaderInfoLog;
8148 -typedef GLvoid function(GLuint, GLsizei, GLsizei*, GLchar*) pfglGetShaderSource;
8149 -typedef GLint function(GLuint, GLchar*) pfglGetUniformLocation;
8150 -typedef GLvoid function(GLuint, GLint, GLfloat*) pfglGetUniformfv;
8151 -typedef GLvoid function(GLuint, GLint, GLint*) pfglGetUniformiv;
8152 -typedef GLvoid function(GLuint, GLenum, GLdouble*) pfglGetVertexAttribdv;
8153 -typedef GLvoid function(GLuint, GLenum, GLfloat*) pfglGetVertexAttribfv;
8154 -typedef GLvoid function(GLuint, GLenum, GLint*) pfglGetVertexAttribiv;
8155 -typedef GLvoid function(GLuint, GLenum, GLvoid**) pfglGetVertexAttribPointerv;
8156 -typedef GLboolean function(GLuint) pfglIsProgram;
8157 -typedef GLboolean function(GLuint) pfglIsShader;
8158 -typedef GLvoid function(GLuint) pfglLinkProgram;
8159 -typedef GLvoid function(GLuint, GLsizei, GLchar**, GLint*) pfglShaderSource;
8160 -typedef GLvoid function(GLuint) pfglUseProgram;
8161 -typedef GLvoid function(GLint, GLfloat) pfglUniform1f;
8162 -typedef GLvoid function(GLint, GLfloat, GLfloat) pfglUniform2f;
8163 -typedef GLvoid function(GLint, GLfloat, GLfloat, GLfloat) pfglUniform3f;
8164 -typedef GLvoid function(GLint, GLfloat, GLfloat, GLfloat, GLfloat) pfglUniform4f;
8165 -typedef GLvoid function(GLint, GLint) pfglUniform1i;
8166 -typedef GLvoid function(GLint, GLint, GLint) pfglUniform2i;
8167 -typedef GLvoid function(GLint, GLint, GLint, GLint) pfglUniform3i;
8168 -typedef GLvoid function(GLint, GLint, GLint, GLint, GLint) pfglUniform4i;
8169 -typedef GLvoid function(GLint, GLsizei, GLfloat*) pfglUniform1fv;
8170 -typedef GLvoid function(GLint, GLsizei, GLfloat*) pfglUniform2fv;
8171 -typedef GLvoid function(GLint, GLsizei, GLfloat*) pfglUniform3fv;
8172 -typedef GLvoid function(GLint, GLsizei, GLfloat*) pfglUniform4fv;
8173 -typedef GLvoid function(GLint, GLsizei, GLint*) pfglUniform1iv;
8174 -typedef GLvoid function(GLint, GLsizei, GLint*) pfglUniform2iv;
8175 -typedef GLvoid function(GLint, GLsizei, GLint*) pfglUniform3iv;
8176 -typedef GLvoid function(GLint, GLsizei, GLint*) pfglUniform4iv;
8177 -typedef GLvoid function(GLint, GLsizei, GLboolean, GLfloat*) pfglUniformMatrix2fv;
8178 -typedef GLvoid function(GLint, GLsizei, GLboolean, GLfloat*) pfglUniformMatrix3fv;
8179 -typedef GLvoid function(GLint, GLsizei, GLboolean, GLfloat*) pfglUniformMatrix4fv;
8180 -typedef GLvoid function(GLuint) pfglValidateProgram;
8181 -typedef GLvoid function(GLuint, GLdouble) pfglVertexAttrib1d;
8182 -typedef GLvoid function(GLuint, GLdouble*) pfglVertexAttrib1dv;
8183 -typedef GLvoid function(GLuint, GLfloat) pfglVertexAttrib1f;
8184 -typedef GLvoid function(GLuint, GLfloat*) pfglVertexAttrib1fv;
8185 -typedef GLvoid function(GLuint, GLshort) pfglVertexAttrib1s;
8186 -typedef GLvoid function(GLuint, GLshort*) pfglVertexAttrib1sv;
8187 -typedef GLvoid function(GLuint, GLdouble, GLdouble) pfglVertexAttrib2d;
8188 -typedef GLvoid function(GLuint, GLdouble*) pfglVertexAttrib2dv;
8189 -typedef GLvoid function(GLuint, GLfloat, GLfloat) pfglVertexAttrib2f;
8190 -typedef GLvoid function(GLuint, GLfloat*) pfglVertexAttrib2fv;
8191 -typedef GLvoid function(GLuint, GLshort, GLshort) pfglVertexAttrib2s;
8192 -typedef GLvoid function(GLuint, GLshort*) pfglVertexAttrib2sv;
8193 -typedef GLvoid function(GLuint, GLdouble, GLdouble, GLdouble) pfglVertexAttrib3d;
8194 -typedef GLvoid function(GLuint, GLdouble*) pfglVertexAttrib3dv;
8195 -typedef GLvoid function(GLuint, GLfloat, GLfloat, GLfloat) pfglVertexAttrib3f;
8196 -typedef GLvoid function(GLuint, GLfloat*) pfglVertexAttrib3fv;
8197 -typedef GLvoid function(GLuint, GLshort, GLshort, GLshort) pfglVertexAttrib3s;
8198 -typedef GLvoid function(GLuint, GLshort*) pfglVertexAttrib3sv;
8199 -typedef GLvoid function(GLuint, GLbyte*) pfglVertexAttrib4Nbv;
8200 -typedef GLvoid function(GLuint, GLint*) pfglVertexAttrib4Niv;
8201 -typedef GLvoid function(GLuint, GLshort*) pfglVertexAttrib4Nsv;
8202 -typedef GLvoid function(GLuint, GLubyte, GLubyte, GLubyte, GLubyte) pfglVertexAttrib4Nub;
8203 -typedef GLvoid function(GLuint, GLubyte*) pfglVertexAttrib4Nubv;
8204 -typedef GLvoid function(GLuint, GLuint*) pfglVertexAttrib4Nuiv;
8205 -typedef GLvoid function(GLuint, GLushort*) pfglVertexAttrib4Nusv;
8206 -typedef GLvoid function(GLuint, GLbyte*) pfglVertexAttrib4bv;
8207 -typedef GLvoid function(GLuint, GLdouble, GLdouble, GLdouble, GLdouble) pfglVertexAttrib4d;
8208 -typedef GLvoid function(GLuint, GLdouble*) pfglVertexAttrib4dv;
8209 -typedef GLvoid function(GLuint, GLfloat, GLfloat, GLfloat, GLfloat) pfglVertexAttrib4f;
8210 -typedef GLvoid function(GLuint, GLfloat*) pfglVertexAttrib4fv;
8211 -typedef GLvoid function(GLuint, GLint*) pfglVertexAttrib4iv;
8212 -typedef GLvoid function(GLuint, GLshort, GLshort, GLshort, GLshort) pfglVertexAttrib4s;
8213 -typedef GLvoid function(GLuint, GLshort*) pfglVertexAttrib4sv;
8214 -typedef GLvoid function(GLuint, GLubyte*) pfglVertexAttrib4ubv;
8215 -typedef GLvoid function(GLuint, GLuint*) pfglVertexAttrib4uiv;
8216 -typedef GLvoid function(GLuint, GLushort*) pfglVertexAttrib4usv;
8217 -typedef GLvoid function(GLuint, GLint, GLenum, GLboolean, GLsizei, GLvoid*) pfglVertexAttribPointer;
8218 -
8219 pfglBlendEquationSeparate glBlendEquationSeparate;
8220 pfglDrawBuffers glDrawBuffers;
8221 pfglStencilOpSeparate glStencilOpSeparate;
8222 Index: DerelictGL/derelict/opengl/cgl.d
8223 ===================================================================
8224 --- DerelictGL/derelict/opengl/cgl.d (revision 318)
8225 +++ DerelictGL/derelict/opengl/cgl.d (working copy)
8226 @@ -48,7 +48,7 @@
8227 import derelict.util.loader;
8228 }
8230 -extern (C):
8231 +extern (C) {
8233 /*
8234 ** CGLContext structure.
8235 @@ -232,31 +232,31 @@
8236 /*
8237 ** Pixel format functions
8238 */
8239 -typedef CGLError function(CGLPixelFormatAttribute*, CGLPixelFormatObj*, int*)
8240 +alias CGLError function(CGLPixelFormatAttribute*, CGLPixelFormatObj*, int*)
8241 pfCGLChoosePixelFormat;
8242 -typedef CGLError function(CGLPixelFormatObj)
8243 +alias CGLError function(CGLPixelFormatObj)
8244 pfCGLDestroyPixelFormat;
8245 -typedef CGLError function(CGLPixelFormatObj, int, CGLPixelFormatAttribute, int*)
8246 +alias CGLError function(CGLPixelFormatObj, int, CGLPixelFormatAttribute, int*)
8247 pfCGLDescribePixelFormat;
8249 /*
8250 ** Renderer information functions
8251 */
8252 -typedef CGLError function(uint, CGLRendererInfoObj*, int*)
8253 +alias CGLError function(uint, CGLRendererInfoObj*, int*)
8254 pfCGLQueryRendererInfo;
8255 -typedef CGLError function(CGLRendererInfoObj)
8256 +alias CGLError function(CGLRendererInfoObj)
8257 pfCGLDestroyRendererInfo;
8258 -typedef CGLError function(CGLRendererInfoObj, int, CGLRendererProperty, int*)
8259 +alias CGLError function(CGLRendererInfoObj, int, CGLRendererProperty, int*)
8260 pfCGLDescribeRenderer;
8262 /*
8263 ** Context functions
8264 */
8265 -typedef CGLError function(CGLPixelFormatObj, CGLContextObj, CGLContextObj*)
8266 +alias CGLError function(CGLPixelFormatObj, CGLContextObj, CGLContextObj*)
8267 pfCGLCreateContext;
8268 -typedef CGLError function(CGLContextObj)
8269 +alias CGLError function(CGLContextObj)
8270 pfCGLDestroyContext;
8271 -typedef CGLError function(CGLContextObj, CGLContextObj, uint)
8272 +alias CGLError function(CGLContextObj, CGLContextObj, uint)
8273 pfCGLCopyContext;
8275 /*
8276 @@ -267,71 +267,71 @@
8277 // <AvailabilityMacros.h>.
8278 version (Mac_OS_X_10_3_and_later)
8279 {
8280 -typedef CGLError function(int, int, uint, uint, int, CGLPBufferObj*)
8281 +alias CGLError function(int, int, uint, uint, int, CGLPBufferObj*)
8282 pfCGLCreatePBuffer;
8284 -typedef CGLError function(CGLPBufferObj)
8285 +alias CGLError function(CGLPBufferObj)
8286 pfCGLDestroyPBuffer;
8288 -typedef CGLError function(CGLPBufferObj, int*, int*, uint*, uint*, int*)
8289 +alias CGLError function(CGLPBufferObj, int*, int*, uint*, uint*, int*)
8290 pfCGLDescribePBuffer;
8292 -typedef CGLError function(CGLContextObj, CGLPBufferObj, uint)
8293 +alias CGLError function(CGLContextObj, CGLPBufferObj, uint)
8294 pfCGLTexImagePBuffer;
8295 }
8297 /*
8298 ** Drawable Functions
8299 */
8300 -typedef CGLError function(CGLContextObj, int, int, int, void*)
8301 +alias CGLError function(CGLContextObj, int, int, int, void*)
8302 pfCGLSetOffScreen;
8303 -typedef CGLError function(CGLContextObj, int*, int*, int*, void **baseaddr)
8304 +alias CGLError function(CGLContextObj, int*, int*, int*, void **baseaddr)
8305 pfCGLGetOffScreen;
8306 -typedef CGLError function(CGLContextObj)
8307 +alias CGLError function(CGLContextObj)
8308 pfCGLSetFullScreen;
8310 version (Mac_OS_X_10_3_and_later)
8311 {
8312 -typedef CGLError function(CGLContextObj, CGLPBufferObj, uint, int, int)
8313 +alias CGLError function(CGLContextObj, CGLPBufferObj, uint, int, int)
8314 pfCGLSetPBuffer;
8316 -typedef CGLError function(CGLContextObj, CGLPBufferObj*, uint*, int*, int*)
8317 +alias CGLError function(CGLContextObj, CGLPBufferObj*, uint*, int*, int*)
8318 pfCGLGetPBuffer;
8319 }
8321 -typedef CGLError function(CGLContextObj)
8322 +alias CGLError function(CGLContextObj)
8323 pfCGLClearDrawable;
8324 -typedef CGLError function(CGLContextObj)
8325 +alias CGLError function(CGLContextObj)
8326 pfCGLFlushDrawable;
8328 /*
8329 ** Per context enables and parameters
8330 */
8331 -typedef CGLError function(CGLContextObj, CGLContextEnable)
8332 +alias CGLError function(CGLContextObj, CGLContextEnable)
8333 pfCGLEnable;
8334 -typedef CGLError function(CGLContextObj, CGLContextEnable)
8335 +alias CGLError function(CGLContextObj, CGLContextEnable)
8336 pfCGLDisable;
8337 -typedef CGLError function(CGLContextObj, CGLContextEnable, int*)
8338 +alias CGLError function(CGLContextObj, CGLContextEnable, int*)
8339 pfCGLIsEnabled;
8340 -typedef CGLError function(CGLContextObj, CGLContextParameter, int*)
8341 +alias CGLError function(CGLContextObj, CGLContextParameter, int*)
8342 pfCGLSetParameter;
8343 -typedef CGLError function(CGLContextObj, CGLContextParameter, int*)
8344 +alias CGLError function(CGLContextObj, CGLContextParameter, int*)
8345 pfCGLGetParameter;
8347 /*
8348 ** Virtual screen functions
8349 */
8350 -typedef CGLError function(CGLContextObj, int)
8351 +alias CGLError function(CGLContextObj, int)
8352 pfCGLSetVirtualScreen;
8353 -typedef CGLError function(CGLContextObj, int*)
8354 +alias CGLError function(CGLContextObj, int*)
8355 pfCGLGetVirtualScreen;
8357 /*
8358 ** Global library options
8359 */
8360 -typedef CGLError function(CGLGlobalOption, int)
8361 +alias CGLError function(CGLGlobalOption, int)
8362 pfCGLSetOption;
8363 -typedef CGLError function(CGLGlobalOption, int*)
8364 +alias CGLError function(CGLGlobalOption, int*)
8365 pfCGLGetOption;
8367 /*
8368 @@ -339,31 +339,32 @@
8369 */
8370 version (Mac_OS_X_10_4_and_later)
8371 {
8372 -typedef CGLError function(CGLContextObj)
8373 +alias CGLError function(CGLContextObj)
8374 pfCGLLockContext;
8376 -typedef CGLError function(CGLContextObj)
8377 +alias CGLError function(CGLContextObj)
8378 pfCGLUnlockContext;
8379 }
8381 /*
8382 ** Version numbers
8383 */
8384 -typedef void function(int*, int*)
8385 +alias void function(int*, int*)
8386 pfCGLGetVersion;
8388 /*
8389 ** Convert an error code to a string
8390 */
8391 -typedef const char* function(CGLError)
8392 +alias const char* function(CGLError)
8393 pfCGLErrorString;
8395 +}
8396 /*
8397 ** Current context functions
8398 */
8399 -typedef CGLError function(CGLContextObj)
8400 +alias CGLError function(CGLContextObj)
8401 pfCGLSetCurrentContext;
8402 -typedef CGLContextObj function()
8403 +alias CGLContextObj function()
8404 pfCGLGetCurrentContext;
8406 /*
8407 Index: DerelictGL/derelict/opengl/gl12.d
8408 ===================================================================
8409 --- DerelictGL/derelict/opengl/gl12.d (revision 318)
8410 +++ DerelictGL/derelict/opengl/gl12.d (working copy)
8411 @@ -103,13 +103,13 @@
8412 GL_TEXTURE_BINDING_3D = 0x806A,
8413 }
8415 -extern(System):
8416 +extern(System) {
8417 +alias GLvoid function(GLenum, GLuint, GLuint, GLsizei, GLenum, GLvoid*) pfglDrawRangeElements;
8418 +alias GLvoid function(GLenum, GLint, GLint, GLsizei, GLsizei, GLsizei, GLint, GLenum, GLenum, GLvoid*) pfglTexImage3D;
8419 +alias GLvoid function(GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLenum, GLvoid*) pfglTexSubImage3D;
8420 +alias GLvoid function(GLenum, GLint, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei) pfglCopyTexSubImage3D;
8421 +}
8423 -typedef GLvoid function(GLenum, GLuint, GLuint, GLsizei, GLenum, GLvoid*) pfglDrawRangeElements;
8424 -typedef GLvoid function(GLenum, GLint, GLint, GLsizei, GLsizei, GLsizei, GLint, GLenum, GLenum, GLvoid*) pfglTexImage3D;
8425 -typedef GLvoid function(GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLenum, GLvoid*) pfglTexSubImage3D;
8426 -typedef GLvoid function(GLenum, GLint, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei) pfglCopyTexSubImage3D;
8427 -
8428 pfglDrawRangeElements glDrawRangeElements;
8429 pfglTexImage3D glTexImage3D;
8430 pfglTexSubImage3D glTexSubImage3D;
8431 Index: DerelictGL/derelict/opengl/gl21.d
8432 ===================================================================
8433 --- DerelictGL/derelict/opengl/gl21.d (revision 318)
8434 +++ DerelictGL/derelict/opengl/gl21.d (working copy)
8435 @@ -89,15 +89,15 @@
8436 GL_COMPRESSED_SLUMINANCE_ALPHA = 0x8C4B,
8437 }
8439 -extern(System):
8440 +extern(System) {
8441 +alias void function(GLint, GLsizei, GLboolean, GLfloat*) pfglUniformMatrix2x3fv;
8442 +alias void function(GLint, GLsizei, GLboolean, GLfloat*) pfglUniformMatrix3x2fv;
8443 +alias void function(GLint, GLsizei, GLboolean, GLfloat*) pfglUniformMatrix2x4fv;
8444 +alias void function(GLint, GLsizei, GLboolean, GLfloat*) pfglUniformMatrix4x2fv;
8445 +alias void function(GLint, GLsizei, GLboolean, GLfloat*) pfglUniformMatrix3x4fv;
8446 +alias void function(GLint, GLsizei, GLboolean, GLfloat*) pfglUniformMatrix4x3fv;
8447 +}
8449 -typedef void function(GLint, GLsizei, GLboolean, GLfloat*) pfglUniformMatrix2x3fv;
8450 -typedef void function(GLint, GLsizei, GLboolean, GLfloat*) pfglUniformMatrix3x2fv;
8451 -typedef void function(GLint, GLsizei, GLboolean, GLfloat*) pfglUniformMatrix2x4fv;
8452 -typedef void function(GLint, GLsizei, GLboolean, GLfloat*) pfglUniformMatrix4x2fv;
8453 -typedef void function(GLint, GLsizei, GLboolean, GLfloat*) pfglUniformMatrix3x4fv;
8454 -typedef void function(GLint, GLsizei, GLboolean, GLfloat*) pfglUniformMatrix4x3fv;
8455 -
8456 pfglUniformMatrix2x3fv glUniformMatrix2x3fv;
8457 pfglUniformMatrix3x2fv glUniformMatrix3x2fv;
8458 pfglUniformMatrix2x4fv glUniformMatrix2x4fv;
8459 Index: DerelictGL/derelict/opengl/gl13.d
8460 ===================================================================
8461 --- DerelictGL/derelict/opengl/gl13.d (revision 318)
8462 +++ DerelictGL/derelict/opengl/gl13.d (working copy)
8463 @@ -242,55 +242,55 @@
8464 GL_CLAMP_TO_BORDER = 0x812D,
8465 }
8467 -extern(System):
8468 +extern(System) {
8469 +alias GLvoid function(GLenum) pfglActiveTexture;
8470 +alias GLvoid function(GLenum) pfglClientActiveTexture;
8471 +alias GLvoid function(GLenum, GLdouble) pfglMultiTexCoord1d;
8472 +alias GLvoid function(GLenum, GLdouble*) pfglMultiTexCoord1dv;
8473 +alias GLvoid function(GLenum, GLfloat) pfglMultiTexCoord1f;
8474 +alias GLvoid function(GLenum, GLfloat*) pfglMultiTexCoord1fv;
8475 +alias GLvoid function(GLenum, GLint) pfglMultiTexCoord1i;
8476 +alias GLvoid function(GLenum, GLint*) pfglMultiTexCoord1iv;
8477 +alias GLvoid function(GLenum, GLshort) pfglMultiTexCoord1s;
8478 +alias GLvoid function(GLenum, GLshort*) pfglMultiTexCoord1sv;
8479 +alias GLvoid function(GLenum, GLdouble, GLdouble) pfglMultiTexCoord2d;
8480 +alias GLvoid function(GLenum, GLdouble*) pfglMultiTexCoord2dv;
8481 +alias GLvoid function(GLenum, GLfloat, GLfloat) pfglMultiTexCoord2f;
8482 +alias GLvoid function(GLenum, GLfloat*) pfglMultiTexCoord2fv;
8483 +alias GLvoid function(GLenum, GLint, GLint) pfglMultiTexCoord2i;
8484 +alias GLvoid function(GLenum, GLint*) pfglMultiTexCoord2iv;
8485 +alias GLvoid function(GLenum, GLshort, GLshort) pfglMultiTexCoord2s;
8486 +alias GLvoid function(GLenum, GLshort*) pfglMultiTexCoord2sv;
8487 +alias GLvoid function(GLenum, GLdouble, GLdouble, GLdouble) pfglMultiTexCoord3d;
8488 +alias GLvoid function(GLenum, GLdouble*) pfglMultiTexCoord3dv;
8489 +alias GLvoid function(GLenum, GLfloat, GLfloat, GLfloat) pfglMultiTexCoord3f;
8490 +alias GLvoid function(GLenum, GLfloat*) pfglMultiTexCoord3fv;
8491 +alias GLvoid function(GLenum, GLint, GLint, GLint) pfglMultiTexCoord3i;
8492 +alias GLvoid function(GLenum, GLint*) pfglMultiTexCoord3iv;
8493 +alias GLvoid function(GLenum, GLshort, GLshort, GLshort) pfglMultiTexCoord3s;
8494 +alias GLvoid function(GLenum, GLshort*) pfglMultiTexCoord3sv;
8495 +alias GLvoid function(GLenum, GLdouble, GLdouble, GLdouble, GLdouble) pfglMultiTexCoord4d;
8496 +alias GLvoid function(GLenum, GLdouble*) pfglMultiTexCoord4dv;
8497 +alias GLvoid function(GLenum, GLfloat, GLfloat, GLfloat, GLfloat) pfglMultiTexCoord4f;
8498 +alias GLvoid function(GLenum, GLfloat*) pfglMultiTexCoord4fv;
8499 +alias GLvoid function(GLenum, GLint, GLint, GLint, GLint) pfglMultiTexCoord4i;
8500 +alias GLvoid function(GLenum, GLint*) pfglMultiTexCoord4iv;
8501 +alias GLvoid function(GLenum, GLshort, GLshort, GLshort, GLshort) pfglMultiTexCoord4s;
8502 +alias GLvoid function(GLenum, GLshort*) pfglMultiTexCoord4sv;
8503 +alias GLvoid function(GLdouble*) pfglLoadTransposeMatrixd;
8504 +alias GLvoid function(GLfloat*) pfglLoadTransposeMatrixf;
8505 +alias GLvoid function(GLdouble*) pfglMultTransposeMatrixd;
8506 +alias GLvoid function(GLfloat*) pfglMultTransposeMatrixf;
8507 +alias GLvoid function(GLclampf, GLboolean) pfglSampleCoverage;
8508 +alias GLvoid function(GLenum, GLint, GLenum, GLsizei, GLint, GLsizei, GLvoid*) pfglCompressedTexImage1D;
8509 +alias GLvoid function(GLenum, GLint, GLenum, GLsizei, GLsizei, GLint, GLsizei, GLvoid*) pfglCompressedTexImage2D;
8510 +alias GLvoid function(GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei depth, GLint, GLsizei, GLvoid*) pfglCompressedTexImage3D;
8511 +alias GLvoid function(GLenum, GLint, GLint, GLsizei, GLenum, GLsizei, GLvoid*) pfglCompressedTexSubImage1D;
8512 +alias GLvoid function(GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLsizei, GLvoid*) pfglCompressedTexSubImage2D;
8513 +alias GLvoid function(GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLsizei, GLvoid*) pfglCompressedTexSubImage3D;
8514 +alias GLvoid function(GLenum, GLint, GLvoid*) pfglGetCompressedTexImage;
8515 +}
8517 -typedef GLvoid function(GLenum) pfglActiveTexture;
8518 -typedef GLvoid function(GLenum) pfglClientActiveTexture;
8519 -typedef GLvoid function(GLenum, GLdouble) pfglMultiTexCoord1d;
8520 -typedef GLvoid function(GLenum, GLdouble*) pfglMultiTexCoord1dv;
8521 -typedef GLvoid function(GLenum, GLfloat) pfglMultiTexCoord1f;
8522 -typedef GLvoid function(GLenum, GLfloat*) pfglMultiTexCoord1fv;
8523 -typedef GLvoid function(GLenum, GLint) pfglMultiTexCoord1i;
8524 -typedef GLvoid function(GLenum, GLint*) pfglMultiTexCoord1iv;
8525 -typedef GLvoid function(GLenum, GLshort) pfglMultiTexCoord1s;
8526 -typedef GLvoid function(GLenum, GLshort*) pfglMultiTexCoord1sv;
8527 -typedef GLvoid function(GLenum, GLdouble, GLdouble) pfglMultiTexCoord2d;
8528 -typedef GLvoid function(GLenum, GLdouble*) pfglMultiTexCoord2dv;
8529 -typedef GLvoid function(GLenum, GLfloat, GLfloat) pfglMultiTexCoord2f;
8530 -typedef GLvoid function(GLenum, GLfloat*) pfglMultiTexCoord2fv;
8531 -typedef GLvoid function(GLenum, GLint, GLint) pfglMultiTexCoord2i;
8532 -typedef GLvoid function(GLenum, GLint*) pfglMultiTexCoord2iv;
8533 -typedef GLvoid function(GLenum, GLshort, GLshort) pfglMultiTexCoord2s;
8534 -typedef GLvoid function(GLenum, GLshort*) pfglMultiTexCoord2sv;
8535 -typedef GLvoid function(GLenum, GLdouble, GLdouble, GLdouble) pfglMultiTexCoord3d;
8536 -typedef GLvoid function(GLenum, GLdouble*) pfglMultiTexCoord3dv;
8537 -typedef GLvoid function(GLenum, GLfloat, GLfloat, GLfloat) pfglMultiTexCoord3f;
8538 -typedef GLvoid function(GLenum, GLfloat*) pfglMultiTexCoord3fv;
8539 -typedef GLvoid function(GLenum, GLint, GLint, GLint) pfglMultiTexCoord3i;
8540 -typedef GLvoid function(GLenum, GLint*) pfglMultiTexCoord3iv;
8541 -typedef GLvoid function(GLenum, GLshort, GLshort, GLshort) pfglMultiTexCoord3s;
8542 -typedef GLvoid function(GLenum, GLshort*) pfglMultiTexCoord3sv;
8543 -typedef GLvoid function(GLenum, GLdouble, GLdouble, GLdouble, GLdouble) pfglMultiTexCoord4d;
8544 -typedef GLvoid function(GLenum, GLdouble*) pfglMultiTexCoord4dv;
8545 -typedef GLvoid function(GLenum, GLfloat, GLfloat, GLfloat, GLfloat) pfglMultiTexCoord4f;
8546 -typedef GLvoid function(GLenum, GLfloat*) pfglMultiTexCoord4fv;
8547 -typedef GLvoid function(GLenum, GLint, GLint, GLint, GLint) pfglMultiTexCoord4i;
8548 -typedef GLvoid function(GLenum, GLint*) pfglMultiTexCoord4iv;
8549 -typedef GLvoid function(GLenum, GLshort, GLshort, GLshort, GLshort) pfglMultiTexCoord4s;
8550 -typedef GLvoid function(GLenum, GLshort*) pfglMultiTexCoord4sv;
8551 -typedef GLvoid function(GLdouble*) pfglLoadTransposeMatrixd;
8552 -typedef GLvoid function(GLfloat*) pfglLoadTransposeMatrixf;
8553 -typedef GLvoid function(GLdouble*) pfglMultTransposeMatrixd;
8554 -typedef GLvoid function(GLfloat*) pfglMultTransposeMatrixf;
8555 -typedef GLvoid function(GLclampf, GLboolean) pfglSampleCoverage;
8556 -typedef GLvoid function(GLenum, GLint, GLenum, GLsizei, GLint, GLsizei, GLvoid*) pfglCompressedTexImage1D;
8557 -typedef GLvoid function(GLenum, GLint, GLenum, GLsizei, GLsizei, GLint, GLsizei, GLvoid*) pfglCompressedTexImage2D;
8558 -typedef GLvoid function(GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei depth, GLint, GLsizei, GLvoid*) pfglCompressedTexImage3D;
8559 -typedef GLvoid function(GLenum, GLint, GLint, GLsizei, GLenum, GLsizei, GLvoid*) pfglCompressedTexSubImage1D;
8560 -typedef GLvoid function(GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLsizei, GLvoid*) pfglCompressedTexSubImage2D;
8561 -typedef GLvoid function(GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLsizei, GLvoid*) pfglCompressedTexSubImage3D;
8562 -typedef GLvoid function(GLenum, GLint, GLvoid*) pfglGetCompressedTexImage;
8563 -
8564 pfglActiveTexture glActiveTexture;
8565 pfglClientActiveTexture glClientActiveTexture;
8566 pfglMultiTexCoord1d glMultiTexCoord1d;
8567 Index: DerelictGL/derelict/opengl/gl14.d
8568 ===================================================================
8569 --- DerelictGL/derelict/opengl/gl14.d (revision 318)
8570 +++ DerelictGL/derelict/opengl/gl14.d (working copy)
8571 @@ -198,56 +198,56 @@
8572 GL_FUNC_REVERSE_SUBTRACT = 0x800B,
8573 }
8575 -extern(System):
8576 +extern(System) {
8577 +alias GLvoid function(GLenum, GLenum, GLenum, GLenum) pfglBlendFuncSeparate;
8578 +alias GLvoid function(GLfloat) pfglFogCoordf;
8579 +alias GLvoid function(GLfloat*) pfglFogCoordfv;
8580 +alias GLvoid function(GLdouble) pfglFogCoordd;
8581 +alias GLvoid function(GLdouble*) pfglFogCoorddv;
8582 +alias GLvoid function(GLenum, GLsizei,GLvoid*) pfglFogCoordPointer;
8583 +alias GLvoid function(GLenum, GLint*, GLsizei*, GLsizei) pfglMultiDrawArrays;
8584 +alias GLvoid function(GLenum, GLsizei*, GLenum, GLvoid**, GLsizei) pfglMultiDrawElements;
8585 +alias GLvoid function(GLenum, GLfloat) pfglPointParameterf;
8586 +alias GLvoid function(GLenum, GLfloat*) pfglPointParameterfv;
8587 +alias GLvoid function(GLenum, GLint) pfglPointParameteri;
8588 +alias GLvoid function(GLenum, GLint*) pfglPointParameteriv;
8589 +alias GLvoid function(GLbyte, GLbyte, GLbyte) pfglSecondaryColor3b;
8590 +alias GLvoid function(GLbyte*) pfglSecondaryColor3bv;
8591 +alias GLvoid function(GLdouble, GLdouble, GLdouble) pfglSecondaryColor3d;
8592 +alias GLvoid function(GLdouble*) pfglSecondaryColor3dv;
8593 +alias GLvoid function(GLfloat, GLfloat, GLfloat) pfglSecondaryColor3f;
8594 +alias GLvoid function(GLfloat*) pfglSecondaryColor3fv;
8595 +alias GLvoid function(GLint, GLint, GLint) pfglSecondaryColor3i;
8596 +alias GLvoid function(GLint*) pfglSecondaryColor3iv;
8597 +alias GLvoid function(GLshort, GLshort, GLshort) pfglSecondaryColor3s;
8598 +alias GLvoid function(GLshort*) pfglSecondaryColor3sv;
8599 +alias GLvoid function(GLubyte, GLubyte, GLubyte) pfglSecondaryColor3ub;
8600 +alias GLvoid function(GLubyte*) pfglSecondaryColor3ubv;
8601 +alias GLvoid function(GLuint, GLuint, GLuint) pfglSecondaryColor3ui;
8602 +alias GLvoid function(GLuint*) pfglSecondaryColor3uiv;
8603 +alias GLvoid function(GLushort, GLushort, GLushort) pfglSecondaryColor3us;
8604 +alias GLvoid function(GLushort*) pfglSecondaryColor3usv;
8605 +alias GLvoid function(GLint, GLenum, GLsizei, GLvoid*) pfglSecondaryColorPointer;
8606 +alias GLvoid function(GLdouble, GLdouble) pfglWindowPos2d;
8607 +alias GLvoid function(GLdouble*) pfglWindowPos2dv;
8608 +alias GLvoid function(GLfloat, GLfloat) pfglWindowPos2f;
8609 +alias GLvoid function(GLfloat*) pfglWindowPos2fv;
8610 +alias GLvoid function(GLint, GLint) pfglWindowPos2i;
8611 +alias GLvoid function(GLint*) pfglWindowPos2iv;
8612 +alias GLvoid function(GLshort, GLshort) pfglWindowPos2s;
8613 +alias GLvoid function(GLshort*) pfglWindowPos2sv;
8614 +alias GLvoid function(GLdouble, GLdouble, GLdouble) pfglWindowPos3d;
8615 +alias GLvoid function(GLdouble*) pfglWindowPos3dv;
8616 +alias GLvoid function(GLfloat, GLfloat, GLfloat) pfglWindowPos3f;
8617 +alias GLvoid function(GLfloat*) pfglWindowPos3fv;
8618 +alias GLvoid function(GLint, GLint, GLint) pfglWindowPos3i;
8619 +alias GLvoid function(GLint*) pfglWindowPos3iv;
8620 +alias GLvoid function(GLshort, GLshort, GLshort) pfglWindowPos3s;
8621 +alias GLvoid function(GLshort*) pfglWindowPos3sv;
8622 +alias GLvoid function(GLclampf, GLclampf, GLclampf, GLclampf) pfglBlendColor;
8623 +alias GLvoid function(GLenum) pfglBlendEquation;
8624 +}
8626 -typedef GLvoid function(GLenum, GLenum, GLenum, GLenum) pfglBlendFuncSeparate;
8627 -typedef GLvoid function(GLfloat) pfglFogCoordf;
8628 -typedef GLvoid function(GLfloat*) pfglFogCoordfv;
8629 -typedef GLvoid function(GLdouble) pfglFogCoordd;
8630 -typedef GLvoid function(GLdouble*) pfglFogCoorddv;
8631 -typedef GLvoid function(GLenum, GLsizei,GLvoid*) pfglFogCoordPointer;
8632 -typedef GLvoid function(GLenum, GLint*, GLsizei*, GLsizei) pfglMultiDrawArrays;
8633 -typedef GLvoid function(GLenum, GLsizei*, GLenum, GLvoid**, GLsizei) pfglMultiDrawElements;
8634 -typedef GLvoid function(GLenum, GLfloat) pfglPointParameterf;
8635 -typedef GLvoid function(GLenum, GLfloat*) pfglPointParameterfv;
8636 -typedef GLvoid function(GLenum, GLint) pfglPointParameteri;
8637 -typedef GLvoid function(GLenum, GLint*) pfglPointParameteriv;
8638 -typedef GLvoid function(GLbyte, GLbyte, GLbyte) pfglSecondaryColor3b;
8639 -typedef GLvoid function(GLbyte*) pfglSecondaryColor3bv;
8640 -typedef GLvoid function(GLdouble, GLdouble, GLdouble) pfglSecondaryColor3d;
8641 -typedef GLvoid function(GLdouble*) pfglSecondaryColor3dv;
8642 -typedef GLvoid function(GLfloat, GLfloat, GLfloat) pfglSecondaryColor3f;
8643 -typedef GLvoid function(GLfloat*) pfglSecondaryColor3fv;
8644 -typedef GLvoid function(GLint, GLint, GLint) pfglSecondaryColor3i;
8645 -typedef GLvoid function(GLint*) pfglSecondaryColor3iv;
8646 -typedef GLvoid function(GLshort, GLshort, GLshort) pfglSecondaryColor3s;
8647 -typedef GLvoid function(GLshort*) pfglSecondaryColor3sv;
8648 -typedef GLvoid function(GLubyte, GLubyte, GLubyte) pfglSecondaryColor3ub;
8649 -typedef GLvoid function(GLubyte*) pfglSecondaryColor3ubv;
8650 -typedef GLvoid function(GLuint, GLuint, GLuint) pfglSecondaryColor3ui;
8651 -typedef GLvoid function(GLuint*) pfglSecondaryColor3uiv;
8652 -typedef GLvoid function(GLushort, GLushort, GLushort) pfglSecondaryColor3us;
8653 -typedef GLvoid function(GLushort*) pfglSecondaryColor3usv;
8654 -typedef GLvoid function(GLint, GLenum, GLsizei, GLvoid*) pfglSecondaryColorPointer;
8655 -typedef GLvoid function(GLdouble, GLdouble) pfglWindowPos2d;
8656 -typedef GLvoid function(GLdouble*) pfglWindowPos2dv;
8657 -typedef GLvoid function(GLfloat, GLfloat) pfglWindowPos2f;
8658 -typedef GLvoid function(GLfloat*) pfglWindowPos2fv;
8659 -typedef GLvoid function(GLint, GLint) pfglWindowPos2i;
8660 -typedef GLvoid function(GLint*) pfglWindowPos2iv;
8661 -typedef GLvoid function(GLshort, GLshort) pfglWindowPos2s;
8662 -typedef GLvoid function(GLshort*) pfglWindowPos2sv;
8663 -typedef GLvoid function(GLdouble, GLdouble, GLdouble) pfglWindowPos3d;
8664 -typedef GLvoid function(GLdouble*) pfglWindowPos3dv;
8665 -typedef GLvoid function(GLfloat, GLfloat, GLfloat) pfglWindowPos3f;
8666 -typedef GLvoid function(GLfloat*) pfglWindowPos3fv;
8667 -typedef GLvoid function(GLint, GLint, GLint) pfglWindowPos3i;
8668 -typedef GLvoid function(GLint*) pfglWindowPos3iv;
8669 -typedef GLvoid function(GLshort, GLshort, GLshort) pfglWindowPos3s;
8670 -typedef GLvoid function(GLshort*) pfglWindowPos3sv;
8671 -typedef GLvoid function(GLclampf, GLclampf, GLclampf, GLclampf) pfglBlendColor;
8672 -typedef GLvoid function(GLenum) pfglBlendEquation;
8673 -
8674 pfglBlendFuncSeparate glBlendFuncSeparate;
8675 pfglFogCoordf glFogCoordf;
8676 pfglFogCoordfv glFogCoordfv;
8677 Index: DerelictGL/derelict/opengl/gl15.d
8678 ===================================================================
8679 --- DerelictGL/derelict/opengl/gl15.d (revision 318)
8680 +++ DerelictGL/derelict/opengl/gl15.d (working copy)
8681 @@ -144,28 +144,28 @@
8682 GL_SRC2_ALPHA = GL_SOURCE2_ALPHA,
8683 }
8685 -extern(System):
8686 +extern(System) {
8687 +alias GLvoid function(GLsizei, GLuint*) pfglGenQueries;
8688 +alias GLvoid function(GLsizei,GLuint*) pfglDeleteQueries;
8689 +alias GLboolean function(GLuint) pfglIsQuery;
8690 +alias GLvoid function(GLenum, GLuint) pfglBeginQuery;
8691 +alias GLvoid function(GLenum) pfglEndQuery;
8692 +alias GLvoid function(GLenum, GLenum, GLint*) pfglGetQueryiv;
8693 +alias GLvoid function(GLuint, GLenum, GLint*) pfglGetQueryObjectiv;
8694 +alias GLvoid function(GLuint, GLenum, GLuint*) pfglGetQueryObjectuiv;
8695 +alias GLvoid function(GLenum, GLuint) pfglBindBuffer;
8696 +alias GLvoid function(GLsizei, GLuint*) pfglDeleteBuffers;
8697 +alias GLvoid function(GLsizei, GLuint*) pfglGenBuffers;
8698 +alias GLboolean function(GLuint) pfglIsBuffer;
8699 +alias GLvoid function(GLenum, GLsizeiptr, GLvoid*, GLenum) pfglBufferData;
8700 +alias GLvoid function(GLenum, GLintptr, GLsizeiptr,GLvoid*) pfglBufferSubData;
8701 +alias GLvoid function(GLenum, GLintptr, GLsizeiptr, GLvoid*) pfglGetBufferSubData;
8702 +alias GLvoid* function(GLenum, GLenum) pfglMapBuffer;
8703 +alias GLboolean function(GLenum) pfglUnmapBuffer;
8704 +alias GLvoid function(GLenum, GLenum, GLint*) pfglGetBufferParameteriv;
8705 +alias GLvoid function(GLenum, GLenum, GLvoid**) pfglGetBufferPointerv;
8706 +}
8708 -typedef GLvoid function(GLsizei, GLuint*) pfglGenQueries;
8709 -typedef GLvoid function(GLsizei,GLuint*) pfglDeleteQueries;
8710 -typedef GLboolean function(GLuint) pfglIsQuery;
8711 -typedef GLvoid function(GLenum, GLuint) pfglBeginQuery;
8712 -typedef GLvoid function(GLenum) pfglEndQuery;
8713 -typedef GLvoid function(GLenum, GLenum, GLint*) pfglGetQueryiv;
8714 -typedef GLvoid function(GLuint, GLenum, GLint*) pfglGetQueryObjectiv;
8715 -typedef GLvoid function(GLuint, GLenum, GLuint*) pfglGetQueryObjectuiv;
8716 -typedef GLvoid function(GLenum, GLuint) pfglBindBuffer;
8717 -typedef GLvoid function(GLsizei, GLuint*) pfglDeleteBuffers;
8718 -typedef GLvoid function(GLsizei, GLuint*) pfglGenBuffers;
8719 -typedef GLboolean function(GLuint) pfglIsBuffer;
8720 -typedef GLvoid function(GLenum, GLsizeiptr, GLvoid*, GLenum) pfglBufferData;
8721 -typedef GLvoid function(GLenum, GLintptr, GLsizeiptr,GLvoid*) pfglBufferSubData;
8722 -typedef GLvoid function(GLenum, GLintptr, GLsizeiptr, GLvoid*) pfglGetBufferSubData;
8723 -typedef GLvoid* function(GLenum, GLenum) pfglMapBuffer;
8724 -typedef GLboolean function(GLenum) pfglUnmapBuffer;
8725 -typedef GLvoid function(GLenum, GLenum, GLint*) pfglGetBufferParameteriv;
8726 -typedef GLvoid function(GLenum, GLenum, GLvoid**) pfglGetBufferPointerv;
8727 -
8728 pfglGenQueries glGenQueries;
8729 pfglDeleteQueries glDeleteQueries;
8730 pfglIsQuery glIsQuery;
8731 Index: DerelictGL/derelict/opengl/wgl.d
8732 ===================================================================
8733 --- DerelictGL/derelict/opengl/wgl.d (revision 318)
8734 +++ DerelictGL/derelict/opengl/wgl.d (working copy)
8735 @@ -47,24 +47,26 @@
8736 extern(Windows)
8737 {
8738 // WGL functions
8739 - typedef BOOL function(void*,void*) pfwglCopyContext;
8740 - typedef void* function(void*) pfwglCreateContext;
8741 - typedef void* function(void*,int) pfwglCreateLayerContext;
8742 - typedef BOOL function(void*) pfwglDeleteContext;
8743 - typedef BOOL function(void*,int,int,UINT,LAYERPLANEDESCRIPTOR*) pfwglDescribeLayerPlane;
8744 - typedef void* function() pfwglGetCurrentContext;
8745 - typedef void* function() pfwglGetCurrentDC;
8746 - typedef int function(void*,int,int,int,COLORREF*) pfwglGetLayerPaletteEntries;
8747 - typedef FARPROC function(LPCSTR) pfwglGetProcAddress;
8748 - typedef BOOL function(void*,void*) pfwglMakeCurrent;
8749 - typedef BOOL function(void*,int,BOOL) pfwglRealizeLayerPalette;
8750 - typedef int function(void*,int,int,int,COLORREF*) pfwglSetLayerPaletteEntries;
8751 - typedef BOOL function(void*,void*) pfwglShareLists;
8752 - typedef BOOL function(void*,UINT) pfwglSwapLayerBuffers;
8753 - typedef BOOL function(void*,DWORD,DWORD,DWORD) pfwglUseFontBitmapsA;
8754 - typedef BOOL function(void*,DWORD,DWORD,DWORD,FLOAT,FLOAT,int,GLYPHMETRICSFLOAT*) pfwglUseFontOutlinesA;
8755 - typedef BOOL function(void*,DWORD,DWORD,DWORD) pfwglUseFontBitmapsW;
8756 - typedef BOOL function(void*,DWORD,DWORD,DWORD,FLOAT,FLOAT,int,GLYPHMETRICSFLOAT*) pfwglUseFontOutlinesW;
8757 + alias BOOL function(void*,void*) pfwglCopyContext;
8758 + alias void* function(void*) pfwglCreateContext;
8759 + alias void* function(void*,int) pfwglCreateLayerContext;
8760 + alias BOOL function(void*) pfwglDeleteContext;
8761 + alias BOOL function(void*,int,int,UINT,LAYERPLANEDESCRIPTOR*) pfwglDescribeLayerPlane;
8762 + alias void* function() pfwglGetCurrentContext;
8763 + alias void* function() pfwglGetCurrentDC;
8764 + alias int function(void*,int,int,int,COLORREF*) pfwglGetLayerPaletteEntries;
8765 + alias FARPROC function(LPCSTR) pfwglGetProcAddress;
8766 + alias BOOL function(void*,void*) pfwglMakeCurrent;
8767 + alias BOOL function(void*,int,BOOL) pfwglRealizeLayerPalette;
8768 + alias int function(void*,int,int,int,COLORREF*) pfwglSetLayerPaletteEntries;
8769 + alias BOOL function(void*,void*) pfwglShareLists;
8770 + alias BOOL function(void*,UINT) pfwglSwapLayerBuffers;
8771 + alias BOOL function(void*,DWORD,DWORD,DWORD) pfwglUseFontBitmapsA;
8772 + alias BOOL function(void*,DWORD,DWORD,DWORD,FLOAT,FLOAT,int,GLYPHMETRICSFLOAT*) pfwglUseFontOutlinesA;
8773 + alias BOOL function(void*,DWORD,DWORD,DWORD) pfwglUseFontBitmapsW;
8774 + alias BOOL function(void*,DWORD,DWORD,DWORD,FLOAT,FLOAT,int,GLYPHMETRICSFLOAT*) pfwglUseFontOutlinesW;
8775 + } // extern(Windows)
8776 +
8777 pfwglCopyContext wglCopyContext;
8778 pfwglCreateContext wglCreateContext;
8779 pfwglCreateLayerContext wglCreateLayerContext;
8780 @@ -86,7 +88,6 @@
8782 alias wglUseFontBitmapsA wglUseFontBitmaps;
8783 alias wglUseFontOutlinesA wglUseFontOutlines;
8784 - } // extern(Windows)
8788 Index: DerelictGL/derelict/opengl/extension/ext/histogram.d
8789 ===================================================================
8790 --- DerelictGL/derelict/opengl/extension/ext/histogram.d (revision 318)
8791 +++ DerelictGL/derelict/opengl/extension/ext/histogram.d (working copy)
8792 @@ -108,19 +108,19 @@
8793 GL_TABLE_TOO_LARGE_EXT = 0x8031,
8794 }
8796 -extern(System):
8797 +extern(System) {
8798 +alias void function(GLenum, GLboolean, GLenum, GLenum, GLvoid*) pfglGetHistogramEXT;
8799 +alias void function(GLenum, GLenum, GLfloat*) pfglGetHistogramParameterfvEXT;
8800 +alias void function(GLenum, GLenum, GLint*) pfglGetHistogramParameterivEXT;
8801 +alias void function(GLenum, GLboolean, GLenum, GLenum, GLvoid*) pfglGetMinmaxEXT;
8802 +alias void function(GLenum, GLenum, GLfloat*) pfglGetMinmaxParameterfvEXT;
8803 +alias void function(GLenum, GLsizei, GLenum, GLint*) pfglGetMinmaxParameterivEXT;
8804 +alias void function(GLenum, GLsizei, GLenum, GLboolean) pfglHistogramEXT;
8805 +alias void function(GLenum, GLenum, GLboolean) pfglMinmaxEXT;
8806 +alias void function(GLenum) pfglResetHistogramEXT;
8807 +alias void function(GLenum) pfglResetMinmaxEXT;
8808 +}
8810 -typedef void function(GLenum, GLboolean, GLenum, GLenum, GLvoid*) pfglGetHistogramEXT;
8811 -typedef void function(GLenum, GLenum, GLfloat*) pfglGetHistogramParameterfvEXT;
8812 -typedef void function(GLenum, GLenum, GLint*) pfglGetHistogramParameterivEXT;
8813 -typedef void function(GLenum, GLboolean, GLenum, GLenum, GLvoid*) pfglGetMinmaxEXT;
8814 -typedef void function(GLenum, GLenum, GLfloat*) pfglGetMinmaxParameterfvEXT;
8815 -typedef void function(GLenum, GLsizei, GLenum, GLint*) pfglGetMinmaxParameterivEXT;
8816 -typedef void function(GLenum, GLsizei, GLenum, GLboolean) pfglHistogramEXT;
8817 -typedef void function(GLenum, GLenum, GLboolean) pfglMinmaxEXT;
8818 -typedef void function(GLenum) pfglResetHistogramEXT;
8819 -typedef void function(GLenum) pfglResetMinmaxEXT;
8820 -
8821 pfglGetHistogramEXT glGetHistogramEXT;
8822 pfglGetHistogramParameterfvEXT glGetHistogramParameterfvEXT;
8823 pfglGetHistogramParameterivEXT glGetHistogramParameterivEXT;
8824 Index: DerelictGL/derelict/opengl/extension/ext/color_subtable.d
8825 ===================================================================
8826 --- DerelictGL/derelict/opengl/extension/ext/color_subtable.d (revision 318)
8827 +++ DerelictGL/derelict/opengl/extension/ext/color_subtable.d (working copy)
8828 @@ -75,10 +75,10 @@
8829 }
8830 }
8832 -extern(System):
8833 +extern(System) {
8834 +alias void function(GLenum, GLsizei, GLsizei, GLenum, GLenum, GLvoid*) pfglColorSubTableEXT;
8835 +alias void function(GLenum, GLsizei, GLint, GLint, GLsizei) pfglCopyColorSubTableEXT;
8836 +}
8838 -typedef void function(GLenum, GLsizei, GLsizei, GLenum, GLenum, GLvoid*) pfglColorSubTableEXT;
8839 -typedef void function(GLenum, GLsizei, GLint, GLint, GLsizei) pfglCopyColorSubTableEXT;
8840 -
8841 pfglColorSubTableEXT glColorSubTableEXT;
8842 -pfglCopyColorSubTableEXT glCopyColorSubTableEXT;
8843 \ No newline at end of file
8844 +pfglCopyColorSubTableEXT glCopyColorSubTableEXT;
8845 Index: DerelictGL/derelict/opengl/extension/ext/draw_range_elements.d
8846 ===================================================================
8847 --- DerelictGL/derelict/opengl/extension/ext/draw_range_elements.d (revision 318)
8848 +++ DerelictGL/derelict/opengl/extension/ext/draw_range_elements.d (working copy)
8849 @@ -78,8 +78,8 @@
8850 GL_MAX_ELEMENTS_INDICES_EXT = 0x80E9,
8851 }
8853 -extern(System):
8854 +extern(System) {
8855 +alias void function(GLenum, GLuint, GLuint, GLsizei, GLenum, GLvoid*) pfglDrawRangeElementsEXT;
8856 +}
8858 -typedef void function(GLenum, GLuint, GLuint, GLsizei, GLenum, GLvoid*) pfglDrawRangeElementsEXT;
8859 -
8860 pfglDrawRangeElementsEXT glDrawRangeElementsEXT;
8861 Index: DerelictGL/derelict/opengl/extension/ext/geometry_shader4.d
8862 ===================================================================
8863 --- DerelictGL/derelict/opengl/extension/ext/geometry_shader4.d (revision 318)
8864 +++ DerelictGL/derelict/opengl/extension/ext/geometry_shader4.d (working copy)
8865 @@ -102,14 +102,14 @@
8866 GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_EXT = 0x8DE1,
8867 }
8869 -extern(System):
8870 +extern(System) {
8871 +alias void function(GLenum,GLenum,GLuint,GLint) pfglFramebufferTextureEXT;
8872 +alias void function(GLenum,GLenum,GLuint,GLint,GLenum) pfglFramebufferTextureFaceEXT;
8873 +alias void function(GLenum,GLenum,GLuint,GLint,GLint) pfglFramebufferTextureLayerEXT;
8874 +alias void function(GLuint,GLenum,GLint) pfglProgramParameteriEXT;
8875 +}
8877 -typedef void function(GLenum,GLenum,GLuint,GLint) pfglFramebufferTextureEXT;
8878 -typedef void function(GLenum,GLenum,GLuint,GLint,GLenum) pfglFramebufferTextureFaceEXT;
8879 -typedef void function(GLenum,GLenum,GLuint,GLint,GLint) pfglFramebufferTextureLayerEXT;
8880 -typedef void function(GLuint,GLenum,GLint) pfglProgramParameteriEXT;
8881 -
8882 pfglFramebufferTextureEXT glFramebufferTextureEXT;
8883 pfglFramebufferTextureFaceEXT glFramebufferTextureFaceEXT;
8884 pfglFramebufferTextureLayerEXT glFramebufferTextureLayerEXT;
8885 -pfglProgramParameteriEXT glProgramParameteriEXT;
8886 \ No newline at end of file
8887 +pfglProgramParameteriEXT glProgramParameteriEXT;
8888 Index: DerelictGL/derelict/opengl/extension/ext/point_parameters.d
8889 ===================================================================
8890 --- DerelictGL/derelict/opengl/extension/ext/point_parameters.d (revision 318)
8891 +++ DerelictGL/derelict/opengl/extension/ext/point_parameters.d (working copy)
8892 @@ -75,10 +75,10 @@
8893 }
8894 }
8896 -extern(System):
8897 +extern(System) {
8898 +alias void function(GLenum, GLfloat) pfglPointParameterfEXT;
8899 +alias void function(GLenum, GLfloat*) pfglPointParameterfvEXT;
8900 +}
8902 -typedef void function(GLenum, GLfloat) pfglPointParameterfEXT;
8903 -typedef void function(GLenum, GLfloat*) pfglPointParameterfvEXT;
8904 -
8905 pfglPointParameterfEXT glPointParameterfEXT;
8906 -pfglPointParameterfvEXT glPointParameterfvEXT;
8907 \ No newline at end of file
8908 +pfglPointParameterfvEXT glPointParameterfvEXT;
8909 Index: DerelictGL/derelict/opengl/extension/ext/depth_bounds_test.d
8910 ===================================================================
8911 --- DerelictGL/derelict/opengl/extension/ext/depth_bounds_test.d (revision 318)
8912 +++ DerelictGL/derelict/opengl/extension/ext/depth_bounds_test.d (working copy)
8913 @@ -78,8 +78,8 @@
8914 GL_DEPTH_BOUNDS_EXT = 0x8891,
8915 }
8917 -extern(System):
8918 +extern(System) {
8919 +alias void function(GLclampd, GLclampd) pfglDepthBoundsEXT;
8920 +}
8922 -typedef void function(GLclampd, GLclampd) pfglDepthBoundsEXT;
8923 -
8924 pfglDepthBoundsEXT glDepthBoundsEXT;
8925 Index: DerelictGL/derelict/opengl/extension/ext/texture3D.d
8926 ===================================================================
8927 --- DerelictGL/derelict/opengl/extension/ext/texture3D.d (revision 318)
8928 +++ DerelictGL/derelict/opengl/extension/ext/texture3D.d (working copy)
8929 @@ -87,10 +87,10 @@
8930 GL_MAX_3D_TEXTURE_SIZE_EXT = 0x8073,
8931 }
8933 -extern(System):
8934 +extern(System) {
8935 +alias void function(GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLenum, GLenum, GLvoid*) pfglTexImage3DEXT;
8936 +alias void function(GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLenum, GLvoid*) pfglTexSubImage3DEXT;
8937 +}
8939 -typedef void function(GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLenum, GLenum, GLvoid*) pfglTexImage3DEXT;
8940 -typedef void function(GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLenum, GLvoid*) pfglTexSubImage3DEXT;
8941 -
8942 pfglTexImage3DEXT glTexImage3DEXT;
8943 pfglTexSubImage3DEXT glTexSubImage3DEXT;
8944 Index: DerelictGL/derelict/opengl/extension/ext/compiled_vertex_array.d
8945 ===================================================================
8946 --- DerelictGL/derelict/opengl/extension/ext/compiled_vertex_array.d (revision 318)
8947 +++ DerelictGL/derelict/opengl/extension/ext/compiled_vertex_array.d (working copy)
8948 @@ -80,10 +80,10 @@
8949 GL_ARRAY_ELEMENT_LOCK_COUNT_EXT = 0x81A9,
8950 }
8952 -extern(System):
8953 +extern(System) {
8954 +alias void function(GLint, GLsizei) pfglLockArraysEXT;
8955 +alias void function() pfglUnlockArraysEXT;
8956 +}
8958 -typedef void function(GLint, GLsizei) pfglLockArraysEXT;
8959 -typedef void function() pfglUnlockArraysEXT;
8960 -
8961 pfglLockArraysEXT glLockArraysEXT;
8962 pfglUnlockArraysEXT glUnlockArraysEXT;
8963 Index: DerelictGL/derelict/opengl/extension/ext/multi_draw_arrays.d
8964 ===================================================================
8965 --- DerelictGL/derelict/opengl/extension/ext/multi_draw_arrays.d (revision 318)
8966 +++ DerelictGL/derelict/opengl/extension/ext/multi_draw_arrays.d (working copy)
8967 @@ -74,10 +74,10 @@
8968 }
8969 }
8971 -extern(System):
8972 +extern(System) {
8973 +alias void function(GLenum, GLint*, GLsizei*, GLsizei) pfglMultiDrawArraysEXT;
8974 +alias void function(GLenum, GLsizei*, GLenum, GLvoid*, GLsizei) pfglMultiDrawElementsEXT;
8975 +}
8977 -typedef void function(GLenum, GLint*, GLsizei*, GLsizei) pfglMultiDrawArraysEXT;
8978 -typedef void function(GLenum, GLsizei*, GLenum, GLvoid*, GLsizei) pfglMultiDrawElementsEXT;
8979 -
8980 pfglMultiDrawArraysEXT glMultiDrawArraysEXT;
8981 -pfglMultiDrawElementsEXT glMultiDrawElementsEXT;
8982 \ No newline at end of file
8983 +pfglMultiDrawElementsEXT glMultiDrawElementsEXT;
8984 Index: DerelictGL/derelict/opengl/extension/ext/multisample.d
8985 ===================================================================
8986 --- DerelictGL/derelict/opengl/extension/ext/multisample.d (revision 318)
8987 +++ DerelictGL/derelict/opengl/extension/ext/multisample.d (working copy)
8988 @@ -99,10 +99,10 @@
8989 GL_MULTISAMPLE_BIT_EXT = 0x20000000
8990 }
8992 -extern(System):
8993 +extern(System) {
8994 +alias void function(GLclampf,GLboolean) pfglSampleMaskEXT;
8995 +alias void function(GLenum) pfglSamplePatternEXT;
8996 +}
8998 -typedef void function(GLclampf,GLboolean) pfglSampleMaskEXT;
8999 -typedef void function(GLenum) pfglSamplePatternEXT;
9000 -
9001 pfglSampleMaskEXT glSampleMaskEXT;
9002 -pfglSamplePatternEXT glSamplePatternEXT;
9003 \ No newline at end of file
9004 +pfglSamplePatternEXT glSamplePatternEXT;
9005 Index: DerelictGL/derelict/opengl/extension/ext/blend_minmax.d
9006 ===================================================================
9007 --- DerelictGL/derelict/opengl/extension/ext/blend_minmax.d (revision 318)
9008 +++ DerelictGL/derelict/opengl/extension/ext/blend_minmax.d (working copy)
9009 @@ -80,8 +80,8 @@
9010 GL_BLEND_EQUATION_EXT = 0x8009,
9011 }
9013 -extern(System):
9014 +extern(System) {
9015 +alias void function(GLenum) pfglBlendEquationEXT;
9016 +}
9018 -typedef void function(GLenum) pfglBlendEquationEXT;
9019 -
9020 pfglBlendEquationEXT glBlendEquationEXT;
9021 Index: DerelictGL/derelict/opengl/extension/ext/framebuffer_blit.d
9022 ===================================================================
9023 --- DerelictGL/derelict/opengl/extension/ext/framebuffer_blit.d (revision 318)
9024 +++ DerelictGL/derelict/opengl/extension/ext/framebuffer_blit.d (working copy)
9025 @@ -80,8 +80,8 @@
9026 GL_DRAW_FRAMEBUFFER_BINDING_EXT = 0x8CAA,
9027 }
9029 -extern(System):
9030 +extern(System) {
9031 +alias void function(GLint, GLint, GLint, GLint, GLint, GLint, GLint, GLint, GLbitfield, GLenum) pfglBlitFramebufferEXT;
9032 +}
9034 -typedef void function(GLint, GLint, GLint, GLint, GLint, GLint, GLint, GLint, GLbitfield, GLenum) pfglBlitFramebufferEXT;
9035 -
9036 pfglBlitFramebufferEXT glBlitFramebufferEXT;
9037 Index: DerelictGL/derelict/opengl/extension/ext/framebuffer_multisample.d
9038 ===================================================================
9039 --- DerelictGL/derelict/opengl/extension/ext/framebuffer_multisample.d (revision 318)
9040 +++ DerelictGL/derelict/opengl/extension/ext/framebuffer_multisample.d (working copy)
9041 @@ -77,8 +77,8 @@
9042 GL_RENDERBUFFER_SAMPLES_EXT = 0x8CAB
9043 }
9045 -extern(System):
9046 +extern(System) {
9047 +alias void function(GLenum, GLsizei, GLenum, GLsizei, GLsizei) pfglRenderbufferStorageMultisampleEXT;
9048 +}
9050 -typedef void function(GLenum, GLsizei, GLenum, GLsizei, GLsizei) pfglRenderbufferStorageMultisampleEXT;
9051 -
9052 pfglRenderbufferStorageMultisampleEXT glRenderbufferStorageMultisampleEXT;
9053 Index: DerelictGL/derelict/opengl/extension/ext/texture_perturb_normal.d
9054 ===================================================================
9055 --- DerelictGL/derelict/opengl/extension/ext/texture_perturb_normal.d (revision 318)
9056 +++ DerelictGL/derelict/opengl/extension/ext/texture_perturb_normal.d (working copy)
9057 @@ -78,8 +78,8 @@
9058 GL_TEXTURE_NORMAL_EXT = 0x85AF,
9059 }
9061 -extern(System):
9062 +extern(System) {
9063 +alias void function(GLenum) pfglTextureNormalEXT;
9064 +}
9066 -typedef void function(GLenum) pfglTextureNormalEXT;
9067 -
9068 pfglTextureNormalEXT glTextureNormalEXT;
9069 Index: DerelictGL/derelict/opengl/extension/ext/texture_integer.d
9070 ===================================================================
9071 --- DerelictGL/derelict/opengl/extension/ext/texture_integer.d (revision 318)
9072 +++ DerelictGL/derelict/opengl/extension/ext/texture_integer.d (working copy)
9073 @@ -133,18 +133,18 @@
9074 GL_RGBA_INTEGER_MODE_EXT = 0x8D9E,
9075 }
9077 -extern(System):
9078 +extern(System) {
9079 +alias void function(GLint,GLint,GLint,GLint) pfglClearColorIiEXT;
9080 +alias void function(GLuint,GLuint,GLuint,GLuint) pfglClearColorIuiEXT;
9081 +alias void function(GLenum,GLenum,GLint*) pfglGetTexParameterIivEXT;
9082 +alias void function(GLenum,GLenum,GLuint*) pfglGetTexParameterIuivEXT;
9083 +alias void function(GLenum,GLenum,GLint*) pfglTexParameterIivEXT;
9084 +alias void function(GLenum,GLenum,GLuint*) pfglTexParameterIuivEXT;
9085 +}
9087 -typedef void function(GLint,GLint,GLint,GLint) pfglClearColorIiEXT;
9088 -typedef void function(GLuint,GLuint,GLuint,GLuint) pfglClearColorIuiEXT;
9089 -typedef void function(GLenum,GLenum,GLint*) pfglGetTexParameterIivEXT;
9090 -typedef void function(GLenum,GLenum,GLuint*) pfglGetTexParameterIuivEXT;
9091 -typedef void function(GLenum,GLenum,GLint*) pfglTexParameterIivEXT;
9092 -typedef void function(GLenum,GLenum,GLuint*) pfglTexParameterIuivEXT;
9093 -
9094 pfglClearColorIiEXT glClearColorIiEXT;
9095 pfglClearColorIuiEXT glClearColorIuiEXT;
9096 pfglGetTexParameterIivEXT glGetTexParameterIivEXT;
9097 pfglGetTexParameterIuivEXT glGetTexParameterIuivEXT;
9098 pfglTexParameterIivEXT glTexParameterIivEXT;
9099 -pfglTexParameterIuivEXT glTexParameterIuivEXT;
9100 \ No newline at end of file
9101 +pfglTexParameterIuivEXT glTexParameterIuivEXT;
9102 Index: DerelictGL/derelict/opengl/extension/ext/texture_buffer_object.d
9103 ===================================================================
9104 --- DerelictGL/derelict/opengl/extension/ext/texture_buffer_object.d (revision 318)
9105 +++ DerelictGL/derelict/opengl/extension/ext/texture_buffer_object.d (working copy)
9106 @@ -81,8 +81,8 @@
9107 GL_TEXTURE_BUFFER_FORMAT_EXT = 0x8C2E,
9108 }
9110 -extern(System):
9111 +extern(System) {
9112 +alias void function(GLenum,GLenum,GLuint) pfglTexBufferEXT;
9113 +}
9115 -typedef void function(GLenum,GLenum,GLuint) pfglTexBufferEXT;
9116 -
9117 -pfglTexBufferEXT glTexBufferEXT;
9118 \ No newline at end of file
9119 +pfglTexBufferEXT glTexBufferEXT;
9120 Index: DerelictGL/derelict/opengl/extension/ext/blend_color.d
9121 ===================================================================
9122 --- DerelictGL/derelict/opengl/extension/ext/blend_color.d (revision 318)
9123 +++ DerelictGL/derelict/opengl/extension/ext/blend_color.d (working copy)
9124 @@ -81,8 +81,7 @@
9125 GL_BLEND_COLOR_EXT = 0x8005,
9126 }
9128 -extern(System):
9129 -
9130 -typedef void function(GLclampf, GLclampf, GLclampf, GLclampf) pfglBlendColorEXT;
9131 -
9132 +extern(System) {
9133 +alias void function(GLclampf, GLclampf, GLclampf, GLclampf) pfglBlendColorEXT;
9134 +}
9135 pfglBlendColorEXT glBlendColorEXT;
9136 Index: DerelictGL/derelict/opengl/extension/ext/draw_instanced.d
9137 ===================================================================
9138 --- DerelictGL/derelict/opengl/extension/ext/draw_instanced.d (revision 318)
9139 +++ DerelictGL/derelict/opengl/extension/ext/draw_instanced.d (working copy)
9140 @@ -74,10 +74,10 @@
9141 }
9142 }
9144 -extern(System):
9145 +extern(System) {
9146 +alias void function(GLenum,GLint,GLsizei,GLsizei) pfglDrawArraysInstancedEXT;
9147 +alias void function(GLenum,GLsizei,GLenum,GLvoid*,GLsizei) pfglDrawElementsInstancedEXT;
9148 +}
9150 -typedef void function(GLenum,GLint,GLsizei,GLsizei) pfglDrawArraysInstancedEXT;
9151 -typedef void function(GLenum,GLsizei,GLenum,GLvoid*,GLsizei) pfglDrawElementsInstancedEXT;
9152 -
9153 pfglDrawArraysInstancedEXT glDrawArraysInstancedEXT;
9154 -pfglDrawElementsInstancedEXT glDrawElementsInstancedEXT;
9155 \ No newline at end of file
9156 +pfglDrawElementsInstancedEXT glDrawElementsInstancedEXT;
9157 Index: DerelictGL/derelict/opengl/extension/ext/light_texture.d
9158 ===================================================================
9159 --- DerelictGL/derelict/opengl/extension/ext/light_texture.d (revision 318)
9160 +++ DerelictGL/derelict/opengl/extension/ext/light_texture.d (working copy)
9161 @@ -89,12 +89,12 @@
9162 GL_TEXTURE_MATERIAL_PARAMETER_EXT = 0x8352,
9163 }
9165 -extern(System):
9166 +extern(System) {
9167 +alias void function(GLenum) pfglApplyTextureEXT;
9168 +alias void function(GLenum) pfglTextureLightEXT;
9169 +alias void function(GLenum, GLenum) pfglTextureMaterialEXT;
9170 +}
9172 -typedef void function(GLenum) pfglApplyTextureEXT;
9173 -typedef void function(GLenum) pfglTextureLightEXT;
9174 -typedef void function(GLenum, GLenum) pfglTextureMaterialEXT;
9175 -
9176 pfglApplyTextureEXT glApplyTextureEXT;
9177 pfglTextureLightEXT glTextureLightEXT;
9178 pfglTextureMaterialEXT glTextureMaterialEXT;
9179 Index: DerelictGL/derelict/opengl/extension/ext/vertex_shader.d
9180 ===================================================================
9181 --- DerelictGL/derelict/opengl/extension/ext/vertex_shader.d (revision 318)
9182 +++ DerelictGL/derelict/opengl/extension/ext/vertex_shader.d (working copy)
9183 @@ -268,51 +268,51 @@
9184 GL_LOCAL_CONSTANT_DATATYPE_EXT = 0x87ED,
9185 }
9187 -extern(System):
9188 +extern(System) {
9189 +alias void function() pfglBeginVertexShaderEXT;
9190 +alias void function() pfglEndVertexShaderEXT;
9191 +alias void function(GLuint) pfglBindVertexShaderEXT;
9192 +alias GLuint function(GLuint) pfglGenVertexShadersEXT;
9193 +alias void function(GLuint) pfglDeleteVertexShaderEXT;
9194 +alias void function(GLenum,GLuint,GLuint) pfglShaderOp1EXT;
9195 +alias void function(GLenum,GLuint,GLuint,GLuint) pfglShaderOp2EXT;
9196 +alias void function(GLenum,GLuint,GLuint,GLuint,GLuint) pfglShaderOp3EXT;
9197 +alias void function(GLuint,GLuint,GLenum,GLenum,GLenum,GLenum) pfglSwizzleEXT;
9198 +alias void function(GLuint,GLuint,GLenum,GLenum,GLenum,GLenum) pfglWriteMaskEXT;
9199 +alias void function(GLuint,GLuint,GLuint) pfglInsertComponentEXT;
9200 +alias void function(GLuint,GLuint,GLuint) pfglExtractComponentEXT;
9201 +alias GLuint function(GLenum,GLenum,GLenum,GLuint) pfglGenSymbolsEXT;
9202 +alias void function(GLuint,GLenum,GLvoid*) pfglSetInvariantEXT;
9203 +alias void function(GLuint,GLenum,GLvoid*) pfglSetLocalConstantEXT;
9204 +alias void function(GLuint,GLbyte*) pfglVariantbvEXT;
9205 +alias void function(GLuint,GLshort*) pfglVariantsvEXT;
9206 +alias void function(GLuint,GLint*) pfglVariantivEXT;
9207 +alias void function(GLuint,GLfloat*) pfglVariantfvEXT;
9208 +alias void function(GLuint,GLdouble*) pfglVariantdvEXT;
9209 +alias void function(GLuint,GLubyte*) pfglVariantubvEXT;
9210 +alias void function(GLuint,GLushort*) pfglVariantusvEXT;
9211 +alias void function(GLuint,GLuint*) pfglVariantuivEXT;
9212 +alias void function(GLuint,GLenum,GLuint,GLvoid*) pfglVariantPointerEXT;
9213 +alias void function(GLuint) pfglEnableVariantClientStateEXT;
9214 +alias void function(GLuint) pfglDisableVariantClientStateEXT;
9215 +alias GLuint function(GLenum,GLenum) pfglBindLightParameterEXT;
9216 +alias GLuint function(GLenum,GLenum) pfglBindMaterialParameterEXT;
9217 +alias GLuint function(GLenum,GLenum,GLenum) pfglBindTexGenParameterEXT;
9218 +alias GLuint function(GLenum,GLenum) pfglBindTextureUnitParameterEXT;
9219 +alias GLuint function(GLenum) pfglBindParameterEXT;
9220 +alias GLboolean function(GLuint,GLenum) pfglIsVariantEnabledEXT;
9221 +alias void function(GLuint,GLenum,GLboolean*) pfglGetVariantBooleanvEXT;
9222 +alias void function(GLuint,GLenum,GLint*) pfglGetVariantIntegervEXT;
9223 +alias void function(GLuint,GLenum,GLfloat*) pfglGetVariantFloatvEXT;
9224 +alias void function(GLuint,GLenum,GLvoid*) pfglGetVariantPointervEXT;
9225 +alias void function(GLuint,GLenum,GLboolean*) pfglGetInvariantBooleanvEXT;
9226 +alias void function(GLuint,GLenum,GLint*) pfglGetInvariantIntegervEXT;
9227 +alias void function(GLuint,GLenum,GLfloat*) pfglGetInvariantFloatvEXT;
9228 +alias void function(GLuint,GLenum,GLboolean*) pfglGetLocalConstantBooleanvEXT;
9229 +alias void function(GLuint,GLenum,GLint*) pfglGetLocalConstantIntegervEXT;
9230 +alias void function(GLuint,GLenum,GLfloat*) pfglGetLocalConstantFloatvEXT;
9231 +}
9233 -typedef void function() pfglBeginVertexShaderEXT;
9234 -typedef void function() pfglEndVertexShaderEXT;
9235 -typedef void function(GLuint) pfglBindVertexShaderEXT;
9236 -typedef GLuint function(GLuint) pfglGenVertexShadersEXT;
9237 -typedef void function(GLuint) pfglDeleteVertexShaderEXT;
9238 -typedef void function(GLenum,GLuint,GLuint) pfglShaderOp1EXT;
9239 -typedef void function(GLenum,GLuint,GLuint,GLuint) pfglShaderOp2EXT;
9240 -typedef void function(GLenum,GLuint,GLuint,GLuint,GLuint) pfglShaderOp3EXT;
9241 -typedef void function(GLuint,GLuint,GLenum,GLenum,GLenum,GLenum) pfglSwizzleEXT;
9242 -typedef void function(GLuint,GLuint,GLenum,GLenum,GLenum,GLenum) pfglWriteMaskEXT;
9243 -typedef void function(GLuint,GLuint,GLuint) pfglInsertComponentEXT;
9244 -typedef void function(GLuint,GLuint,GLuint) pfglExtractComponentEXT;
9245 -typedef GLuint function(GLenum,GLenum,GLenum,GLuint) pfglGenSymbolsEXT;
9246 -typedef void function(GLuint,GLenum,GLvoid*) pfglSetInvariantEXT;
9247 -typedef void function(GLuint,GLenum,GLvoid*) pfglSetLocalConstantEXT;
9248 -typedef void function(GLuint,GLbyte*) pfglVariantbvEXT;
9249 -typedef void function(GLuint,GLshort*) pfglVariantsvEXT;
9250 -typedef void function(GLuint,GLint*) pfglVariantivEXT;
9251 -typedef void function(GLuint,GLfloat*) pfglVariantfvEXT;
9252 -typedef void function(GLuint,GLdouble*) pfglVariantdvEXT;
9253 -typedef void function(GLuint,GLubyte*) pfglVariantubvEXT;
9254 -typedef void function(GLuint,GLushort*) pfglVariantusvEXT;
9255 -typedef void function(GLuint,GLuint*) pfglVariantuivEXT;
9256 -typedef void function(GLuint,GLenum,GLuint,GLvoid*) pfglVariantPointerEXT;
9257 -typedef void function(GLuint) pfglEnableVariantClientStateEXT;
9258 -typedef void function(GLuint) pfglDisableVariantClientStateEXT;
9259 -typedef GLuint function(GLenum,GLenum) pfglBindLightParameterEXT;
9260 -typedef GLuint function(GLenum,GLenum) pfglBindMaterialParameterEXT;
9261 -typedef GLuint function(GLenum,GLenum,GLenum) pfglBindTexGenParameterEXT;
9262 -typedef GLuint function(GLenum,GLenum) pfglBindTextureUnitParameterEXT;
9263 -typedef GLuint function(GLenum) pfglBindParameterEXT;
9264 -typedef GLboolean function(GLuint,GLenum) pfglIsVariantEnabledEXT;
9265 -typedef void function(GLuint,GLenum,GLboolean*) pfglGetVariantBooleanvEXT;
9266 -typedef void function(GLuint,GLenum,GLint*) pfglGetVariantIntegervEXT;
9267 -typedef void function(GLuint,GLenum,GLfloat*) pfglGetVariantFloatvEXT;
9268 -typedef void function(GLuint,GLenum,GLvoid*) pfglGetVariantPointervEXT;
9269 -typedef void function(GLuint,GLenum,GLboolean*) pfglGetInvariantBooleanvEXT;
9270 -typedef void function(GLuint,GLenum,GLint*) pfglGetInvariantIntegervEXT;
9271 -typedef void function(GLuint,GLenum,GLfloat*) pfglGetInvariantFloatvEXT;
9272 -typedef void function(GLuint,GLenum,GLboolean*) pfglGetLocalConstantBooleanvEXT;
9273 -typedef void function(GLuint,GLenum,GLint*) pfglGetLocalConstantIntegervEXT;
9274 -typedef void function(GLuint,GLenum,GLfloat*) pfglGetLocalConstantFloatvEXT;
9275 -
9276 pfglBeginVertexShaderEXT glBeginVertexShaderEXT;
9277 pfglEndVertexShaderEXT glEndVertexShaderEXT;
9278 pfglBindVertexShaderEXT glBindVertexShaderEXT;
9279 @@ -354,4 +354,4 @@
9280 pfglGetInvariantFloatvEXT glGetInvariantFloatvEXT;
9281 pfglGetLocalConstantBooleanvEXT glGetLocalConstantBooleanvEXT;
9282 pfglGetLocalConstantIntegervEXT glGetLocalConstantIntegervEXT;
9283 -pfglGetLocalConstantFloatvEXT glGetLocalConstantFloatvEXT;
9284 \ No newline at end of file
9285 +pfglGetLocalConstantFloatvEXT glGetLocalConstantFloatvEXT;
9286 Index: DerelictGL/derelict/opengl/extension/ext/gpu_shader4.d
9287 ===================================================================
9288 --- DerelictGL/derelict/opengl/extension/ext/gpu_shader4.d (revision 318)
9289 +++ DerelictGL/derelict/opengl/extension/ext/gpu_shader4.d (working copy)
9290 @@ -168,43 +168,43 @@
9291 GL_UNSIGNED_INT_SAMPLER_BUFFER_EXT = 0x8DD8,
9292 }
9294 -extern(System):
9295 +extern(System) {
9296 +alias void function(GLuint,GLuint,GLchar*) pfglBindFragDataLocationEXT;
9297 +alias GLint function(GLuint,GLchar*) pfglGetFragDataLocationEXT;
9298 +alias void function(GLuint,GLint,GLuint*) pfglGetUniformuivEXT;
9299 +alias void function(GLuint,GLenum,GLint*) pfglGetVertexAttribIivEXT;
9300 +alias void function(GLuint,GLenum,GLuint*) pfglGetVertexAttribIuivEXT;
9301 +alias void function(GLint,GLuint) pfglUniform1uiEXT;
9302 +alias void function(GLint,GLsizei,GLuint*) pfglUniform1uivEXT;
9303 +alias void function(GLint,GLuint,GLuint) pfglUniform2uiEXT;
9304 +alias void function(GLint,GLsizei,GLuint*) pfglUniform2uivEXT;
9305 +alias void function(GLint,GLuint,GLuint,GLuint) pfglUniform3uiEXT;
9306 +alias void function(GLint,GLsizei,GLuint*) pfglUniform3uivEXT;
9307 +alias void function(GLint,GLuint,GLuint,GLuint,GLuint) pfglUniform4uiEXT;
9308 +alias void function(GLint,GLsizei,GLuint*) pfglUniform4uivEXT;
9309 +alias void function(GLuint,GLint) pfglVertexAttribI1iEXT;
9310 +alias void function(GLuint,GLint*) pfglVertexAttribI1ivEXT;
9311 +alias void function(GLuint,GLuint) pfglVertexAttribI1uiEXT;
9312 +alias void function(GLuint,GLuint*) pfglVertexAttribI1uivEXT;
9313 +alias void function(GLuint,GLint,GLint) pfglVertexAttribI2iEXT;
9314 +alias void function(GLuint,GLint*) pfglVertexAttribI2ivEXT;
9315 +alias void function(GLuint,GLuint,GLuint) pfglVertexAttribI2uiEXT;
9316 +alias void function(GLuint,GLuint*) pfglVertexAttribI2uivEXT;
9317 +alias void function(GLuint,GLint,GLint,GLint) pfglVertexAttribI3iEXT;
9318 +alias void function(GLuint,GLint*) pfglVertexAttribI3ivEXT;
9319 +alias void function(GLuint,GLuint,GLuint,GLuint) pfglVertexAttribI3uiEXT;
9320 +alias void function(GLuint,GLuint*) pfglVertexAttribI3uivEXT;
9321 +alias void function(GLuint,GLbyte*) pfglVertexAttribI4bvEXT;
9322 +alias void function(GLuint,GLint,GLint,GLint,GLint) pfglVertexAttribI4iEXT;
9323 +alias void function(GLuint,GLint*) pfglVertexAttribI4ivEXT;
9324 +alias void function(GLuint,GLshort*) pfglVertexAttribI4svEXT;
9325 +alias void function(GLuint,GLubyte*) pfglVertexAttribI4ubvEXT;
9326 +alias void function(GLuint,GLuint,GLuint,GLuint,GLuint) pfglVertexAttribI4uiEXT;
9327 +alias void function(GLuint,GLuint*) pfglVertexAttribI4uivEXT;
9328 +alias void function(GLuint,GLushort*) pfglVertexAttribI4usvEXT;
9329 +alias void function(GLuint,GLint,GLenum,GLenum,GLsizei,GLvoid*) pfglVertexAttribIPointerEXT;
9330 +}
9332 -typedef void function(GLuint,GLuint,GLchar*) pfglBindFragDataLocationEXT;
9333 -typedef GLint function(GLuint,GLchar*) pfglGetFragDataLocationEXT;
9334 -typedef void function(GLuint,GLint,GLuint*) pfglGetUniformuivEXT;
9335 -typedef void function(GLuint,GLenum,GLint*) pfglGetVertexAttribIivEXT;
9336 -typedef void function(GLuint,GLenum,GLuint*) pfglGetVertexAttribIuivEXT;
9337 -typedef void function(GLint,GLuint) pfglUniform1uiEXT;
9338 -typedef void function(GLint,GLsizei,GLuint*) pfglUniform1uivEXT;
9339 -typedef void function(GLint,GLuint,GLuint) pfglUniform2uiEXT;
9340 -typedef void function(GLint,GLsizei,GLuint*) pfglUniform2uivEXT;
9341 -typedef void function(GLint,GLuint,GLuint,GLuint) pfglUniform3uiEXT;
9342 -typedef void function(GLint,GLsizei,GLuint*) pfglUniform3uivEXT;
9343 -typedef void function(GLint,GLuint,GLuint,GLuint,GLuint) pfglUniform4uiEXT;
9344 -typedef void function(GLint,GLsizei,GLuint*) pfglUniform4uivEXT;
9345 -typedef void function(GLuint,GLint) pfglVertexAttribI1iEXT;
9346 -typedef void function(GLuint,GLint*) pfglVertexAttribI1ivEXT;
9347 -typedef void function(GLuint,GLuint) pfglVertexAttribI1uiEXT;
9348 -typedef void function(GLuint,GLuint*) pfglVertexAttribI1uivEXT;
9349 -typedef void function(GLuint,GLint,GLint) pfglVertexAttribI2iEXT;
9350 -typedef void function(GLuint,GLint*) pfglVertexAttribI2ivEXT;
9351 -typedef void function(GLuint,GLuint,GLuint) pfglVertexAttribI2uiEXT;
9352 -typedef void function(GLuint,GLuint*) pfglVertexAttribI2uivEXT;
9353 -typedef void function(GLuint,GLint,GLint,GLint) pfglVertexAttribI3iEXT;
9354 -typedef void function(GLuint,GLint*) pfglVertexAttribI3ivEXT;
9355 -typedef void function(GLuint,GLuint,GLuint,GLuint) pfglVertexAttribI3uiEXT;
9356 -typedef void function(GLuint,GLuint*) pfglVertexAttribI3uivEXT;
9357 -typedef void function(GLuint,GLbyte*) pfglVertexAttribI4bvEXT;
9358 -typedef void function(GLuint,GLint,GLint,GLint,GLint) pfglVertexAttribI4iEXT;
9359 -typedef void function(GLuint,GLint*) pfglVertexAttribI4ivEXT;
9360 -typedef void function(GLuint,GLshort*) pfglVertexAttribI4svEXT;
9361 -typedef void function(GLuint,GLubyte*) pfglVertexAttribI4ubvEXT;
9362 -typedef void function(GLuint,GLuint,GLuint,GLuint,GLuint) pfglVertexAttribI4uiEXT;
9363 -typedef void function(GLuint,GLuint*) pfglVertexAttribI4uivEXT;
9364 -typedef void function(GLuint,GLushort*) pfglVertexAttribI4usvEXT;
9365 -typedef void function(GLuint,GLint,GLenum,GLenum,GLsizei,GLvoid*) pfglVertexAttribIPointerEXT;
9366 -
9367 pfglBindFragDataLocationEXT glBindFragDataLocationEXT;
9368 pfglGetFragDataLocationEXT glGetFragDataLocationEXT;
9369 pfglGetUniformuivEXT glGetUniformuivEXT;
9370 @@ -238,4 +238,4 @@
9371 pfglVertexAttribI4uiEXT glVertexAttribI4uiEXT;
9372 pfglVertexAttribI4uivEXT glVertexAttribI4uivEXT;
9373 pfglVertexAttribI4usvEXT glVertexAttribI4usvEXT;
9374 -pfglVertexAttribIPointerEXT glVertexAttribIPointerEXT;
9375 \ No newline at end of file
9376 +pfglVertexAttribIPointerEXT glVertexAttribIPointerEXT;
9377 Index: DerelictGL/derelict/opengl/extension/ext/timer_query.d
9378 ===================================================================
9379 --- DerelictGL/derelict/opengl/extension/ext/timer_query.d (revision 318)
9380 +++ DerelictGL/derelict/opengl/extension/ext/timer_query.d (working copy)
9381 @@ -82,10 +82,10 @@
9382 GL_TIME_ELAPSED_EXT = 0x88BF
9383 }
9385 -extern(System):
9386 +extern(System) {
9387 +alias void function(GLuint, GLenum, GLint64EXT*) pfglGetQueryObjecti64vEXT;
9388 +alias void function(GLuint, GLenum, GLint64EXT*) pfglGetQueryObjectui64vEXT;
9389 +}
9391 -typedef void function(GLuint, GLenum, GLint64EXT*) pfglGetQueryObjecti64vEXT;
9392 -typedef void function(GLuint, GLenum, GLint64EXT*) pfglGetQueryObjectui64vEXT;
9393 -
9394 pfglGetQueryObjecti64vEXT glGetQueryObjecti64vEXT;
9395 pfglGetQueryObjectui64vEXT glGetQueryObjectui64vEXT;
9396 Index: DerelictGL/derelict/opengl/extension/ext/framebuffer_object.d
9397 ===================================================================
9398 --- DerelictGL/derelict/opengl/extension/ext/framebuffer_object.d (revision 318)
9399 +++ DerelictGL/derelict/opengl/extension/ext/framebuffer_object.d (working copy)
9400 @@ -158,26 +158,26 @@
9401 GL_INVALID_FRAMEBUFFER_OPERATION_EXT = 0x0506,
9402 }
9404 -extern(System):
9405 +extern(System) {
9406 +alias GLboolean function(GLuint) pfglIsRenderbufferEXT;
9407 +alias GLvoid function(GLenum, GLuint) pfglBindRenderbufferEXT;
9408 +alias GLvoid function(GLsizei, GLuint*) pfglDeleteRenderbuffersEXT;
9409 +alias GLvoid function(GLsizei, GLuint*) pfglGenRenderbuffersEXT;
9410 +alias GLvoid function(GLenum, GLenum, GLsizei, GLsizei) pfglRenderbufferStorageEXT;
9411 +alias GLvoid function(GLenum, GLenum, GLint*) pfglGetRenderbufferParameterivEXT;
9412 +alias GLboolean function(GLuint) pfglIsFramebufferEXT;
9413 +alias GLvoid function(GLenum, GLuint) pfglBindFramebufferEXT;
9414 +alias GLvoid function(GLsizei, GLuint*) pfglDeleteFramebuffersEXT;
9415 +alias GLvoid function(GLsizei, GLuint*) pfglGenFramebuffersEXT;
9416 +alias GLenum function(GLenum) pfglCheckFramebufferStatusEXT;
9417 +alias GLvoid function(GLenum, GLenum, GLenum, GLuint, GLint) pfglFramebufferTexture1DEXT;
9418 +alias GLvoid function(GLenum, GLenum, GLenum, GLuint, GLint) pfglFramebufferTexture2DEXT;
9419 +alias GLvoid function(GLenum, GLenum, GLenum, GLuint, GLint, GLint) pfglFramebufferTexture3DEXT;
9420 +alias GLvoid function(GLenum, GLenum, GLenum, GLuint) pfglFramebufferRenderbufferEXT;
9421 +alias GLvoid function(GLenum, GLenum, GLenum, GLint*) pfglGetFramebufferAttachmentParameterivEXT;
9422 +alias GLvoid function(GLenum) pfglGenerateMipmapEXT;
9423 +}
9425 -typedef GLboolean function(GLuint) pfglIsRenderbufferEXT;
9426 -typedef GLvoid function(GLenum, GLuint) pfglBindRenderbufferEXT;
9427 -typedef GLvoid function(GLsizei, GLuint*) pfglDeleteRenderbuffersEXT;
9428 -typedef GLvoid function(GLsizei, GLuint*) pfglGenRenderbuffersEXT;
9429 -typedef GLvoid function(GLenum, GLenum, GLsizei, GLsizei) pfglRenderbufferStorageEXT;
9430 -typedef GLvoid function(GLenum, GLenum, GLint*) pfglGetRenderbufferParameterivEXT;
9431 -typedef GLboolean function(GLuint) pfglIsFramebufferEXT;
9432 -typedef GLvoid function(GLenum, GLuint) pfglBindFramebufferEXT;
9433 -typedef GLvoid function(GLsizei, GLuint*) pfglDeleteFramebuffersEXT;
9434 -typedef GLvoid function(GLsizei, GLuint*) pfglGenFramebuffersEXT;
9435 -typedef GLenum function(GLenum) pfglCheckFramebufferStatusEXT;
9436 -typedef GLvoid function(GLenum, GLenum, GLenum, GLuint, GLint) pfglFramebufferTexture1DEXT;
9437 -typedef GLvoid function(GLenum, GLenum, GLenum, GLuint, GLint) pfglFramebufferTexture2DEXT;
9438 -typedef GLvoid function(GLenum, GLenum, GLenum, GLuint, GLint, GLint) pfglFramebufferTexture3DEXT;
9439 -typedef GLvoid function(GLenum, GLenum, GLenum, GLuint) pfglFramebufferRenderbufferEXT;
9440 -typedef GLvoid function(GLenum, GLenum, GLenum, GLint*) pfglGetFramebufferAttachmentParameterivEXT;
9441 -typedef GLvoid function(GLenum) pfglGenerateMipmapEXT;
9442 -
9443 pfglIsRenderbufferEXT glIsRenderbufferEXT;
9444 pfglBindRenderbufferEXT glBindRenderbufferEXT;
9445 pfglDeleteRenderbuffersEXT glDeleteRenderbuffersEXT;
9446 Index: DerelictGL/derelict/opengl/extension/ext/pixel_transform.d
9447 ===================================================================
9448 --- DerelictGL/derelict/opengl/extension/ext/pixel_transform.d (revision 318)
9449 +++ DerelictGL/derelict/opengl/extension/ext/pixel_transform.d (working copy)
9450 @@ -91,13 +91,12 @@
9451 GL_PIXEL_TRANSFORM_2D_MATRIX_EXT = 0x8338,
9452 }
9454 -extern(System):
9455 -
9456 -typedef void function(GLenum, GLenum, GLint) pfglPixelTransformParameteriEXT;
9457 -typedef void function(GLenum, GLenum, GLfloat) pfglPixelTransformParameterfEXT;
9458 -typedef void function(GLenum, GLenum, GLint*) pfglPixelTransformParameterivEXT;
9459 -typedef void function(GLenum, GLenum, GLfloat*) pfglPixelTransformParameterfvEXT;
9460 -
9461 +extern(System) {
9462 +alias void function(GLenum, GLenum, GLint) pfglPixelTransformParameteriEXT;
9463 +alias void function(GLenum, GLenum, GLfloat) pfglPixelTransformParameterfEXT;
9464 +alias void function(GLenum, GLenum, GLint*) pfglPixelTransformParameterivEXT;
9465 +alias void function(GLenum, GLenum, GLfloat*) pfglPixelTransformParameterfvEXT;
9466 +}
9467 pfglPixelTransformParameteriEXT glPixelTransformParameteriEXT;
9468 pfglPixelTransformParameterfEXT glPixelTransformParameterfEXT;
9469 pfglPixelTransformParameterivEXT glPixelTransformParameterivEXT;
9470 Index: DerelictGL/derelict/opengl/extension/ext/convolution.d
9471 ===================================================================
9472 --- DerelictGL/derelict/opengl/extension/ext/convolution.d (revision 318)
9473 +++ DerelictGL/derelict/opengl/extension/ext/convolution.d (working copy)
9474 @@ -120,22 +120,22 @@
9475 GL_POST_CONVOLUTION_ALPHA_BIAS_EXT = 0x8023,
9476 }
9478 -extern(System):
9479 +extern(System) {
9480 +alias void function(GLenum, GLenum, GLsizei, GLenum, GLenum, GLvoid*) pfglConvolutionFilter1DEXT;
9481 +alias void function(GLenum, GLenum, GLsizei, GLsizei, GLenum, GLenum, GLvoid*) pfglConvolutionFilter2DEXT;
9482 +alias void function(GLenum, GLenum, GLfloat) pfglConvolutionParameterfEXT;
9483 +alias void function(GLenum, GLenum, GLfloat*) pfglConvolutionParameterfvEXT;
9484 +alias void function(GLenum, GLenum, GLint) pfglConvolutionParameteriEXT;
9485 +alias void function(GLenum, GLenum, GLint*) pfglConvolutionParameterivEXT;
9486 +alias void function(GLenum, GLenum, GLint, GLint, GLsizei) pfglCopyConvolutionFilter1DEXT;
9487 +alias void function(GLenum, GLenum, GLint, GLint, GLsizei, GLsizei) pfglCopyConvolutionFilter2DEXT;
9488 +alias void function(GLenum, GLenum, GLenum, GLvoid*) pfglGetConvolutionFilterEXT;
9489 +alias void function(GLenum, GLenum, GLfloat*) pfglGetConvolutionParameterfvEXT;
9490 +alias void function(GLenum, GLenum, GLint*) pfglGetConvolutionParameterivEXT;
9491 +alias void function(GLenum, GLenum, GLenum, GLvoid*, GLvoid*, GLvoid*) pfglGetSeparableFilterEXT;
9492 +alias void function(GLenum, GLenum, GLsizei, GLsizei, GLenum, GLenum, GLvoid*, GLvoid*) pfglSeparableFilter2DEXT;
9493 +}
9495 -typedef void function(GLenum, GLenum, GLsizei, GLenum, GLenum, GLvoid*) pfglConvolutionFilter1DEXT;
9496 -typedef void function(GLenum, GLenum, GLsizei, GLsizei, GLenum, GLenum, GLvoid*) pfglConvolutionFilter2DEXT;
9497 -typedef void function(GLenum, GLenum, GLfloat) pfglConvolutionParameterfEXT;
9498 -typedef void function(GLenum, GLenum, GLfloat*) pfglConvolutionParameterfvEXT;
9499 -typedef void function(GLenum, GLenum, GLint) pfglConvolutionParameteriEXT;
9500 -typedef void function(GLenum, GLenum, GLint*) pfglConvolutionParameterivEXT;
9501 -typedef void function(GLenum, GLenum, GLint, GLint, GLsizei) pfglCopyConvolutionFilter1DEXT;
9502 -typedef void function(GLenum, GLenum, GLint, GLint, GLsizei, GLsizei) pfglCopyConvolutionFilter2DEXT;
9503 -typedef void function(GLenum, GLenum, GLenum, GLvoid*) pfglGetConvolutionFilterEXT;
9504 -typedef void function(GLenum, GLenum, GLfloat*) pfglGetConvolutionParameterfvEXT;
9505 -typedef void function(GLenum, GLenum, GLint*) pfglGetConvolutionParameterivEXT;
9506 -typedef void function(GLenum, GLenum, GLenum, GLvoid*, GLvoid*, GLvoid*) pfglGetSeparableFilterEXT;
9507 -typedef void function(GLenum, GLenum, GLsizei, GLsizei, GLenum, GLenum, GLvoid*, GLvoid*) pfglSeparableFilter2DEXT;
9508 -
9509 pfglConvolutionFilter1DEXT glConvolutionFilter1DEXT;
9510 pfglConvolutionFilter2DEXT glConvolutionFilter2DEXT;
9511 pfglConvolutionParameterfEXT glConvolutionParameterfEXT;
9512 Index: DerelictGL/derelict/opengl/extension/ext/vertex_weighting.d
9513 ===================================================================
9514 --- DerelictGL/derelict/opengl/extension/ext/vertex_weighting.d (revision 318)
9515 +++ DerelictGL/derelict/opengl/extension/ext/vertex_weighting.d (working copy)
9516 @@ -93,12 +93,12 @@
9517 GL_VERTEX_WEIGHT_ARRAY_POINTER_EXT = 0x8510,
9518 }
9520 -extern(System):
9521 +extern(System) {
9522 +alias void function(GLfloat) pfglVertexWeightfEXT;
9523 +alias void function(GLfloat*) pfglVertexWeightfvEXT;
9524 +alias void function(GLsizei,GLenum,GLsizei,GLvoid*) pfglVertexWeightPointerEXT;
9525 +}
9527 -typedef void function(GLfloat) pfglVertexWeightfEXT;
9528 -typedef void function(GLfloat*) pfglVertexWeightfvEXT;
9529 -typedef void function(GLsizei,GLenum,GLsizei,GLvoid*) pfglVertexWeightPointerEXT;
9530 -
9531 pfglVertexWeightfEXT glVertexWeightfEXT;
9532 pfglVertexWeightfvEXT glVertexWeightfvEXT;
9533 -pfglVertexWeightPointerEXT glVertexWeightPointerEXT;
9534 \ No newline at end of file
9535 +pfglVertexWeightPointerEXT glVertexWeightPointerEXT;
9536 Index: DerelictGL/derelict/opengl/extension/ext/blend_func_separate.d
9537 ===================================================================
9538 --- DerelictGL/derelict/opengl/extension/ext/blend_func_separate.d (revision 318)
9539 +++ DerelictGL/derelict/opengl/extension/ext/blend_func_separate.d (working copy)
9540 @@ -80,8 +80,8 @@
9541 GL_BLEND_SRC_ALPHA_EXT = 0x80CB,
9542 }
9544 -extern(System):
9545 +extern(System) {
9546 +alias void function(GLenum, GLenum, GLenum, GLenum) pfglBlendFuncSeparateEXT;
9547 +}
9549 -typedef void function(GLenum, GLenum, GLenum, GLenum) pfglBlendFuncSeparateEXT;
9550 -
9551 pfglBlendFuncSeparateEXT glBlendFuncSeparateEXT;
9552 Index: DerelictGL/derelict/opengl/extension/ext/draw_buffers2.d
9553 ===================================================================
9554 --- DerelictGL/derelict/opengl/extension/ext/draw_buffers2.d (revision 318)
9555 +++ DerelictGL/derelict/opengl/extension/ext/draw_buffers2.d (working copy)
9556 @@ -82,18 +82,18 @@
9557 }
9558 }
9560 -extern(System):
9561 +extern(System) {
9562 +alias void function(GLuint,GLboolean,GLboolean,GLboolean,GLboolean) pfglColorMaskIndexedEXT;
9563 +alias void function(GLenum,GLuint) pfglDisableIndexedEXT;
9564 +alias void function(GLenum,GLuint) pfglEnableIndexedEXT;
9565 +alias void function(GLenum,GLuint,GLboolean*) pfglGetBooleanIndexedvEXT;
9566 +alias void function(GLenum,GLuint,GLint*) pfglGetIntegerIndexedvEXT;
9567 +alias GLboolean function(GLenum,GLuint) pfglIsEnabledIndexedEXT;
9568 +}
9570 -typedef void function(GLuint,GLboolean,GLboolean,GLboolean,GLboolean) pfglColorMaskIndexedEXT;
9571 -typedef void function(GLenum,GLuint) pfglDisableIndexedEXT;
9572 -typedef void function(GLenum,GLuint) pfglEnableIndexedEXT;
9573 -typedef void function(GLenum,GLuint,GLboolean*) pfglGetBooleanIndexedvEXT;
9574 -typedef void function(GLenum,GLuint,GLint*) pfglGetIntegerIndexedvEXT;
9575 -typedef GLboolean function(GLenum,GLuint) pfglIsEnabledIndexedEXT;
9576 -
9577 pfglColorMaskIndexedEXT glColorMaskIndexedEXT;
9578 pfglDisableIndexedEXT glDisableIndexedEXT;
9579 pfglEnableIndexedEXT glEnableIndexedEXT;
9580 pfglGetBooleanIndexedvEXT glGetBooleanIndexedvEXT;
9581 pfglGetIntegerIndexedvEXT glGetIntegerIndexedvEXT;
9582 -pfglIsEnabledIndexedEXT glIsEnabledIndexedEXT;
9583 \ No newline at end of file
9584 +pfglIsEnabledIndexedEXT glIsEnabledIndexedEXT;
9585 Index: DerelictGL/derelict/opengl/extension/ext/stencil_two_side.d
9586 ===================================================================
9587 --- DerelictGL/derelict/opengl/extension/ext/stencil_two_side.d (revision 318)
9588 +++ DerelictGL/derelict/opengl/extension/ext/stencil_two_side.d (working copy)
9589 @@ -78,8 +78,8 @@
9590 GL_ACTIVE_STENCIL_FACE_EXT = 0x8911,
9591 }
9593 -extern(System):
9594 +extern(System) {
9595 +alias void function(GLenum) pfglActiveStencilFaceEXT;
9596 +}
9598 -typedef void function(GLenum) pfglActiveStencilFaceEXT;
9599 -
9600 pfglActiveStencilFaceEXT glActiveStencilFaceEXT;
9601 Index: DerelictGL/derelict/opengl/extension/ext/scene_marker.d
9602 ===================================================================
9603 --- DerelictGL/derelict/opengl/extension/ext/scene_marker.d (revision 318)
9604 +++ DerelictGL/derelict/opengl/extension/ext/scene_marker.d (working copy)
9605 @@ -74,10 +74,10 @@
9606 }
9607 }
9609 -extern(System):
9610 +extern(System) {
9611 +alias void function() pfglBeginSceneEXT;
9612 +alias void function() pfglEndSceneEXT;
9613 +}
9615 -typedef void function() pfglBeginSceneEXT;
9616 -typedef void function() pfglEndSceneEXT;
9617 -
9618 pfglBeginSceneEXT glBeginSceneEXT;
9619 -pfglEndSceneEXT glEndSceneEXT;
9620 \ No newline at end of file
9621 +pfglEndSceneEXT glEndSceneEXT;
9622 Index: DerelictGL/derelict/opengl/extension/ext/bindable_uniform.d
9623 ===================================================================
9624 --- DerelictGL/derelict/opengl/extension/ext/bindable_uniform.d (revision 318)
9625 +++ DerelictGL/derelict/opengl/extension/ext/bindable_uniform.d (working copy)
9626 @@ -86,12 +86,11 @@
9627 GL_UNIFORM_BUFFER_BINDING_EXT = 0x8DEF,
9628 }
9630 -extern(System):
9631 -
9632 -typedef void function(GLuint, GLint, GLuint) pfglUniformBufferEXT;
9633 -typedef GLint function(GLuint, GLint) pfglGetUniformBufferSizeEXT;
9634 -typedef GLintptr function(GLuint, GLint) pfglGetUniformOffsetEXT;
9635 -
9636 +extern(System) {
9637 +alias void function(GLuint, GLint, GLuint) pfglUniformBufferEXT;
9638 +alias GLint function(GLuint, GLint) pfglGetUniformBufferSizeEXT;
9639 +alias GLintptr function(GLuint, GLint) pfglGetUniformOffsetEXT;
9640 +}
9641 pfglUniformBufferEXT glUniformBufferEXT;
9642 pfglGetUniformBufferSizeEXT glGetUniformBufferSizeEXT;
9643 pfglGetUniformOffsetEXT glGetUniformOffsetEXT;
9644 Index: DerelictGL/derelict/opengl/extension/ext/coordinate_frame.d
9645 ===================================================================
9646 --- DerelictGL/derelict/opengl/extension/ext/coordinate_frame.d (revision 318)
9647 +++ DerelictGL/derelict/opengl/extension/ext/coordinate_frame.d (working copy)
9648 @@ -92,10 +92,10 @@
9649 GL_MAP2_BINORMAL_EXT = 0x8447,
9650 }
9652 -extern(System):
9653 +extern(System) {
9654 +alias void function(GLenum,GLsizei,GLvoid*) pfglBinormalPointerEXT;
9655 +alias void function(GLenum,GLsizei,GLvoid*) pfglTangentPointerEXT;
9656 +}
9658 -typedef void function(GLenum,GLsizei,GLvoid*) pfglBinormalPointerEXT;
9659 -typedef void function(GLenum,GLsizei,GLvoid*) pfglTangentPointerEXT;
9660 -
9661 pfglBinormalPointerEXT glBinormalPointerEXT;
9662 -pfglTangentPointerEXT glTangentPointerEXT;
9663 \ No newline at end of file
9664 +pfglTangentPointerEXT glTangentPointerEXT;
9665 Index: DerelictGL/derelict/opengl/extension/ext/fog_coord.d
9666 ===================================================================
9667 --- DerelictGL/derelict/opengl/extension/ext/fog_coord.d (revision 318)
9668 +++ DerelictGL/derelict/opengl/extension/ext/fog_coord.d (working copy)
9669 @@ -92,16 +92,16 @@
9670 GL_FOG_COORDINATE_ARRAY_EXT = 0x8457,
9671 }
9673 -extern(System):
9674 +extern(System) {
9675 +alias void function(GLfloat) pfglFogCoordfEXT;
9676 +alias void function(GLfloat*) pfglFogCoordfvEXT;
9677 +alias void function(GLdouble) pfglFogCoorddEXT;
9678 +alias void function(GLdouble*) pfglFogCoorddvEXT;
9679 +alias void function(GLenum, GLsizei, GLvoid*) pfglFogCoordPointerEXT;
9680 +}
9682 -typedef void function(GLfloat) pfglFogCoordfEXT;
9683 -typedef void function(GLfloat*) pfglFogCoordfvEXT;
9684 -typedef void function(GLdouble) pfglFogCoorddEXT;
9685 -typedef void function(GLdouble*) pfglFogCoorddvEXT;
9686 -typedef void function(GLenum, GLsizei, GLvoid*) pfglFogCoordPointerEXT;
9687 -
9688 pfglFogCoordfEXT glFogCoordfEXT;
9689 pfglFogCoordfvEXT glFogCoordfvEXT;
9690 pfglFogCoorddEXT glFogCoorddEXT;
9691 pfglFogCoorddvEXT glFogCoorddvEXT;
9692 -pfglFogCoordPointerEXT glFogCoordPointerEXT;
9693 \ No newline at end of file
9694 +pfglFogCoordPointerEXT glFogCoordPointerEXT;
9695 Index: DerelictGL/derelict/opengl/extension/ext/stencil_clear_tag.d
9696 ===================================================================
9697 --- DerelictGL/derelict/opengl/extension/ext/stencil_clear_tag.d (revision 318)
9698 +++ DerelictGL/derelict/opengl/extension/ext/stencil_clear_tag.d (working copy)
9699 @@ -78,8 +78,8 @@
9700 GL_STENCIL_CLEAR_TAG_VALUE_EXT = 0x88F3,
9701 }
9703 -extern(System):
9704 +extern(System) {
9705 +alias void function(GLsizei, GLuint) pfglStencilClearTagEXT;
9706 +}
9708 -typedef void function(GLsizei, GLuint) pfglStencilClearTagEXT;
9709 -
9710 pfglStencilClearTagEXT glStencilClearTagEXT;
9711 Index: DerelictGL/derelict/opengl/extension/ext/gpu_program_parameters.d
9712 ===================================================================
9713 --- DerelictGL/derelict/opengl/extension/ext/gpu_program_parameters.d (revision 318)
9714 +++ DerelictGL/derelict/opengl/extension/ext/gpu_program_parameters.d (working copy)
9715 @@ -74,10 +74,10 @@
9716 }
9717 }
9719 -extern(System):
9720 +extern(System) {
9721 +alias void function(GLenum, GLuint, GLsizei, GLfloat*) pfglProgramEnvParameters4fvEXT;
9722 +alias void function(GLenum, GLuint, GLsizei, GLfloat*) pfglProgramLocalParameters4fvEXT;
9723 +}
9725 -typedef void function(GLenum, GLuint, GLsizei, GLfloat*) pfglProgramEnvParameters4fvEXT;
9726 -typedef void function(GLenum, GLuint, GLsizei, GLfloat*) pfglProgramLocalParameters4fvEXT;
9727 -
9728 pfglProgramEnvParameters4fvEXT glProgramEnvParameters4fvEXT;
9729 -pfglProgramLocalParameters4fvEXT glProgramLocalParameters4fvEXT;
9730 \ No newline at end of file
9731 +pfglProgramLocalParameters4fvEXT glProgramLocalParameters4fvEXT;
9732 Index: DerelictGL/derelict/opengl/extension/ext/blend_equation_separate.d
9733 ===================================================================
9734 --- DerelictGL/derelict/opengl/extension/ext/blend_equation_separate.d (revision 318)
9735 +++ DerelictGL/derelict/opengl/extension/ext/blend_equation_separate.d (working copy)
9736 @@ -78,8 +78,8 @@
9737 GL_BLEND_EQUATION_ALPHA_EXT = 0x883D,
9738 }
9740 -extern(System):
9741 +extern(System) {
9742 +alias void function(GLenum, GLenum) pfglBlendEquationSeparateEXT;
9743 +}
9745 -typedef void function(GLenum, GLenum) pfglBlendEquationSeparateEXT;
9746 -
9747 pfglBlendEquationSeparateEXT glBlendEquationSeparateEXT;
9748 Index: DerelictGL/derelict/opengl/extension/ext/paletted_texture.d
9749 ===================================================================
9750 --- DerelictGL/derelict/opengl/extension/ext/paletted_texture.d (revision 318)
9751 +++ DerelictGL/derelict/opengl/extension/ext/paletted_texture.d (working copy)
9752 @@ -89,13 +89,13 @@
9753 GL_TEXTURE_INDEX_SIZE_EXT = 0x80ED,
9754 }
9756 -extern(System):
9757 +extern(System) {
9758 +alias void function(GLenum, GLenum, GLsizei, GLenum, GLenum, GLvoid*) pfglColorTableEXT;
9759 +alias void function(GLenum, GLenum, GLenum, GLvoid*) pfglGetColorTableEXT;
9760 +alias void function(GLenum, GLenum, GLint*) pfglGetColorTableParameterivEXT;
9761 +alias void function(GLenum, GLenum, GLfloat*) pfglGetColorTableParameterfvEXT;
9762 +}
9764 -typedef void function(GLenum, GLenum, GLsizei, GLenum, GLenum, GLvoid*) pfglColorTableEXT;
9765 -typedef void function(GLenum, GLenum, GLenum, GLvoid*) pfglGetColorTableEXT;
9766 -typedef void function(GLenum, GLenum, GLint*) pfglGetColorTableParameterivEXT;
9767 -typedef void function(GLenum, GLenum, GLfloat*) pfglGetColorTableParameterfvEXT;
9768 -
9769 pfglColorTableEXT glColorTableEXT;
9770 pfglGetColorTableEXT glGetColorTableEXT;
9771 pfglGetColorTableParameterivEXT glGetColorTableParameterivEXT;
9772 Index: DerelictGL/derelict/opengl/extension/ext/secondary_color.d
9773 ===================================================================
9774 --- DerelictGL/derelict/opengl/extension/ext/secondary_color.d (revision 318)
9775 +++ DerelictGL/derelict/opengl/extension/ext/secondary_color.d (working copy)
9776 @@ -115,26 +115,26 @@
9777 GL_SECONDARY_COLOR_ARRAY_EXT = 0x845E,
9778 }
9780 -extern(System):
9781 +extern(System) {
9782 +alias void function(GLbyte, GLbyte, GLbyte) pfglSecondaryColor3bEXT;
9783 +alias void function(GLbyte*) pfglSecondaryColor3bvEXT;
9784 +alias void function(GLdouble, GLdouble, GLdouble) pfglSecondaryColor3dEXT;
9785 +alias void function(GLdouble*) pfglSecondaryColor3dvEXT;
9786 +alias void function(GLfloat, GLfloat, GLfloat) pfglSecondaryColor3fEXT;
9787 +alias void function(GLfloat*) pfglSecondaryColor3fvEXT;
9788 +alias void function(GLint, GLint, GLint) pfglSecondaryColor3iEXT;
9789 +alias void function(GLint*) pfglSecondaryColor3ivEXT;
9790 +alias void function(GLshort, GLshort, GLshort) pfglSecondaryColor3sEXT;
9791 +alias void function(GLshort*) pfglSecondaryColor3svEXT;
9792 +alias void function(GLubyte, GLubyte, GLubyte) pfglSecondaryColor3ubEXT;
9793 +alias void function(GLubyte*) pfglSecondaryColor3ubvEXT;
9794 +alias void function(GLuint, GLuint, GLuint) pfglSecondaryColor3uiEXT;
9795 +alias void function(GLuint*) pfglSecondaryColor3uivEXT;
9796 +alias void function(GLushort, GLushort, GLushort) pfglSecondaryColor3usEXT;
9797 +alias void function(GLushort*) pfglSecondaryColor3usvEXT;
9798 +alias void function(GLint, GLenum, GLsizei, GLvoid*) pfglSecondaryColorPointerEXT;
9799 +}
9801 -typedef void function(GLbyte, GLbyte, GLbyte) pfglSecondaryColor3bEXT;
9802 -typedef void function(GLbyte*) pfglSecondaryColor3bvEXT;
9803 -typedef void function(GLdouble, GLdouble, GLdouble) pfglSecondaryColor3dEXT;
9804 -typedef void function(GLdouble*) pfglSecondaryColor3dvEXT;
9805 -typedef void function(GLfloat, GLfloat, GLfloat) pfglSecondaryColor3fEXT;
9806 -typedef void function(GLfloat*) pfglSecondaryColor3fvEXT;
9807 -typedef void function(GLint, GLint, GLint) pfglSecondaryColor3iEXT;
9808 -typedef void function(GLint*) pfglSecondaryColor3ivEXT;
9809 -typedef void function(GLshort, GLshort, GLshort) pfglSecondaryColor3sEXT;
9810 -typedef void function(GLshort*) pfglSecondaryColor3svEXT;
9811 -typedef void function(GLubyte, GLubyte, GLubyte) pfglSecondaryColor3ubEXT;
9812 -typedef void function(GLubyte*) pfglSecondaryColor3ubvEXT;
9813 -typedef void function(GLuint, GLuint, GLuint) pfglSecondaryColor3uiEXT;
9814 -typedef void function(GLuint*) pfglSecondaryColor3uivEXT;
9815 -typedef void function(GLushort, GLushort, GLushort) pfglSecondaryColor3usEXT;
9816 -typedef void function(GLushort*) pfglSecondaryColor3usvEXT;
9817 -typedef void function(GLint, GLenum, GLsizei, GLvoid*) pfglSecondaryColorPointerEXT;
9818 -
9819 pfglSecondaryColor3bEXT glSecondaryColor3bEXT;
9820 pfglSecondaryColor3bvEXT glSecondaryColor3bvEXT;
9821 pfglSecondaryColor3dEXT glSecondaryColor3dEXT;
9822 Index: DerelictGL/derelict/opengl/extension/ext/fragment_lighting.d
9823 ===================================================================
9824 --- DerelictGL/derelict/opengl/extension/ext/fragment_lighting.d (revision 318)
9825 +++ DerelictGL/derelict/opengl/extension/ext/fragment_lighting.d (working copy)
9826 @@ -124,27 +124,27 @@
9827 GL_FRAGMENT_LIGHT7_EXT = 0x8413,
9828 }
9830 -extern(System):
9831 +extern(System) {
9832 +alias void function(GLenum,GLenum) pfglFragmentColorMaterialEXT;
9833 +alias void function(GLenum,GLfloat) pfglFragmentLightModelfEXT;
9834 +alias void function(GLenum,GLfloat*) pfglFragmentLightModelfvEXT;
9835 +alias void function(GLenum,GLint) pfglFragmentLightModeliEXT;
9836 +alias void function(GLenum,GLint*) pfglFragmentLightModelivEXT;
9837 +alias void function(GLenum,GLenum,GLfloat) pfglFragmentLightfEXT;
9838 +alias void function(GLenum,GLenum,GLfloat*) pfglFragmentLightfvEXT;
9839 +alias void function(GLenum,GLenum,GLint) pfglFragmentLightiEXT;
9840 +alias void function(GLenum,GLenum,GLint*) pfglFragmentLightivEXT;
9841 +alias void function(GLenum,GLenum,GLfloat) pfglFragmentMaterialfEXT;
9842 +alias void function(GLenum,GLenum,GLfloat*) pfglFragmentMaterialfvEXT;
9843 +alias void function(GLenum,GLenum,GLint) pfglFragmentMaterialiEXT;
9844 +alias void function(GLenum,GLenum,GLint*) pfglFragmentMaterialivEXT;
9845 +alias void function(GLenum,GLenum,GLfloat*) pfglGetFragmentLightfvEXT;
9846 +alias void function(GLenum,GLenum,GLint*) pfglGetFragmentLightivEXT;
9847 +alias void function(GLenum,GLenum,GLfloat*) pfglGetFragmentMaterialfvEXT;
9848 +alias void function(GLenum,GLenum,GLint*) pfglGetFragmentMaterialivEXT;
9849 +alias void function(GLenum,GLint) pfglLightEnviEXT;
9850 +}
9852 -typedef void function(GLenum,GLenum) pfglFragmentColorMaterialEXT;
9853 -typedef void function(GLenum,GLfloat) pfglFragmentLightModelfEXT;
9854 -typedef void function(GLenum,GLfloat*) pfglFragmentLightModelfvEXT;
9855 -typedef void function(GLenum,GLint) pfglFragmentLightModeliEXT;
9856 -typedef void function(GLenum,GLint*) pfglFragmentLightModelivEXT;
9857 -typedef void function(GLenum,GLenum,GLfloat) pfglFragmentLightfEXT;
9858 -typedef void function(GLenum,GLenum,GLfloat*) pfglFragmentLightfvEXT;
9859 -typedef void function(GLenum,GLenum,GLint) pfglFragmentLightiEXT;
9860 -typedef void function(GLenum,GLenum,GLint*) pfglFragmentLightivEXT;
9861 -typedef void function(GLenum,GLenum,GLfloat) pfglFragmentMaterialfEXT;
9862 -typedef void function(GLenum,GLenum,GLfloat*) pfglFragmentMaterialfvEXT;
9863 -typedef void function(GLenum,GLenum,GLint) pfglFragmentMaterialiEXT;
9864 -typedef void function(GLenum,GLenum,GLint*) pfglFragmentMaterialivEXT;
9865 -typedef void function(GLenum,GLenum,GLfloat*) pfglGetFragmentLightfvEXT;
9866 -typedef void function(GLenum,GLenum,GLint*) pfglGetFragmentLightivEXT;
9867 -typedef void function(GLenum,GLenum,GLfloat*) pfglGetFragmentMaterialfvEXT;
9868 -typedef void function(GLenum,GLenum,GLint*) pfglGetFragmentMaterialivEXT;
9869 -typedef void function(GLenum,GLint) pfglLightEnviEXT;
9870 -
9871 pfglFragmentColorMaterialEXT glFragmentColorMaterialEXT;
9872 pfglFragmentLightModelfEXT glFragmentLightModelfEXT;
9873 pfglFragmentLightModelfvEXT glFragmentLightModelfvEXT;
9874 @@ -162,4 +162,4 @@
9875 pfglGetFragmentLightivEXT glGetFragmentLightivEXT;
9876 pfglGetFragmentMaterialfvEXT glGetFragmentMaterialfvEXT;
9877 pfglGetFragmentMaterialivEXT glGetFragmentMaterialivEXT;
9878 -pfglLightEnviEXT glLightEnviEXT;
9879 \ No newline at end of file
9880 +pfglLightEnviEXT glLightEnviEXT;
9881 Index: DerelictGL/derelict/opengl/extension/ext/cull_vertex.d
9882 ===================================================================
9883 --- DerelictGL/derelict/opengl/extension/ext/cull_vertex.d (revision 318)
9884 +++ DerelictGL/derelict/opengl/extension/ext/cull_vertex.d (working copy)
9885 @@ -81,10 +81,10 @@
9886 GL_CULL_VERTEX_OBJECT_POSITION_EXT = 0x81AC,
9887 }
9889 -extern(System):
9890 +extern(System) {
9891 +alias void function(GLenum, GLdouble*) pfglCullParameterdvEXT;
9892 +alias void function(GLenum, GLfloat*) pfglCullParameterfvEXT;
9893 +}
9895 -typedef void function(GLenum, GLdouble*) pfglCullParameterdvEXT;
9896 -typedef void function(GLenum, GLfloat*) pfglCullParameterfvEXT;
9897 -
9898 pfglCullParameterdvEXT glCullParameterdvEXT;
9899 pfglCullParameterfvEXT glCullParameterfvEXT;
9900 Index: DerelictGL/derelict/opengl/extension/nv/parameter_buffer_object.d
9901 ===================================================================
9902 --- DerelictGL/derelict/opengl/extension/nv/parameter_buffer_object.d (revision 318)
9903 +++ DerelictGL/derelict/opengl/extension/nv/parameter_buffer_object.d (working copy)
9904 @@ -76,12 +76,12 @@
9905 }
9906 }
9908 -extern(System):
9909 +extern(System) {
9910 +alias void function(GLenum, GLuint, GLuint, GLsizei, GLfloat*) pfglProgramBufferParametersfvNV;
9911 +alias void function(GLenum, GLuint, GLuint, GLsizei, GLint*) pfglProgramBufferParametersIivNV;
9912 +alias void function(GLenum, GLuint, GLuint, GLsizei, GLuint*) pfglProgramBufferParametersIuivNV;
9913 +}
9915 -typedef void function(GLenum, GLuint, GLuint, GLsizei, GLfloat*) pfglProgramBufferParametersfvNV;
9916 -typedef void function(GLenum, GLuint, GLuint, GLsizei, GLint*) pfglProgramBufferParametersIivNV;
9917 -typedef void function(GLenum, GLuint, GLuint, GLsizei, GLuint*) pfglProgramBufferParametersIuivNV;
9918 -
9919 pfglProgramBufferParametersfvNV glProgramBufferParametersfvNV;
9920 pfglProgramBufferParametersIivNV glProgramBufferParametersIivNV;
9921 -pfglProgramBufferParametersIuivNV glProgramBufferParametersIuivNV;
9922 \ No newline at end of file
9923 +pfglProgramBufferParametersIuivNV glProgramBufferParametersIuivNV;
9924 Index: DerelictGL/derelict/opengl/extension/nv/vertex_program.d
9925 ===================================================================
9926 --- DerelictGL/derelict/opengl/extension/nv/vertex_program.d (revision 318)
9927 +++ DerelictGL/derelict/opengl/extension/nv/vertex_program.d (working copy)
9928 @@ -285,73 +285,73 @@
9929 GL_MAP2_VERTEX_ATTRIB15_4_NV = 0x867F,
9930 }
9932 -extern(System):
9933 +extern(System) {
9934 +alias GLboolean function(GLsizei,GLuint*,GLboolean*) pfglAreProgramsResidentNV;
9935 +alias void function(GLenum,GLuint) pfglBindProgramNV;
9936 +alias void function(GLsizei,GLuint*) pfglDeleteProgramsNV;
9937 +alias void function(GLenum,GLuint,GLfloat*) pfglExecuteProgramNV;
9938 +alias void function(GLsizei,GLuint*) pfglGenProgramsNV;
9939 +alias void function(GLenum,GLuint,GLenum,GLdouble*) pfglGetProgramParameterdvNV;
9940 +alias void function(GLenum,GLuint,GLenum,GLfloat*) pfglGetProgramParameterfvNV;
9941 +alias void function(GLuint,GLenum,GLint*) pfglGetProgramivNV;
9942 +alias void function(GLuint,GLenum,GLchar*) pfglGetProgramStringNV;
9943 +alias void function(GLenum,GLuint,GLenum,GLint*) pfglGetTrackMatrixivNV;
9944 +alias void function(GLuint,GLenum,GLdouble*) pfglGetVertexAttribdvNV;
9945 +alias void function(GLuint,GLenum,GLfloat*) pfglGetVertexAttribfvNV;
9946 +alias void function(GLuint,GLenum,GLint*) pfglGetVertexAttribivNV;
9947 +alias void function(GLuint,GLenum,GLvoid*) pfglGetVertexAttribPointervNV;
9948 +alias GLboolean function(GLuint) pfglIsProgramNV;
9949 +alias void function(GLenum,GLuint,GLsizei,GLchar*) pfglLoadProgramNV;
9950 +alias void function(GLenum,GLuint,GLdouble,GLdouble,GLdouble,GLdouble) pfglProgramParameter4dNV;
9951 +alias void function(GLenum,GLuint,GLdouble*) pfglProgramParameter4dvNV;
9952 +alias void function(GLenum,GLuint,GLfloat,GLfloat,GLfloat,GLfloat) pfglProgramParameter4fNV;
9953 +alias void function(GLenum,GLuint,GLfloat*) pfglProgramParameter4fvNV;
9954 +alias void function(GLenum,GLuint,GLuint,GLdouble*) pfglProgramParameters4dvNV;
9955 +alias void function(GLenum,GLuint,GLuint,GLfloat*) pfglProgramParameters4fvNV;
9956 +alias void function(GLsizei,GLuint*) pfglRequestResidentProgramsNV;
9957 +alias void function(GLenum,GLuint,GLenum,GLenum) pfglTrackMatrixNV;
9958 +alias void function(GLuint,GLint,GLenum,GLsizei,GLvoid*) pfglVertexAttribPointerNV;
9959 +alias void function(GLuint,GLdouble) pfglVertexAttrib1dNV;
9960 +alias void function(GLuint,GLdouble*) pfglVertexAttrib1dvNV;
9961 +alias void function(GLuint,GLfloat) pfglVertexAttrib1fNV;
9962 +alias void function(GLuint,GLfloat*) pfglVertexAttrib1fvNV;
9963 +alias void function(GLuint,GLshort) pfglVertexAttrib1sNV;
9964 +alias void function(GLuint,GLshort*) pfglVertexAttrib1svNV;
9965 +alias void function(GLuint,GLdouble,GLdouble) pfglVertexAttrib2dNV;
9966 +alias void function(GLuint,GLdouble*) pfglVertexAttrib2dvNV;
9967 +alias void function(GLuint,GLfloat,GLfloat) pfglVertexAttrib2fNV;
9968 +alias void function(GLuint,GLfloat*) pfglVertexAttrib2fvNV;
9969 +alias void function(GLuint,GLshort,GLshort) pfglVertexAttrib2sNV;
9970 +alias void function(GLuint,GLshort*) pfglVertexAttrib2svNV;
9971 +alias void function(GLuint,GLdouble,GLdouble,GLdouble) pfglVertexAttrib3dNV;
9972 +alias void function(GLuint,GLdouble*) pfglVertexAttrib3dvNV;
9973 +alias void function(GLuint,GLfloat,GLfloat,GLfloat) pfglVertexAttrib3fNV;
9974 +alias void function(GLuint,GLfloat*) pfglVertexAttrib3fvNV;
9975 +alias void function(GLuint,GLshort,GLshort,GLshort) pfglVertexAttrib3sNV;
9976 +alias void function(GLuint,GLshort*) pfglVertexAttrib3svNV;
9977 +alias void function(GLuint,GLdouble,GLdouble,GLdouble,GLdouble) pfglVertexAttrib4dNV;
9978 +alias void function(GLuint,GLdouble*) pfglVertexAttrib4dvNV;
9979 +alias void function(GLuint,GLfloat,GLfloat,GLfloat,GLfloat) pfglVertexAttrib4fNV;
9980 +alias void function(GLuint,GLfloat*) pfglVertexAttrib4fvNV;
9981 +alias void function(GLuint,GLshort,GLshort,GLshort,GLshort) pfglVertexAttrib4sNV;
9982 +alias void function(GLuint,GLshort*) pfglVertexAttrib4svNV;
9983 +alias void function(GLuint,GLubyte,GLubyte,GLubyte,GLubyte) pfglVertexAttrib4ubNV;
9984 +alias void function(GLuint,GLubyte*) pfglVertexAttrib4ubvNV;
9985 +alias void function(GLuint,GLsizei,GLdouble*) pfglVertexAttribs1dvNV;
9986 +alias void function(GLuint,GLsizei,GLfloat*) pfglVertexAttribs1fvNV;
9987 +alias void function(GLuint,GLsizei,GLshort*) pfglVertexAttribs1svNV;
9988 +alias void function(GLuint,GLsizei,GLdouble*) pfglVertexAttribs2dvNV;
9989 +alias void function(GLuint,GLsizei,GLfloat*) pfglVertexAttribs2fvNV;
9990 +alias void function(GLuint,GLsizei,GLshort*) pfglVertexAttribs2svNV;
9991 +alias void function(GLuint,GLsizei,GLdouble*) pfglVertexAttribs3dvNV;
9992 +alias void function(GLuint,GLsizei,GLfloat*) pfglVertexAttribs3fvNV;
9993 +alias void function(GLuint,GLsizei,GLshort*) pfglVertexAttribs3svNV;
9994 +alias void function(GLuint,GLsizei,GLdouble*) pfglVertexAttribs4dvNV;
9995 +alias void function(GLuint,GLsizei,GLfloat*) pfglVertexAttribs4fvNV;
9996 +alias void function(GLuint,GLsizei,GLshort*) pfglVertexAttribs4svNV;
9997 +alias void function(GLuint,GLsizei,GLubyte*) pfglVertexAttribs4ubvNV;
9998 +}
10000 -typedef GLboolean function(GLsizei,GLuint*,GLboolean*) pfglAreProgramsResidentNV;
10001 -typedef void function(GLenum,GLuint) pfglBindProgramNV;
10002 -typedef void function(GLsizei,GLuint*) pfglDeleteProgramsNV;
10003 -typedef void function(GLenum,GLuint,GLfloat*) pfglExecuteProgramNV;
10004 -typedef void function(GLsizei,GLuint*) pfglGenProgramsNV;
10005 -typedef void function(GLenum,GLuint,GLenum,GLdouble*) pfglGetProgramParameterdvNV;
10006 -typedef void function(GLenum,GLuint,GLenum,GLfloat*) pfglGetProgramParameterfvNV;
10007 -typedef void function(GLuint,GLenum,GLint*) pfglGetProgramivNV;
10008 -typedef void function(GLuint,GLenum,GLchar*) pfglGetProgramStringNV;
10009 -typedef void function(GLenum,GLuint,GLenum,GLint*) pfglGetTrackMatrixivNV;
10010 -typedef void function(GLuint,GLenum,GLdouble*) pfglGetVertexAttribdvNV;
10011 -typedef void function(GLuint,GLenum,GLfloat*) pfglGetVertexAttribfvNV;
10012 -typedef void function(GLuint,GLenum,GLint*) pfglGetVertexAttribivNV;
10013 -typedef void function(GLuint,GLenum,GLvoid*) pfglGetVertexAttribPointervNV;
10014 -typedef GLboolean function(GLuint) pfglIsProgramNV;
10015 -typedef void function(GLenum,GLuint,GLsizei,GLchar*) pfglLoadProgramNV;
10016 -typedef void function(GLenum,GLuint,GLdouble,GLdouble,GLdouble,GLdouble) pfglProgramParameter4dNV;
10017 -typedef void function(GLenum,GLuint,GLdouble*) pfglProgramParameter4dvNV;
10018 -typedef void function(GLenum,GLuint,GLfloat,GLfloat,GLfloat,GLfloat) pfglProgramParameter4fNV;
10019 -typedef void function(GLenum,GLuint,GLfloat*) pfglProgramParameter4fvNV;
10020 -typedef void function(GLenum,GLuint,GLuint,GLdouble*) pfglProgramParameters4dvNV;
10021 -typedef void function(GLenum,GLuint,GLuint,GLfloat*) pfglProgramParameters4fvNV;
10022 -typedef void function(GLsizei,GLuint*) pfglRequestResidentProgramsNV;
10023 -typedef void function(GLenum,GLuint,GLenum,GLenum) pfglTrackMatrixNV;
10024 -typedef void function(GLuint,GLint,GLenum,GLsizei,GLvoid*) pfglVertexAttribPointerNV;
10025 -typedef void function(GLuint,GLdouble) pfglVertexAttrib1dNV;
10026 -typedef void function(GLuint,GLdouble*) pfglVertexAttrib1dvNV;
10027 -typedef void function(GLuint,GLfloat) pfglVertexAttrib1fNV;
10028 -typedef void function(GLuint,GLfloat*) pfglVertexAttrib1fvNV;
10029 -typedef void function(GLuint,GLshort) pfglVertexAttrib1sNV;
10030 -typedef void function(GLuint,GLshort*) pfglVertexAttrib1svNV;
10031 -typedef void function(GLuint,GLdouble,GLdouble) pfglVertexAttrib2dNV;
10032 -typedef void function(GLuint,GLdouble*) pfglVertexAttrib2dvNV;
10033 -typedef void function(GLuint,GLfloat,GLfloat) pfglVertexAttrib2fNV;
10034 -typedef void function(GLuint,GLfloat*) pfglVertexAttrib2fvNV;
10035 -typedef void function(GLuint,GLshort,GLshort) pfglVertexAttrib2sNV;
10036 -typedef void function(GLuint,GLshort*) pfglVertexAttrib2svNV;
10037 -typedef void function(GLuint,GLdouble,GLdouble,GLdouble) pfglVertexAttrib3dNV;
10038 -typedef void function(GLuint,GLdouble*) pfglVertexAttrib3dvNV;
10039 -typedef void function(GLuint,GLfloat,GLfloat,GLfloat) pfglVertexAttrib3fNV;
10040 -typedef void function(GLuint,GLfloat*) pfglVertexAttrib3fvNV;
10041 -typedef void function(GLuint,GLshort,GLshort,GLshort) pfglVertexAttrib3sNV;
10042 -typedef void function(GLuint,GLshort*) pfglVertexAttrib3svNV;
10043 -typedef void function(GLuint,GLdouble,GLdouble,GLdouble,GLdouble) pfglVertexAttrib4dNV;
10044 -typedef void function(GLuint,GLdouble*) pfglVertexAttrib4dvNV;
10045 -typedef void function(GLuint,GLfloat,GLfloat,GLfloat,GLfloat) pfglVertexAttrib4fNV;
10046 -typedef void function(GLuint,GLfloat*) pfglVertexAttrib4fvNV;
10047 -typedef void function(GLuint,GLshort,GLshort,GLshort,GLshort) pfglVertexAttrib4sNV;
10048 -typedef void function(GLuint,GLshort*) pfglVertexAttrib4svNV;
10049 -typedef void function(GLuint,GLubyte,GLubyte,GLubyte,GLubyte) pfglVertexAttrib4ubNV;
10050 -typedef void function(GLuint,GLubyte*) pfglVertexAttrib4ubvNV;
10051 -typedef void function(GLuint,GLsizei,GLdouble*) pfglVertexAttribs1dvNV;
10052 -typedef void function(GLuint,GLsizei,GLfloat*) pfglVertexAttribs1fvNV;
10053 -typedef void function(GLuint,GLsizei,GLshort*) pfglVertexAttribs1svNV;
10054 -typedef void function(GLuint,GLsizei,GLdouble*) pfglVertexAttribs2dvNV;
10055 -typedef void function(GLuint,GLsizei,GLfloat*) pfglVertexAttribs2fvNV;
10056 -typedef void function(GLuint,GLsizei,GLshort*) pfglVertexAttribs2svNV;
10057 -typedef void function(GLuint,GLsizei,GLdouble*) pfglVertexAttribs3dvNV;
10058 -typedef void function(GLuint,GLsizei,GLfloat*) pfglVertexAttribs3fvNV;
10059 -typedef void function(GLuint,GLsizei,GLshort*) pfglVertexAttribs3svNV;
10060 -typedef void function(GLuint,GLsizei,GLdouble*) pfglVertexAttribs4dvNV;
10061 -typedef void function(GLuint,GLsizei,GLfloat*) pfglVertexAttribs4fvNV;
10062 -typedef void function(GLuint,GLsizei,GLshort*) pfglVertexAttribs4svNV;
10063 -typedef void function(GLuint,GLsizei,GLubyte*) pfglVertexAttribs4ubvNV;
10064 -
10065 pfglAreProgramsResidentNV glAreProgramsResidentNV;
10066 pfglBindProgramNV glBindProgramNV;
10067 pfglDeleteProgramsNV glDeleteProgramsNV;
10068 @@ -415,4 +415,4 @@
10069 pfglVertexAttribs4dvNV glVertexAttribs4dvNV;
10070 pfglVertexAttribs4fvNV glVertexAttribs4fvNV;
10071 pfglVertexAttribs4svNV glVertexAttribs4svNV;
10072 -pfglVertexAttribs4ubvNV glVertexAttribs4ubvNV;
10073 \ No newline at end of file
10074 +pfglVertexAttribs4ubvNV glVertexAttribs4ubvNV;
10075 Index: DerelictGL/derelict/opengl/extension/nv/fence.d
10076 ===================================================================
10077 --- DerelictGL/derelict/opengl/extension/nv/fence.d (revision 318)
10078 +++ DerelictGL/derelict/opengl/extension/nv/fence.d (working copy)
10079 @@ -91,16 +91,16 @@
10080 GL_FENCE_CONDITION_NV = 0x84F4,
10081 }
10083 -extern(System):
10084 +extern(System) {
10085 +alias void function(GLsizei, GLuint*) pfglDeleteFencesNV;
10086 +alias void function(GLsizei, GLuint*) pfglGenFencesNV;
10087 +alias GLboolean function(GLuint) pfglIsFenceNV;
10088 +alias GLboolean function(GLuint) pfglTestFenceNV;
10089 +alias void function(GLuint, GLenum, GLint*) pfglGetFenceivNV;
10090 +alias void function(GLuint) pfglFinishFenceNV;
10091 +alias void function(GLuint, GLenum) pfglSetFenceNV;
10092 +}
10094 -typedef void function(GLsizei, GLuint*) pfglDeleteFencesNV;
10095 -typedef void function(GLsizei, GLuint*) pfglGenFencesNV;
10096 -typedef GLboolean function(GLuint) pfglIsFenceNV;
10097 -typedef GLboolean function(GLuint) pfglTestFenceNV;
10098 -typedef void function(GLuint, GLenum, GLint*) pfglGetFenceivNV;
10099 -typedef void function(GLuint) pfglFinishFenceNV;
10100 -typedef void function(GLuint, GLenum) pfglSetFenceNV;
10101 -
10102 pfglDeleteFencesNV glDeleteFencesNV;
10103 pfglGenFencesNV glGenFencesNV;
10104 pfglIsFenceNV glIsFenceNV;
10105 Index: DerelictGL/derelict/opengl/extension/nv/depth_buffer_float.d
10106 ===================================================================
10107 --- DerelictGL/derelict/opengl/extension/nv/depth_buffer_float.d (revision 318)
10108 +++ DerelictGL/derelict/opengl/extension/nv/depth_buffer_float.d (working copy)
10109 @@ -84,12 +84,12 @@
10110 GL_DEPTH_BUFFER_FLOAT_MODE_NV = 0x8DAF,
10111 }
10113 -extern(System):
10114 +extern(System) {
10115 +alias void function(GLdouble, GLdouble) pfglDepthRangedNV;
10116 +alias void function(GLdouble) pfglClearDepthdNV;
10117 +alias void function(GLdouble, GLdouble) pfglDepthBoundsdNV;
10118 +}
10120 -typedef void function(GLdouble, GLdouble) pfglDepthRangedNV;
10121 -typedef void function(GLdouble) pfglClearDepthdNV;
10122 -typedef void function(GLdouble, GLdouble) pfglDepthBoundsdNV;
10123 -
10124 pfglDepthRangedNV glDepthRangedNV;
10125 pfglClearDepthdNV glClearDepthdNV;
10126 pfglDepthBoundsdNV glDepthBoundsdNV;
10127 Index: DerelictGL/derelict/opengl/extension/nv/occlusion_query.d
10128 ===================================================================
10129 --- DerelictGL/derelict/opengl/extension/nv/occlusion_query.d (revision 318)
10130 +++ DerelictGL/derelict/opengl/extension/nv/occlusion_query.d (working copy)
10131 @@ -93,16 +93,16 @@
10132 GL_SAMPLES_PASSED_ARB = 0x8914,
10133 }
10135 -extern(System):
10136 +extern(System) {
10137 +alias void function(GLsizei, GLuint*) pfglGenOcclusionQueriesNV;
10138 +alias void function(GLsizei, GLuint*) pfglDeleteOcclusionQueriesNV;
10139 +alias GLboolean function(GLuint) pfglIsOcclusionQueryNV;
10140 +alias void function(GLuint) pfglBeginOcclusionQueryNV;
10141 +alias void function() pfglEndOcclusionQueryNV;
10142 +alias void function(GLuint, GLenum, GLint*) pfglGetOcclusionQueryivNV;
10143 +alias void function(GLuint, GLenum, GLuint*) pfglGetOcclusionQueryuivNV;
10144 +}
10146 -typedef void function(GLsizei, GLuint*) pfglGenOcclusionQueriesNV;
10147 -typedef void function(GLsizei, GLuint*) pfglDeleteOcclusionQueriesNV;
10148 -typedef GLboolean function(GLuint) pfglIsOcclusionQueryNV;
10149 -typedef void function(GLuint) pfglBeginOcclusionQueryNV;
10150 -typedef void function() pfglEndOcclusionQueryNV;
10151 -typedef void function(GLuint, GLenum, GLint*) pfglGetOcclusionQueryivNV;
10152 -typedef void function(GLuint, GLenum, GLuint*) pfglGetOcclusionQueryuivNV;
10153 -
10154 pfglGenOcclusionQueriesNV glGenOcclusionQueriesNV;
10155 pfglDeleteOcclusionQueriesNV glDeleteOcclusionQueriesNV;
10156 pfglIsOcclusionQueryNV glIsOcclusionQueryNV;
10157 Index: DerelictGL/derelict/opengl/extension/nv/vertex_array_range.d
10158 ===================================================================
10159 --- DerelictGL/derelict/opengl/extension/nv/vertex_array_range.d (revision 318)
10160 +++ DerelictGL/derelict/opengl/extension/nv/vertex_array_range.d (working copy)
10161 @@ -83,10 +83,10 @@
10162 GL_VERTEX_ARRAY_RANGE_POINTER_NV = 0x8521,
10163 }
10165 -extern(System):
10166 +extern(System) {
10167 +alias void function() pfglFlushVertexArrayRangeNV;
10168 +alias void function(GLsizei,GLvoid*) pfglVertexArrayRangeNV;
10169 +}
10171 -typedef void function() pfglFlushVertexArrayRangeNV;
10172 -typedef void function(GLsizei,GLvoid*) pfglVertexArrayRangeNV;
10173 -
10174 pfglFlushVertexArrayRangeNV glFlushVertexArrayRangeNV;
10175 pfglVertexArrayRangeNV glVertexArrayRangeNV;
10176 Index: DerelictGL/derelict/opengl/extension/nv/fragment_program.d
10177 ===================================================================
10178 --- DerelictGL/derelict/opengl/extension/nv/fragment_program.d (revision 318)
10179 +++ DerelictGL/derelict/opengl/extension/nv/fragment_program.d (working copy)
10180 @@ -92,15 +92,15 @@
10181 GL_PROGRAM_ERROR_STRING_NV = 0x8874,
10182 }
10184 -extern(System):
10185 +extern(System) {
10186 +alias void function(GLuint, GLsizei, GLubyte*, GLfloat, GLfloat, GLfloat, GLfloat) pfglProgramNamedParameter4fNV;
10187 +alias void function(GLuint, GLsizei, GLubyte*, GLdouble, GLdouble, GLdouble, GLdouble) pfglProgramNamedParameter4dNV;
10188 +alias void function(GLuint, GLsizei, GLubyte*, GLfloat*) pfglProgramNamedParameter4fvNV;
10189 +alias void function(GLuint, GLsizei, GLubyte*, GLdouble*) pfglProgramNamedParameter4dvNV;
10190 +alias void function(GLuint, GLsizei, GLubyte*, GLfloat*) pfglGetProgramNamedParameterfvNV;
10191 +alias void function(GLuint, GLsizei, GLubyte*, GLdouble*) pfglGetProgramNamedParameterdvNV;
10192 +}
10194 -typedef void function(GLuint, GLsizei, GLubyte*, GLfloat, GLfloat, GLfloat, GLfloat) pfglProgramNamedParameter4fNV;
10195 -typedef void function(GLuint, GLsizei, GLubyte*, GLdouble, GLdouble, GLdouble, GLdouble) pfglProgramNamedParameter4dNV;
10196 -typedef void function(GLuint, GLsizei, GLubyte*, GLfloat*) pfglProgramNamedParameter4fvNV;
10197 -typedef void function(GLuint, GLsizei, GLubyte*, GLdouble*) pfglProgramNamedParameter4dvNV;
10198 -typedef void function(GLuint, GLsizei, GLubyte*, GLfloat*) pfglGetProgramNamedParameterfvNV;
10199 -typedef void function(GLuint, GLsizei, GLubyte*, GLdouble*) pfglGetProgramNamedParameterdvNV;
10200 -
10201 pfglProgramNamedParameter4fNV glProgramNamedParameter4fNV;
10202 pfglProgramNamedParameter4dNV glProgramNamedParameter4dNV;
10203 pfglProgramNamedParameter4fvNV glProgramNamedParameter4fvNV;
10204 Index: DerelictGL/derelict/opengl/extension/nv/half_float.d
10205 ===================================================================
10206 --- DerelictGL/derelict/opengl/extension/nv/half_float.d (revision 318)
10207 +++ DerelictGL/derelict/opengl/extension/nv/half_float.d (working copy)
10208 @@ -164,62 +164,62 @@
10209 }
10210 }
10212 -typedef ushort GLhalfNV;
10213 +alias ushort GLhalfNV;
10215 enum : GLenum
10216 {
10217 GL_HALF_FLOAT_NV = 0x140B
10218 }
10220 -extern(System):
10221 +extern(System) {
10222 +alias void function(GLhalfNV, GLhalfNV) pfglVertex2hNV;
10223 +alias void function(GLhalfNV*) pfglVertex2hvNV;
10224 +alias void function(GLhalfNV, GLhalfNV, GLhalfNV) pfglVertex3hNV;
10225 +alias void function(GLhalfNV*) pfglVertex3hvNV;
10226 +alias void function(GLhalfNV, GLhalfNV, GLhalfNV, GLhalfNV) pfglVertex4hNV;
10227 +alias void function(GLhalfNV*) pfglVertex4hvNV;
10228 +alias void function(GLhalfNV, GLhalfNV, GLhalfNV) pfglNormal3hNV;
10229 +alias void function(GLhalfNV*) pfglNormal3hvNV;
10230 +alias void function(GLhalfNV, GLhalfNV, GLhalfNV) pfglColor3hNV;
10231 +alias void function(GLhalfNV*) pfglColor3hvNV;
10232 +alias void function(GLhalfNV, GLhalfNV, GLhalfNV, GLhalfNV) pfglColor4hNV;
10233 +alias void function(GLhalfNV*) pfglColor4hvNV;
10234 +alias void function(GLhalfNV) pfglTexCoord1hNV;
10235 +alias void function(GLhalfNV*) pfglTexCoord1hvNV;
10236 +alias void function(GLhalfNV, GLhalfNV) pfglTexCoord2hNV;
10237 +alias void function(GLhalfNV*) pfglTexCoord2hvNV;
10238 +alias void function(GLhalfNV, GLhalfNV, GLhalfNV) pfglTexCoord3hNV;
10239 +alias void function(GLhalfNV*) pfglTexCoord3hvNV;
10240 +alias void function(GLhalfNV, GLhalfNV, GLhalfNV, GLhalfNV) pfglTexCoord4hNV;
10241 +alias void function(GLhalfNV*) pfglTexCoord4hvNV;
10242 +alias void function(GLenum, GLhalfNV) pfglMultiTexCoord1hNV;
10243 +alias void function(GLenum, GLhalfNV*) pfglMultiTexCoord1hvNV;
10244 +alias void function(GLenum, GLhalfNV, GLhalfNV) pfglMultiTexCoord2hNV;
10245 +alias void function(GLenum, GLhalfNV*) pfglMultiTexCoord2hvNV;
10246 +alias void function(GLenum, GLhalfNV, GLhalfNV, GLhalfNV) pfglMultiTexCoord3hNV;
10247 +alias void function(GLenum, GLhalfNV*) pfglMultiTexCoord3hvNV;
10248 +alias void function(GLenum, GLhalfNV, GLhalfNV, GLhalfNV, GLhalfNV) pfglMultiTexCoord4hNV;
10249 +alias void function(GLenum, GLhalfNV*) pfglMultiTexCoord4hvNV;
10250 +alias void function(GLhalfNV) pfglFogCoordhNV;
10251 +alias void function(GLhalfNV*) pfglFogCoordhvNV;
10252 +alias void function(GLhalfNV, GLhalfNV, GLhalfNV) pfglSecondaryColor3hNV;
10253 +alias void function(GLhalfNV*) pfglSecondaryColor3hvNV;
10254 +alias void function(GLhalfNV) pfglVertexWeighthNV;
10255 +alias void function(GLhalfNV*) pfglVertexWeighthvNV;
10256 +alias void function(GLuint, GLhalfNV) pfglVertexAttrib1hNV;
10257 +alias void function(GLuint, GLhalfNV*) pfglVertexAttrib1hvNV;
10258 +alias void function(GLuint, GLhalfNV, GLhalfNV) pfglVertexAttrib2hNV;
10259 +alias void function(GLuint, GLhalfNV*) pfglVertexAttrib2hvNV;
10260 +alias void function(GLuint, GLhalfNV, GLhalfNV, GLhalfNV) pfglVertexAttrib3hNV;
10261 +alias void function(GLuint, GLhalfNV*) pfglVertexAttrib3hvNV;
10262 +alias void function(GLuint, GLhalfNV, GLhalfNV, GLhalfNV, GLhalfNV) pfglVertexAttrib4hNV;
10263 +alias void function(GLuint, GLhalfNV*) pfglVertexAttrib4hvNV;
10264 +alias void function(GLuint, GLsizei, GLhalfNV*) pfglVertexAttribs1hvNV;
10265 +alias void function(GLuint, GLsizei, GLhalfNV*) pfglVertexAttribs2hvNV;
10266 +alias void function(GLuint, GLsizei, GLhalfNV*) pfglVertexAttribs3hvNV;
10267 +alias void function(GLuint, GLsizei, GLhalfNV*) pfglVertexAttribs4hvNV;
10268 +}
10270 -typedef void function(GLhalfNV, GLhalfNV) pfglVertex2hNV;
10271 -typedef void function(GLhalfNV*) pfglVertex2hvNV;
10272 -typedef void function(GLhalfNV, GLhalfNV, GLhalfNV) pfglVertex3hNV;
10273 -typedef void function(GLhalfNV*) pfglVertex3hvNV;
10274 -typedef void function(GLhalfNV, GLhalfNV, GLhalfNV, GLhalfNV) pfglVertex4hNV;
10275 -typedef void function(GLhalfNV*) pfglVertex4hvNV;
10276 -typedef void function(GLhalfNV, GLhalfNV, GLhalfNV) pfglNormal3hNV;
10277 -typedef void function(GLhalfNV*) pfglNormal3hvNV;
10278 -typedef void function(GLhalfNV, GLhalfNV, GLhalfNV) pfglColor3hNV;
10279 -typedef void function(GLhalfNV*) pfglColor3hvNV;
10280 -typedef void function(GLhalfNV, GLhalfNV, GLhalfNV, GLhalfNV) pfglColor4hNV;
10281 -typedef void function(GLhalfNV*) pfglColor4hvNV;
10282 -typedef void function(GLhalfNV) pfglTexCoord1hNV;
10283 -typedef void function(GLhalfNV*) pfglTexCoord1hvNV;
10284 -typedef void function(GLhalfNV, GLhalfNV) pfglTexCoord2hNV;
10285 -typedef void function(GLhalfNV*) pfglTexCoord2hvNV;
10286 -typedef void function(GLhalfNV, GLhalfNV, GLhalfNV) pfglTexCoord3hNV;
10287 -typedef void function(GLhalfNV*) pfglTexCoord3hvNV;
10288 -typedef void function(GLhalfNV, GLhalfNV, GLhalfNV, GLhalfNV) pfglTexCoord4hNV;
10289 -typedef void function(GLhalfNV*) pfglTexCoord4hvNV;
10290 -typedef void function(GLenum, GLhalfNV) pfglMultiTexCoord1hNV;
10291 -typedef void function(GLenum, GLhalfNV*) pfglMultiTexCoord1hvNV;
10292 -typedef void function(GLenum, GLhalfNV, GLhalfNV) pfglMultiTexCoord2hNV;
10293 -typedef void function(GLenum, GLhalfNV*) pfglMultiTexCoord2hvNV;
10294 -typedef void function(GLenum, GLhalfNV, GLhalfNV, GLhalfNV) pfglMultiTexCoord3hNV;
10295 -typedef void function(GLenum, GLhalfNV*) pfglMultiTexCoord3hvNV;
10296 -typedef void function(GLenum, GLhalfNV, GLhalfNV, GLhalfNV, GLhalfNV) pfglMultiTexCoord4hNV;
10297 -typedef void function(GLenum, GLhalfNV*) pfglMultiTexCoord4hvNV;
10298 -typedef void function(GLhalfNV) pfglFogCoordhNV;
10299 -typedef void function(GLhalfNV*) pfglFogCoordhvNV;
10300 -typedef void function(GLhalfNV, GLhalfNV, GLhalfNV) pfglSecondaryColor3hNV;
10301 -typedef void function(GLhalfNV*) pfglSecondaryColor3hvNV;
10302 -typedef void function(GLhalfNV) pfglVertexWeighthNV;
10303 -typedef void function(GLhalfNV*) pfglVertexWeighthvNV;
10304 -typedef void function(GLuint, GLhalfNV) pfglVertexAttrib1hNV;
10305 -typedef void function(GLuint, GLhalfNV*) pfglVertexAttrib1hvNV;
10306 -typedef void function(GLuint, GLhalfNV, GLhalfNV) pfglVertexAttrib2hNV;
10307 -typedef void function(GLuint, GLhalfNV*) pfglVertexAttrib2hvNV;
10308 -typedef void function(GLuint, GLhalfNV, GLhalfNV, GLhalfNV) pfglVertexAttrib3hNV;
10309 -typedef void function(GLuint, GLhalfNV*) pfglVertexAttrib3hvNV;
10310 -typedef void function(GLuint, GLhalfNV, GLhalfNV, GLhalfNV, GLhalfNV) pfglVertexAttrib4hNV;
10311 -typedef void function(GLuint, GLhalfNV*) pfglVertexAttrib4hvNV;
10312 -typedef void function(GLuint, GLsizei, GLhalfNV*) pfglVertexAttribs1hvNV;
10313 -typedef void function(GLuint, GLsizei, GLhalfNV*) pfglVertexAttribs2hvNV;
10314 -typedef void function(GLuint, GLsizei, GLhalfNV*) pfglVertexAttribs3hvNV;
10315 -typedef void function(GLuint, GLsizei, GLhalfNV*) pfglVertexAttribs4hvNV;
10316 -
10317 pfglVertex2hNV glVertex2hNV;
10318 pfglVertex2hvNV glVertex2hvNV;
10319 pfglVertex3hNV glVertex3hNV;
10320 Index: DerelictGL/derelict/opengl/extension/nv/geometry_program4.d
10321 ===================================================================
10322 --- DerelictGL/derelict/opengl/extension/nv/geometry_program4.d (revision 318)
10323 +++ DerelictGL/derelict/opengl/extension/nv/geometry_program4.d (working copy)
10324 @@ -79,8 +79,8 @@
10325 GL_MAX_PROGRAM_TOTAL_OUTPUT_COMPONENTS_NV = 0x8C28,
10326 }
10328 -extern(System):
10329 +extern(System) {
10330 +alias void function(GLenum, GLint) pfglProgramVertexLimitNV;
10331 +}
10333 -typedef void function(GLenum, GLint) pfglProgramVertexLimitNV;
10334 -
10335 pfglProgramVertexLimitNV glProgramVertexLimitNV;
10336 Index: DerelictGL/derelict/opengl/extension/nv/gpu_program4.d
10337 ===================================================================
10338 --- DerelictGL/derelict/opengl/extension/nv/gpu_program4.d (revision 318)
10339 +++ DerelictGL/derelict/opengl/extension/nv/gpu_program4.d (working copy)
10340 @@ -114,25 +114,25 @@
10341 GL_MAX_PROGRAM_GENERIC_RESULTS_NV = 0x8DA6,
10342 }
10344 -extern(System):
10345 +extern(System) {
10346 +alias void function(GLenum, GLuint, GLint, GLint, GLint, GLint) pfglProgramLocalParameterI4iNV;
10347 +alias void function(GLenum, GLuint, GLint*) pfglProgramLocalParameterI4ivNV;
10348 +alias void function(GLenum, GLuint, GLsizei, GLint*) pfglProgramLocalParametersI4ivNV;
10349 +alias void function(GLenum, GLuint, GLuint, GLuint, GLuint, GLuint) pfglProgramLocalParameterI4uiNV;
10350 +alias void function(GLenum, GLuint, GLuint*) pfglProgramLocalParameterI4uivNV;
10351 +alias void function(GLenum, GLuint, GLsizei, GLuint*) pfglProgramLocalParametersI4uivNV;
10352 +alias void function(GLenum, GLuint,. GLint, GLint, GLint, GLint) pfglProgramEnvParameterI4iNV;
10353 +alias void function(GLenum, GLuint, GLint*) pfglProgramEnvParameterI4ivNV;
10354 +alias void function(GLenum, GLuint, GLsizei, GLint*) pfglProgramEnvParametersI4ivNV;
10355 +alias void function(GLenum, GLuint,. GLuint, GLuint, GLuint, GLuint) pfglProgramEnvParameterI4uiNV;
10356 +alias void function(GLenum, GLuint, GLuint*) pfglProgramEnvParameterI4uivNV;
10357 +alias void function(GLenum, GLuint, GLsizei, GLuint*) pfglProgramEnvParametersI4uivNV;
10358 +alias void function(GLenum, GLuint, GLint*) pfglGetProgramLocalParameterIivNV;
10359 +alias void function(GLenum, GLuint, GLuint*) pfglGetProgramLocalParameterIuivNV;
10360 +alias void function(GLenum, GLuint, GLint*) pfglGetProgramEnvParameterIivNV;
10361 +alias void function(GLenum, GLuint, GLuint*) pfglGetProgramEnvParameterIuivNV;
10362 +}
10364 -typedef void function(GLenum, GLuint, GLint, GLint, GLint, GLint) pfglProgramLocalParameterI4iNV;
10365 -typedef void function(GLenum, GLuint, GLint*) pfglProgramLocalParameterI4ivNV;
10366 -typedef void function(GLenum, GLuint, GLsizei, GLint*) pfglProgramLocalParametersI4ivNV;
10367 -typedef void function(GLenum, GLuint, GLuint, GLuint, GLuint, GLuint) pfglProgramLocalParameterI4uiNV;
10368 -typedef void function(GLenum, GLuint, GLuint*) pfglProgramLocalParameterI4uivNV;
10369 -typedef void function(GLenum, GLuint, GLsizei, GLuint*) pfglProgramLocalParametersI4uivNV;
10370 -typedef void function(GLenum, GLuint,. GLint, GLint, GLint, GLint) pfglProgramEnvParameterI4iNV;
10371 -typedef void function(GLenum, GLuint, GLint*) pfglProgramEnvParameterI4ivNV;
10372 -typedef void function(GLenum, GLuint, GLsizei, GLint*) pfglProgramEnvParametersI4ivNV;
10373 -typedef void function(GLenum, GLuint,. GLuint, GLuint, GLuint, GLuint) pfglProgramEnvParameterI4uiNV;
10374 -typedef void function(GLenum, GLuint, GLuint*) pfglProgramEnvParameterI4uivNV;
10375 -typedef void function(GLenum, GLuint, GLsizei, GLuint*) pfglProgramEnvParametersI4uivNV;
10376 -typedef void function(GLenum, GLuint, GLint*) pfglGetProgramLocalParameterIivNV;
10377 -typedef void function(GLenum, GLuint, GLuint*) pfglGetProgramLocalParameterIuivNV;
10378 -typedef void function(GLenum, GLuint, GLint*) pfglGetProgramEnvParameterIivNV;
10379 -typedef void function(GLenum, GLuint, GLuint*) pfglGetProgramEnvParameterIuivNV;
10380 -
10381 pfglProgramLocalParameterI4iNV glProgramLocalParameterI4iNV;
10382 pfglProgramLocalParameterI4ivNV glProgramLocalParameterI4ivNV;
10383 pfglProgramLocalParametersI4ivNV glProgramLocalParametersI4ivNV;
10384 Index: DerelictGL/derelict/opengl/extension/nv/register_combiners2.d
10385 ===================================================================
10386 --- DerelictGL/derelict/opengl/extension/nv/register_combiners2.d (revision 318)
10387 +++ DerelictGL/derelict/opengl/extension/nv/register_combiners2.d (working copy)
10388 @@ -79,10 +79,10 @@
10389 GL_PER_STAGE_CONSTANTS_NV = 0x8535
10390 }
10392 -extern(System):
10393 +extern(System) {
10394 +alias void function(GLenum, GLenum, GLfloat*) pfglCombinerStageParameterfvNV;
10395 +alias void function(GLenum, GLenum, GLfloat*) pfglGetCombinerStageParameterfvNV;
10396 +}
10398 -typedef void function(GLenum, GLenum, GLfloat*) pfglCombinerStageParameterfvNV;
10399 -typedef void function(GLenum, GLenum, GLfloat*) pfglGetCombinerStageParameterfvNV;
10400 -
10401 pfglCombinerStageParameterfvNV glCombinerStageParameterfvNV;
10402 pfglGetCombinerStageParameterfvNV glGetCombinerStageParameterfvNV;
10403 Index: DerelictGL/derelict/opengl/extension/nv/framebuffer_multisample_coverage.d
10404 ===================================================================
10405 --- DerelictGL/derelict/opengl/extension/nv/framebuffer_multisample_coverage.d (revision 318)
10406 +++ DerelictGL/derelict/opengl/extension/nv/framebuffer_multisample_coverage.d (working copy)
10407 @@ -82,8 +82,8 @@
10408 GL_MULTISAMPLE_COVERAGE_MODES_NV = 0x8E13,
10409 }
10411 -extern(System):
10412 +extern(System) {
10413 +alias void function(GLenum, GLsizei, GLsizei, GLenum, GLsizei, GLsizei) pfglRenderbufferStorageMultsampleCoverageNV;
10414 +}
10416 -typedef void function(GLenum, GLsizei, GLsizei, GLenum, GLsizei, GLsizei) pfglRenderbufferStorageMultsampleCoverageNV;
10417 -
10418 pfglRenderbufferStorageMultsampleCoverageNV glRenderbufferStorageMultsampleCoverageNV;
10419 Index: DerelictGL/derelict/opengl/extension/nv/primitive_restart.d
10420 ===================================================================
10421 --- DerelictGL/derelict/opengl/extension/nv/primitive_restart.d (revision 318)
10422 +++ DerelictGL/derelict/opengl/extension/nv/primitive_restart.d (working copy)
10423 @@ -80,10 +80,10 @@
10424 GL_PRIMITIVE_RESTART_INDEX_NV = 0x8559,
10425 }
10427 -extern(System):
10428 +extern(System) {
10429 +alias void function() pfglPrimitiveRestartNV;
10430 +alias void function(GLuint) pfglPrimitiveRestartIndexNV;
10431 +}
10433 -typedef void function() pfglPrimitiveRestartNV;
10434 -typedef void function(GLuint) pfglPrimitiveRestartIndexNV;
10435 -
10436 pfglPrimitiveRestartNV glPrimitiveRestartNV;
10437 pfglPrimitiveRestartIndexNV glPrimitiveRestartIndexNV;
10438 Index: DerelictGL/derelict/opengl/extension/nv/point_sprite.d
10439 ===================================================================
10440 --- DerelictGL/derelict/opengl/extension/nv/point_sprite.d (revision 318)
10441 +++ DerelictGL/derelict/opengl/extension/nv/point_sprite.d (working copy)
10442 @@ -81,10 +81,10 @@
10443 GL_POINT_SPRITE_R_MODE_NV = 0x8863,
10444 }
10446 -extern(System):
10447 +extern(System) {
10448 +alias void function(GLenum, GLint) pfglPointParameteriNV;
10449 +alias void function(GLenum, GLint*) pfglPointParameterivNV;
10450 +}
10452 -typedef void function(GLenum, GLint) pfglPointParameteriNV;
10453 -typedef void function(GLenum, GLint*) pfglPointParameterivNV;
10454 -
10455 pfglPointParameteriNV glPointParameteriNV;
10456 pfglPointParameterivNV glPointParameterivNV;
10457 Index: DerelictGL/derelict/opengl/extension/nv/transform_feedback.d
10458 ===================================================================
10459 --- DerelictGL/derelict/opengl/extension/nv/transform_feedback.d (revision 318)
10460 +++ DerelictGL/derelict/opengl/extension/nv/transform_feedback.d (working copy)
10461 @@ -121,20 +121,20 @@
10462 GL_TRANSFORM_FEEDBACK_BUFFER_BINDING_NV = 0x8C8F,
10463 }
10465 -extern(System):
10466 +extern(System) {
10467 +alias void function(GLenum) pfglBeginTransformFeedbackNV;
10468 +alias void function() pfglEndTransformFeedbackNV;
10469 +alias void function(GLuint,GLint*,GLenum) pfglTransformFeedbackAttribsNV;
10470 +alias void function(GLenum,GLuint,GLuint,GLintptr,GLsizeiptr) pfglBindBufferRangeNV;
10471 +alias void function(GLenum,GLuint,GLuint,GLintptr) pfglBindBufferOffsetNV;
10472 +alias void function(GLenum,GLuint,GLuint) pfglBindBufferBaseNV;
10473 +alias void function(GLuint,GLsizei,GLint*,GLenum) pfglTransformFeedbackVaryingsNV;
10474 +alias void function(GLuint,GLchar*) pfglActiveVaryingNV;
10475 +alias GLint function(GLuint,GLchar*) pfglGetVaryingLocationNV;
10476 +alias void function(GLuint,GLuint,GLsizei,GLsizei*,GLsizei*,GLenum*,GLchar*) pfglGetActiveVaryingNV;
10477 +alias void function(GLuint,GLuint,GLint*) pfglGetTransformFeedbackVaryingNV;
10478 +}
10480 -typedef void function(GLenum) pfglBeginTransformFeedbackNV;
10481 -typedef void function() pfglEndTransformFeedbackNV;
10482 -typedef void function(GLuint,GLint*,GLenum) pfglTransformFeedbackAttribsNV;
10483 -typedef void function(GLenum,GLuint,GLuint,GLintptr,GLsizeiptr) pfglBindBufferRangeNV;
10484 -typedef void function(GLenum,GLuint,GLuint,GLintptr) pfglBindBufferOffsetNV;
10485 -typedef void function(GLenum,GLuint,GLuint) pfglBindBufferBaseNV;
10486 -typedef void function(GLuint,GLsizei,GLint*,GLenum) pfglTransformFeedbackVaryingsNV;
10487 -typedef void function(GLuint,GLchar*) pfglActiveVaryingNV;
10488 -typedef GLint function(GLuint,GLchar*) pfglGetVaryingLocationNV;
10489 -typedef void function(GLuint,GLuint,GLsizei,GLsizei*,GLsizei*,GLenum*,GLchar*) pfglGetActiveVaryingNV;
10490 -typedef void function(GLuint,GLuint,GLint*) pfglGetTransformFeedbackVaryingNV;
10491 -
10492 pfglBeginTransformFeedbackNV glBeginTransformFeedbackNV;
10493 pfglEndTransformFeedbackNV glEndTransformFeedbackNV;
10494 pfglTransformFeedbackAttribsNV glTransformFeedbackAttribsNV;
10495 @@ -145,4 +145,4 @@
10496 pfglActiveVaryingNV glActiveVaryingNV;
10497 pfglGetVaryingLocationNV glGetVaryingLocationNV;
10498 pfglGetActiveVaryingNV glGetActiveVaryingNV;
10499 -pfglGetTransformFeedbackVaryingNV glGetTransformFeedbackVaryingNV;
10500 \ No newline at end of file
10501 +pfglGetTransformFeedbackVaryingNV glGetTransformFeedbackVaryingNV;
10502 Index: DerelictGL/derelict/opengl/extension/nv/register_combiners.d
10503 ===================================================================
10504 --- DerelictGL/derelict/opengl/extension/nv/register_combiners.d (revision 318)
10505 +++ DerelictGL/derelict/opengl/extension/nv/register_combiners.d (working copy)
10506 @@ -151,22 +151,22 @@
10507 GL_COMBINER7_NV = 0x8557,
10508 }
10510 -extern(System):
10511 +extern(System) {
10512 +alias void function(GLenum, GLfloat*) pfglCombinerParameterfvNV;
10513 +alias void function(GLenum, GLfloat) pfglCombinerParameterfNV;
10514 +alias void function(GLenum, GLint*) pfglCombinerParameterivNV;
10515 +alias void function(GLenum, GLint) pfglCombinerParameteriNV;
10516 +alias void function(GLenum, GLenum, GLenum, GLenum, GLenum, GLenum) pfglCombinerInputNV;
10517 +alias void function(GLenum, GLenum, GLenum, GLenum, GLenum, GLenum, GLenum, GLboolean, GLboolean, GLboolean) pfglCombinerOutputNV;
10518 +alias void function(GLenum, GLenum, GLenum, GLenum) pfglFinalCombinerInputNV;
10519 +alias void function(GLenum, GLenum, GLenum, GLenum, GLfloat*) pfglGetCombinerInputParameterfvNV;
10520 +alias void function(GLenum, GLenum, GLenum, GLenum, GLint*) pfglGetCombinerInputParameterivNV;
10521 +alias void function(GLenum, GLenum, GLenum, GLfloat*) pfglGetCombinerOutputParameterfvNV;
10522 +alias void function(GLenum, GLenum, GLenum, GLint*) pfglGetCombinerOutputParameterivNV;
10523 +alias void function(GLenum, GLenum, GLfloat*) pfglGetFinalCombinerInputParameterfvNV;
10524 +alias void function(GLenum, GLenum, GLint*) pfglGetFinalCombinerInputParameterivNV;
10525 +}
10527 -typedef void function(GLenum, GLfloat*) pfglCombinerParameterfvNV;
10528 -typedef void function(GLenum, GLfloat) pfglCombinerParameterfNV;
10529 -typedef void function(GLenum, GLint*) pfglCombinerParameterivNV;
10530 -typedef void function(GLenum, GLint) pfglCombinerParameteriNV;
10531 -typedef void function(GLenum, GLenum, GLenum, GLenum, GLenum, GLenum) pfglCombinerInputNV;
10532 -typedef void function(GLenum, GLenum, GLenum, GLenum, GLenum, GLenum, GLenum, GLboolean, GLboolean, GLboolean) pfglCombinerOutputNV;
10533 -typedef void function(GLenum, GLenum, GLenum, GLenum) pfglFinalCombinerInputNV;
10534 -typedef void function(GLenum, GLenum, GLenum, GLenum, GLfloat*) pfglGetCombinerInputParameterfvNV;
10535 -typedef void function(GLenum, GLenum, GLenum, GLenum, GLint*) pfglGetCombinerInputParameterivNV;
10536 -typedef void function(GLenum, GLenum, GLenum, GLfloat*) pfglGetCombinerOutputParameterfvNV;
10537 -typedef void function(GLenum, GLenum, GLenum, GLint*) pfglGetCombinerOutputParameterivNV;
10538 -typedef void function(GLenum, GLenum, GLfloat*) pfglGetFinalCombinerInputParameterfvNV;
10539 -typedef void function(GLenum, GLenum, GLint*) pfglGetFinalCombinerInputParameterivNV;
10540 -
10541 pfglCombinerParameterfvNV glCombinerParameterfvNV;
10542 pfglCombinerParameterfNV glCombinerParameterfNV;
10543 pfglCombinerParameterivNV glCombinerParameterivNV;
10544 Index: DerelictGL/derelict/opengl/extension/nv/evaluators.d
10545 ===================================================================
10546 --- DerelictGL/derelict/opengl/extension/nv/evaluators.d (revision 318)
10547 +++ DerelictGL/derelict/opengl/extension/nv/evaluators.d (working copy)
10548 @@ -116,18 +116,18 @@
10549 GL_MAX_RATIONAL_EVAL_ORDER_NV = 0x86D7,
10550 }
10552 -extern(System):
10553 +extern(System) {
10554 +alias void function(GLenum, GLuint, GLenum, GLsizei, GLsizei, GLint, GLint, GLboolean, GLvoid*) pfglMapControlPointsNV;
10555 +alias void function(GLenum, GLenum, GLint*) pfglMapParameterivNV;
10556 +alias void function(GLenum, GLenum, GLfloat*) pfglMapParameterfvNV;
10557 +alias void function(GLenum, GLuint, GLenum, GLsizei, GLsizei, GLboolean, GLvoid*) pfglGetMapControlPointsNV;
10558 +alias void function(GLenum, GLenum, GLint*) pfglGetMapParameterivNV;
10559 +alias void function(GLenum, GLenum, GLfloat*) pfglGetMapParameterfvNV;
10560 +alias void function(GLenum, GLuint, GLenum, GLint*) pfglGetMapAttribParameterivNV;
10561 +alias void function(GLenum, GLuint, GLenum, GLfloat*) pfglGetMapAttribParameterfvNV;
10562 +alias void function(GLenum, GLenum) pfglEvalMapsNV;
10563 +}
10565 -typedef void function(GLenum, GLuint, GLenum, GLsizei, GLsizei, GLint, GLint, GLboolean, GLvoid*) pfglMapControlPointsNV;
10566 -typedef void function(GLenum, GLenum, GLint*) pfglMapParameterivNV;
10567 -typedef void function(GLenum, GLenum, GLfloat*) pfglMapParameterfvNV;
10568 -typedef void function(GLenum, GLuint, GLenum, GLsizei, GLsizei, GLboolean, GLvoid*) pfglGetMapControlPointsNV;
10569 -typedef void function(GLenum, GLenum, GLint*) pfglGetMapParameterivNV;
10570 -typedef void function(GLenum, GLenum, GLfloat*) pfglGetMapParameterfvNV;
10571 -typedef void function(GLenum, GLuint, GLenum, GLint*) pfglGetMapAttribParameterivNV;
10572 -typedef void function(GLenum, GLuint, GLenum, GLfloat*) pfglGetMapAttribParameterfvNV;
10573 -typedef void function(GLenum, GLenum) pfglEvalMapsNV;
10574 -
10575 pfglMapControlPointsNV glMapControlPointsNV;
10576 pfglMapParameterivNV glMapParameterivNV;
10577 pfglMapParameterfvNV glMapParameterfvNV;
10578 Index: DerelictGL/derelict/opengl/extension/nv/pixel_data_range.d
10579 ===================================================================
10580 --- DerelictGL/derelict/opengl/extension/nv/pixel_data_range.d (revision 318)
10581 +++ DerelictGL/derelict/opengl/extension/nv/pixel_data_range.d (working copy)
10582 @@ -84,10 +84,10 @@
10583 GL_READ_PIXEL_DATA_RANGE_POINTER_NV = 0x887D,
10584 }
10586 -extern(System):
10587 +extern(System) {
10588 +alias void function(GLenum, GLsizei, GLvoid*) pfglPixelDataRangeNV;
10589 +alias void function(GLenum) pfglFlushPixelDataRangeNV;
10590 +}
10592 -typedef void function(GLenum, GLsizei, GLvoid*) pfglPixelDataRangeNV;
10593 -typedef void function(GLenum) pfglFlushPixelDataRangeNV;
10594 -
10595 pfglPixelDataRangeNV glPixelDataRangeNV;
10596 pfglFlushPixelDataRangeNV glFlushPixelDataRangeNV;
10597 Index: DerelictGL/derelict/opengl/extension/arb/vertex_shader.d
10598 ===================================================================
10599 --- DerelictGL/derelict/opengl/extension/arb/vertex_shader.d (revision 318)
10600 +++ DerelictGL/derelict/opengl/extension/arb/vertex_shader.d (working copy)
10601 @@ -92,12 +92,11 @@
10602 alias uint GLhandleARB;
10603 }
10605 -extern(System):
10606 -
10607 -typedef void function (GLhandleARB, GLuint, GLcharARB*) pfglBindAttribLocationARB;
10608 -typedef void function (GLhandleARB, GLuint, GLsizei, GLsizei*, GLint*, GLenum*, GLcharARB*) pfglGetActiveAttribARB;
10609 -typedef GLint function (GLhandleARB, GLcharARB* name) pfglGetAttribLocationARB;
10610 -
10611 +extern(System) {
10612 +alias void function (GLhandleARB, GLuint, GLcharARB*) pfglBindAttribLocationARB;
10613 +alias void function (GLhandleARB, GLuint, GLsizei, GLsizei*, GLint*, GLenum*, GLcharARB*) pfglGetActiveAttribARB;
10614 +alias GLint function (GLhandleARB, GLcharARB* name) pfglGetAttribLocationARB;
10615 +}
10616 pfglBindAttribLocationARB glBindAttribLocationARB;
10617 pfglGetActiveAttribARB glGetActiveAttribARB;
10618 pfglGetAttribLocationARB glGetAttribLocationARB;
10619 Index: DerelictGL/derelict/opengl/extension/arb/vertex_program.d
10620 ===================================================================
10621 --- DerelictGL/derelict/opengl/extension/arb/vertex_program.d (revision 318)
10622 +++ DerelictGL/derelict/opengl/extension/arb/vertex_program.d (working copy)
10623 @@ -276,70 +276,71 @@
10624 GL_MATRIX31_ARB = 0x88DF,
10625 }
10627 -extern(System):
10628 +extern(System) {
10630 -typedef void function(GLuint, GLdouble) pfglVertexAttrib1dARB;
10631 -typedef void function(GLuint, GLdouble*) pfglVertexAttrib1dvARB;
10632 -typedef void function(GLuint, GLfloat) pfglVertexAttrib1fARB;
10633 -typedef void function(GLuint, GLfloat*) pfglVertexAttrib1fvARB;
10634 -typedef void function(GLuint, GLshort) pfglVertexAttrib1sARB;
10635 -typedef void function(GLuint, GLshort*) pfglVertexAttrib1svARB;
10636 -typedef void function(GLuint, GLdouble, GLdouble) pfglVertexAttrib2dARB;
10637 -typedef void function(GLuint, GLdouble*) pfglVertexAttrib2dvARB;
10638 -typedef void function(GLuint, GLfloat, GLfloat) pfglVertexAttrib2fARB;
10639 -typedef void function(GLuint, GLfloat*) pfglVertexAttrib2fvARB;
10640 -typedef void function(GLuint, GLshort, GLshort) pfglVertexAttrib2sARB;
10641 -typedef void function(GLuint, GLshort*) pfglVertexAttrib2svARB;
10642 -typedef void function(GLuint, GLdouble, GLdouble, GLdouble) pfglVertexAttrib3dARB;
10643 -typedef void function(GLuint, GLdouble*) pfglVertexAttrib3dvARB;
10644 -typedef void function(GLuint, GLfloat, GLfloat, GLfloat) pfglVertexAttrib3fARB;
10645 -typedef void function(GLuint, GLfloat*) pfglVertexAttrib3fvARB;
10646 -typedef void function(GLuint, GLshort, GLshort, GLshort) pfglVertexAttrib3sARB;
10647 -typedef void function(GLuint, GLshort*) pfglVertexAttrib3svARB;
10648 -typedef void function(GLuint, GLbyte*) pfglVertexAttrib4NbvARB;
10649 -typedef void function(GLuint, GLint*) pfglVertexAttrib4NivARB;
10650 -typedef void function(GLuint, GLshort*) pfglVertexAttrib4NsvARB;
10651 -typedef void function(GLuint, GLubyte, GLubyte, GLubyte, GLubyte) pfglVertexAttrib4NubARB;
10652 -typedef void function(GLuint, GLubyte*) pfglVertexAttrib4NubvARB;
10653 -typedef void function(GLuint, GLuint*) pfglVertexAttrib4NuivARB;
10654 -typedef void function(GLuint, GLushort*) pfglVertexAttrib4NusvARB;
10655 -typedef void function(GLuint, GLbyte*) pfglVertexAttrib4bvARB;
10656 -typedef void function(GLuint, GLdouble, GLdouble, GLdouble, GLdouble) pfglVertexAttrib4dARB;
10657 -typedef void function(GLuint, GLdouble*) pfglVertexAttrib4dvARB;
10658 -typedef void function(GLuint, GLfloat, GLfloat, GLfloat, GLfloat) pfglVertexAttrib4fARB;
10659 -typedef void function(GLuint, GLfloat*) pfglVertexAttrib4fvARB;
10660 -typedef void function(GLuint, GLint*) pfglVertexAttrib4ivARB;
10661 -typedef void function(GLuint, GLshort, GLshort, GLshort, GLshort) pfglVertexAttrib4sARB;
10662 -typedef void function(GLuint, GLshort*) pfglVertexAttrib4svARB;
10663 -typedef void function(GLuint, GLubyte*) pfglVertexAttrib4ubvARB;
10664 -typedef void function(GLuint, GLuint*) pfglVertexAttrib4uivARB;
10665 -typedef void function(GLuint, GLushort*) pfglVertexAttrib4usvARB;
10666 -typedef void function(GLuint, GLint, GLenum, GLboolean, GLsizei, GLvoid*) pfglVertexAttribPointerARB;
10667 -typedef void function(GLuint) pfglEnableVertexAttribArrayARB;
10668 -typedef void function(GLuint) pfglDisableVertexAttribArrayARB;
10669 -typedef void function(GLenum, GLenum, GLsizei, GLvoid*) pfglProgramStringARB;
10670 -typedef void function(GLenum, GLuint) pfglBindProgramARB;
10671 -typedef void function(GLsizei, GLuint*) pfglDeleteProgramsARB;
10672 -typedef void function(GLsizei, GLuint*) pfglGenProgramsARB;
10673 -typedef void function(GLenum, GLuint, GLdouble, GLdouble, GLdouble, GLdouble) pfglProgramEnvParameter4dARB;
10674 -typedef void function(GLenum, GLuint, GLdouble*) pfglProgramEnvParameter4dvARB;
10675 -typedef void function(GLenum, GLuint, GLfloat, GLfloat, GLfloat, GLfloat) pfglProgramEnvParameter4fARB;
10676 -typedef void function(GLenum, GLuint, GLfloat*) pfglProgramEnvParameter4fvARB;
10677 -typedef void function(GLenum, GLuint, GLdouble, GLdouble, GLdouble, GLdouble) pfglProgramLocalParameter4dARB;
10678 -typedef void function(GLenum, GLuint, GLdouble*) pfglProgramLocalParameter4dvARB;
10679 -typedef void function(GLenum, GLuint, GLfloat, GLfloat, GLfloat, GLfloat) pfglProgramLocalParameter4fARB;
10680 -typedef void function(GLenum, GLuint, GLfloat*) pfglProgramLocalParameter4fvARB;
10681 -typedef void function(GLenum, GLuint, GLdouble*) pfglGetProgramEnvParameterdvARB;
10682 -typedef void function(GLenum, GLuint, GLfloat*) pfglGetProgramEnvParameterfvARB;
10683 -typedef void function(GLenum, GLuint, GLdouble*) pfglGetProgramLocalParameterdvARB;
10684 -typedef void function(GLenum, GLuint, GLfloat*) pfglGetProgramLocalParameterfvARB;
10685 -typedef void function(GLenum, GLenum, GLint*) pfglGetProgramivARB;
10686 -typedef void function(GLenum, GLenum, GLvoid*) pfglGetProgramStringARB;
10687 -typedef void function(GLuint, GLenum, GLdouble*) pfglGetVertexAttribdvARB;
10688 -typedef void function(GLuint, GLenum, GLfloat*) pfglGetVertexAttribfvARB;
10689 -typedef void function(GLuint, GLenum, GLint*) pfglGetVertexAttribivARB;
10690 -typedef void function(GLuint, GLenum, GLvoid*) pfglGetVertexAttribPointervARB;
10691 -typedef GLboolean function(GLuint) pfglIsProgramARB;
10692 +alias void function(GLuint, GLdouble) pfglVertexAttrib1dARB;
10693 +alias void function(GLuint, GLdouble*) pfglVertexAttrib1dvARB;
10694 +alias void function(GLuint, GLfloat) pfglVertexAttrib1fARB;
10695 +alias void function(GLuint, GLfloat*) pfglVertexAttrib1fvARB;
10696 +alias void function(GLuint, GLshort) pfglVertexAttrib1sARB;
10697 +alias void function(GLuint, GLshort*) pfglVertexAttrib1svARB;
10698 +alias void function(GLuint, GLdouble, GLdouble) pfglVertexAttrib2dARB;
10699 +alias void function(GLuint, GLdouble*) pfglVertexAttrib2dvARB;
10700 +alias void function(GLuint, GLfloat, GLfloat) pfglVertexAttrib2fARB;
10701 +alias void function(GLuint, GLfloat*) pfglVertexAttrib2fvARB;
10702 +alias void function(GLuint, GLshort, GLshort) pfglVertexAttrib2sARB;
10703 +alias void function(GLuint, GLshort*) pfglVertexAttrib2svARB;
10704 +alias void function(GLuint, GLdouble, GLdouble, GLdouble) pfglVertexAttrib3dARB;
10705 +alias void function(GLuint, GLdouble*) pfglVertexAttrib3dvARB;
10706 +alias void function(GLuint, GLfloat, GLfloat, GLfloat) pfglVertexAttrib3fARB;
10707 +alias void function(GLuint, GLfloat*) pfglVertexAttrib3fvARB;
10708 +alias void function(GLuint, GLshort, GLshort, GLshort) pfglVertexAttrib3sARB;
10709 +alias void function(GLuint, GLshort*) pfglVertexAttrib3svARB;
10710 +alias void function(GLuint, GLbyte*) pfglVertexAttrib4NbvARB;
10711 +alias void function(GLuint, GLint*) pfglVertexAttrib4NivARB;
10712 +alias void function(GLuint, GLshort*) pfglVertexAttrib4NsvARB;
10713 +alias void function(GLuint, GLubyte, GLubyte, GLubyte, GLubyte) pfglVertexAttrib4NubARB;
10714 +alias void function(GLuint, GLubyte*) pfglVertexAttrib4NubvARB;
10715 +alias void function(GLuint, GLuint*) pfglVertexAttrib4NuivARB;
10716 +alias void function(GLuint, GLushort*) pfglVertexAttrib4NusvARB;
10717 +alias void function(GLuint, GLbyte*) pfglVertexAttrib4bvARB;
10718 +alias void function(GLuint, GLdouble, GLdouble, GLdouble, GLdouble) pfglVertexAttrib4dARB;
10719 +alias void function(GLuint, GLdouble*) pfglVertexAttrib4dvARB;
10720 +alias void function(GLuint, GLfloat, GLfloat, GLfloat, GLfloat) pfglVertexAttrib4fARB;
10721 +alias void function(GLuint, GLfloat*) pfglVertexAttrib4fvARB;
10722 +alias void function(GLuint, GLint*) pfglVertexAttrib4ivARB;
10723 +alias void function(GLuint, GLshort, GLshort, GLshort, GLshort) pfglVertexAttrib4sARB;
10724 +alias void function(GLuint, GLshort*) pfglVertexAttrib4svARB;
10725 +alias void function(GLuint, GLubyte*) pfglVertexAttrib4ubvARB;
10726 +alias void function(GLuint, GLuint*) pfglVertexAttrib4uivARB;
10727 +alias void function(GLuint, GLushort*) pfglVertexAttrib4usvARB;
10728 +alias void function(GLuint, GLint, GLenum, GLboolean, GLsizei, GLvoid*) pfglVertexAttribPointerARB;
10729 +alias void function(GLuint) pfglEnableVertexAttribArrayARB;
10730 +alias void function(GLuint) pfglDisableVertexAttribArrayARB;
10731 +alias void function(GLenum, GLenum, GLsizei, GLvoid*) pfglProgramStringARB;
10732 +alias void function(GLenum, GLuint) pfglBindProgramARB;
10733 +alias void function(GLsizei, GLuint*) pfglDeleteProgramsARB;
10734 +alias void function(GLsizei, GLuint*) pfglGenProgramsARB;
10735 +alias void function(GLenum, GLuint, GLdouble, GLdouble, GLdouble, GLdouble) pfglProgramEnvParameter4dARB;
10736 +alias void function(GLenum, GLuint, GLdouble*) pfglProgramEnvParameter4dvARB;
10737 +alias void function(GLenum, GLuint, GLfloat, GLfloat, GLfloat, GLfloat) pfglProgramEnvParameter4fARB;
10738 +alias void function(GLenum, GLuint, GLfloat*) pfglProgramEnvParameter4fvARB;
10739 +alias void function(GLenum, GLuint, GLdouble, GLdouble, GLdouble, GLdouble) pfglProgramLocalParameter4dARB;
10740 +alias void function(GLenum, GLuint, GLdouble*) pfglProgramLocalParameter4dvARB;
10741 +alias void function(GLenum, GLuint, GLfloat, GLfloat, GLfloat, GLfloat) pfglProgramLocalParameter4fARB;
10742 +alias void function(GLenum, GLuint, GLfloat*) pfglProgramLocalParameter4fvARB;
10743 +alias void function(GLenum, GLuint, GLdouble*) pfglGetProgramEnvParameterdvARB;
10744 +alias void function(GLenum, GLuint, GLfloat*) pfglGetProgramEnvParameterfvARB;
10745 +alias void function(GLenum, GLuint, GLdouble*) pfglGetProgramLocalParameterdvARB;
10746 +alias void function(GLenum, GLuint, GLfloat*) pfglGetProgramLocalParameterfvARB;
10747 +alias void function(GLenum, GLenum, GLint*) pfglGetProgramivARB;
10748 +alias void function(GLenum, GLenum, GLvoid*) pfglGetProgramStringARB;
10749 +alias void function(GLuint, GLenum, GLdouble*) pfglGetVertexAttribdvARB;
10750 +alias void function(GLuint, GLenum, GLfloat*) pfglGetVertexAttribfvARB;
10751 +alias void function(GLuint, GLenum, GLint*) pfglGetVertexAttribivARB;
10752 +alias void function(GLuint, GLenum, GLvoid*) pfglGetVertexAttribPointervARB;
10753 +alias GLboolean function(GLuint) pfglIsProgramARB;
10754 +}
10756 pfglVertexAttrib1dARB glVertexAttrib1dARB;
10757 pfglVertexAttrib1dvARB glVertexAttrib1dvARB;
10758 Index: DerelictGL/derelict/opengl/extension/arb/point_parameters.d
10759 ===================================================================
10760 --- DerelictGL/derelict/opengl/extension/arb/point_parameters.d (revision 318)
10761 +++ DerelictGL/derelict/opengl/extension/arb/point_parameters.d (working copy)
10762 @@ -81,10 +81,9 @@
10763 GL_POINT_DISTANCE_ATTENUATION_ARB = 0x8129,
10764 }
10766 -extern(System):
10767 -
10768 -typedef void function(GLenum, GLfloat) pfglPointParameterfARB;
10769 -typedef void function(GLenum, GLfloat*) pfglPointParameterfvARB;
10770 -
10771 +extern(System) {
10772 +alias void function(GLenum, GLfloat) pfglPointParameterfARB;
10773 +alias void function(GLenum, GLfloat*) pfglPointParameterfvARB;
10774 +}
10775 pfglPointParameterfARB glPointParameterfARB;
10776 pfglPointParameterfvARB glPointParameterfvARB;
10777 Index: DerelictGL/derelict/opengl/extension/arb/vertex_blend.d
10778 ===================================================================
10779 --- DerelictGL/derelict/opengl/extension/arb/vertex_blend.d (revision 318)
10780 +++ DerelictGL/derelict/opengl/extension/arb/vertex_blend.d (working copy)
10781 @@ -135,19 +135,19 @@
10782 GL_MODELVIEW31_ARB = 0x873F,
10783 }
10785 -extern(System):
10786 +extern(System) {
10787 +alias void function(GLint, GLbyte*) pfglWeightbvARB;
10788 +alias void function(GLint, GLshort*) pfglWeightsvARB;
10789 +alias void function(GLint, GLint*) pfglWeightivARB;
10790 +alias void function(GLint, GLfloat*) pfglWeightfvARB;
10791 +alias void function(GLint, GLdouble*) pfglWeightdvARB;
10792 +alias void function(GLint, GLubyte*) pfglWeightubvARB;
10793 +alias void function(GLint, GLushort*) pfglWeightusvARB;
10794 +alias void function(GLint, GLuint*) pfglWeightuivARB;
10795 +alias void function(GLint, GLenum, GLsizei, GLvoid*) pfglWeightPointerARB;
10796 +alias void function(GLint) pfglVertexBlendARB;
10797 +}
10799 -typedef void function(GLint, GLbyte*) pfglWeightbvARB;
10800 -typedef void function(GLint, GLshort*) pfglWeightsvARB;
10801 -typedef void function(GLint, GLint*) pfglWeightivARB;
10802 -typedef void function(GLint, GLfloat*) pfglWeightfvARB;
10803 -typedef void function(GLint, GLdouble*) pfglWeightdvARB;
10804 -typedef void function(GLint, GLubyte*) pfglWeightubvARB;
10805 -typedef void function(GLint, GLushort*) pfglWeightusvARB;
10806 -typedef void function(GLint, GLuint*) pfglWeightuivARB;
10807 -typedef void function(GLint, GLenum, GLsizei, GLvoid*) pfglWeightPointerARB;
10808 -typedef void function(GLint) pfglVertexBlendARB;
10809 -
10810 pfglWeightbvARB glWeightbvARB;
10811 pfglWeightsvARB glWeightsvARB;
10812 pfglWeightivARB glWeightivARB;
10813 Index: DerelictGL/derelict/opengl/extension/arb/matrix_palette.d
10814 ===================================================================
10815 --- DerelictGL/derelict/opengl/extension/arb/matrix_palette.d (revision 318)
10816 +++ DerelictGL/derelict/opengl/extension/arb/matrix_palette.d (working copy)
10817 @@ -93,14 +93,13 @@
10818 GL_MATRIX_INDEX_ARRAY_POINTER_ARB = 0x8849,
10819 }
10821 -extern(System):
10822 -
10823 -typedef void function(GLint) pfglCurrentPaletteMatrixARB;
10824 -typedef void function(GLint, GLubyte*) pfglMatrixIndexubvARB;
10825 -typedef void function(GLint, GLushort*) pfglMatrixIndexusvARB;
10826 -typedef void function(GLint, GLuint*) pfglMatrixIndexuivARB;
10827 -typedef void function(GLint, GLenum, GLsizei, GLvoid*) pfglMatrixIndexPointerARB;
10828 -
10829 +extern(System) {
10830 +alias void function(GLint) pfglCurrentPaletteMatrixARB;
10831 +alias void function(GLint, GLubyte*) pfglMatrixIndexubvARB;
10832 +alias void function(GLint, GLushort*) pfglMatrixIndexusvARB;
10833 +alias void function(GLint, GLuint*) pfglMatrixIndexuivARB;
10834 +alias void function(GLint, GLenum, GLsizei, GLvoid*) pfglMatrixIndexPointerARB;
10835 +}
10836 pfglCurrentPaletteMatrixARB glCurrentPaletteMatrixARB;
10837 pfglMatrixIndexubvARB glMatrixIndexubvARB;
10838 pfglMatrixIndexusvARB glMatrixIndexusvARB;
10839 Index: DerelictGL/derelict/opengl/extension/arb/occlusion_query.d
10840 ===================================================================
10841 --- DerelictGL/derelict/opengl/extension/arb/occlusion_query.d (revision 318)
10842 +++ DerelictGL/derelict/opengl/extension/arb/occlusion_query.d (working copy)
10843 @@ -94,17 +94,17 @@
10844 GL_SAMPLES_PASSED_ARB = 0x8914,
10845 }
10847 -extern(System):
10848 +extern(System) {
10849 +alias void function(GLsizei, GLuint*) pfglGenQueriesARB;
10850 +alias void function(GLsizei, GLuint*) pfglDeleteQueriesARB;
10851 +alias GLboolean function(GLuint) pfglIsQueryARB;
10852 +alias void function(GLenum, GLuint) pfglBeginQueryARB;
10853 +alias void function(GLenum) pfglEndQueryARB;
10854 +alias void function(GLenum, GLenum, GLint*) pfglGetQueryivARB;
10855 +alias void function(GLuint, GLenum, GLint*) pfglGetQueryObjectivARB;
10856 +alias void function(GLuint, GLenum, GLuint*) pfglGetQueryObjectuivARB;
10857 +}
10859 -typedef void function(GLsizei, GLuint*) pfglGenQueriesARB;
10860 -typedef void function(GLsizei, GLuint*) pfglDeleteQueriesARB;
10861 -typedef GLboolean function(GLuint) pfglIsQueryARB;
10862 -typedef void function(GLenum, GLuint) pfglBeginQueryARB;
10863 -typedef void function(GLenum) pfglEndQueryARB;
10864 -typedef void function(GLenum, GLenum, GLint*) pfglGetQueryivARB;
10865 -typedef void function(GLuint, GLenum, GLint*) pfglGetQueryObjectivARB;
10866 -typedef void function(GLuint, GLenum, GLuint*) pfglGetQueryObjectuivARB;
10867 -
10868 pfglGenQueriesARB glGenQueriesARB;
10869 pfglDeleteQueriesARB glDeleteQueriesARB;
10870 pfglIsQueryARB glIsQueryARB;
10871 Index: DerelictGL/derelict/opengl/extension/arb/window_pos.d
10872 ===================================================================
10873 --- DerelictGL/derelict/opengl/extension/arb/window_pos.d (revision 318)
10874 +++ DerelictGL/derelict/opengl/extension/arb/window_pos.d (working copy)
10875 @@ -101,25 +101,25 @@
10876 }
10877 }
10879 -extern(System):
10880 +extern(System) {
10881 +alias void function(GLdouble, GLdouble) pfglWindowPos2dARB;
10882 +alias void function(GLdouble*) pfglWindowPos2dvARB;
10883 +alias void function(GLfloat, GLfloat) pfglWindowPos2fARB;
10884 +alias void function(GLfloat*) pfglWindowPos2fvARB;
10885 +alias void function(GLint, GLint) pfglWindowPost2iARB;
10886 +alias void function(GLint*) pfglWindowPos2ivARB;
10887 +alias void function(GLshort, GLshort) pfglWindowPos2sARB;
10888 +alias void function(GLshort*) pfglWindowPos2svARB;
10889 +alias void function(GLdouble, GLdouble, GLdouble) pfglWindowPos3dARB;
10890 +alias void function(GLdouble*) pfglWindowPos3dvARB;
10891 +alias void function(GLfloat, GLfloat, GLfloat) pfglWindowPos3fARB;
10892 +alias void function(GLfloat*) pfglWindowPos3fvARB;
10893 +alias void function(GLint, GLint, GLint) pfglWindowPos3iARB;
10894 +alias void function(GLint*) pfglWindowPos3ivARB;
10895 +alias void function(GLshort, GLshort, GLshort) pfglWindowPos3sARB;
10896 +alias void function(GLshort*) pfglWindowPos3svARB;
10897 +}
10899 -typedef void function(GLdouble, GLdouble) pfglWindowPos2dARB;
10900 -typedef void function(GLdouble*) pfglWindowPos2dvARB;
10901 -typedef void function(GLfloat, GLfloat) pfglWindowPos2fARB;
10902 -typedef void function(GLfloat*) pfglWindowPos2fvARB;
10903 -typedef void function(GLint, GLint) pfglWindowPost2iARB;
10904 -typedef void function(GLint*) pfglWindowPos2ivARB;
10905 -typedef void function(GLshort, GLshort) pfglWindowPos2sARB;
10906 -typedef void function(GLshort*) pfglWindowPos2svARB;
10907 -typedef void function(GLdouble, GLdouble, GLdouble) pfglWindowPos3dARB;
10908 -typedef void function(GLdouble*) pfglWindowPos3dvARB;
10909 -typedef void function(GLfloat, GLfloat, GLfloat) pfglWindowPos3fARB;
10910 -typedef void function(GLfloat*) pfglWindowPos3fvARB;
10911 -typedef void function(GLint, GLint, GLint) pfglWindowPos3iARB;
10912 -typedef void function(GLint*) pfglWindowPos3ivARB;
10913 -typedef void function(GLshort, GLshort, GLshort) pfglWindowPos3sARB;
10914 -typedef void function(GLshort*) pfglWindowPos3svARB;
10915 -
10916 pfglWindowPos2dARB glWindowPos2dARB;
10917 pfglWindowPos2dvARB glWindowPos2dvARB;
10918 pfglWindowPos2fARB glWindowPos2fARB;
10919 @@ -135,4 +135,4 @@
10920 pfglWindowPos3iARB glWindowPos3iARB;
10921 pfglWindowPos3ivARB glWindowPos3ivARB;
10922 pfglWindowPos3sARB glWindowPos3sARB;
10923 -pfglWindowPos3svARB glWindowPos3svARB;
10924 \ No newline at end of file
10925 +pfglWindowPos3svARB glWindowPos3svARB;
10926 Index: DerelictGL/derelict/opengl/extension/arb/multisample.d
10927 ===================================================================
10928 --- DerelictGL/derelict/opengl/extension/arb/multisample.d (revision 318)
10929 +++ DerelictGL/derelict/opengl/extension/arb/multisample.d (working copy)
10930 @@ -84,8 +84,7 @@
10931 GL_MULTISAMPLE_BIT_ARB = 0x20000000,
10932 }
10934 -extern(System):
10935 -
10936 -typedef void function(GLclampf, GLboolean) pfglSampleCoverageARB;
10937 -
10938 +extern(System) {
10939 +alias void function(GLclampf, GLboolean) pfglSampleCoverageARB;
10940 +}
10941 pfglSampleCoverageARB glSampleCoverageARB;
10942 Index: DerelictGL/derelict/opengl/extension/arb/transpose_matrix.d
10943 ===================================================================
10944 --- DerelictGL/derelict/opengl/extension/arb/transpose_matrix.d (revision 318)
10945 +++ DerelictGL/derelict/opengl/extension/arb/transpose_matrix.d (working copy)
10946 @@ -85,13 +85,13 @@
10947 GL_TRANSPOSE_COLOR_MATRIX_ARB = 0x84E6,
10948 }
10950 -extern(System):
10951 +extern(System) {
10952 +alias void function(GLfloat*) pfglLoadTransposeMatrixfARB;
10953 +alias void function(GLdouble*) pfglLoadTransposeMatrixdARB;
10954 +alias void function(GLfloat*) pfglMultTransposeMatrixfARB;
10955 +alias void function(GLdouble*) pfglMultTransposeMatrixdARB;
10956 +}
10958 -typedef void function(GLfloat*) pfglLoadTransposeMatrixfARB;
10959 -typedef void function(GLdouble*) pfglLoadTransposeMatrixdARB;
10960 -typedef void function(GLfloat*) pfglMultTransposeMatrixfARB;
10961 -typedef void function(GLdouble*) pfglMultTransposeMatrixdARB;
10962 -
10963 pfglLoadTransposeMatrixfARB glLoadTransposeMatrixfARB;
10964 pfglLoadTransposeMatrixdARB glLoadTransposeMatrixdARB;
10965 pfglMultTransposeMatrixfARB glMultTransposeMatrixfARB;
10966 Index: DerelictGL/derelict/opengl/extension/arb/draw_buffers.d
10967 ===================================================================
10968 --- DerelictGL/derelict/opengl/extension/arb/draw_buffers.d (revision 318)
10969 +++ DerelictGL/derelict/opengl/extension/arb/draw_buffers.d (working copy)
10970 @@ -92,8 +92,7 @@
10971 GL_DRAW_BUFFER15_ARB = 0x8834,
10972 }
10974 -extern(System):
10975 -
10976 -typedef void function(GLsizei, GLenum*) pfglDrawBuffersARB;
10977 -
10978 +extern(System) {
10979 +alias void function(GLsizei, GLenum*) pfglDrawBuffersARB;
10980 +}
10981 pfglDrawBuffersARB glDrawBuffersARB;
10982 Index: DerelictGL/derelict/opengl/extension/arb/multitexture.d
10983 ===================================================================
10984 --- DerelictGL/derelict/opengl/extension/arb/multitexture.d (revision 318)
10985 +++ DerelictGL/derelict/opengl/extension/arb/multitexture.d (working copy)
10986 @@ -177,43 +177,43 @@
10987 GL_MAX_TEXTURE_UNITS_ARB = 0x84E2,
10988 }
10990 -extern(System):
10991 +extern(System) {
10992 +alias void function(GLenum) pfglActiveTextureARB;
10993 +alias void function(GLenum) pfglClientActiveTextureARB;
10994 +alias void function(GLenum, GLdouble) pfglMultiTexCoord1dARB;
10995 +alias void function(GLenum, GLdouble*) pfglMultiTexCoord1dvARB;
10996 +alias void function(GLenum, GLfloat) pfglMultiTexCoord1fARB;
10997 +alias void function(GLenum, GLfloat*) pfglMultiTexCoord1fvARB;
10998 +alias void function(GLenum, GLint) pfglMultiTexCoord1iARB;
10999 +alias void function(GLenum, GLint*) pfglMultiTexCoord1ivARB;
11000 +alias void function(GLenum, GLshort) pfglMultiTexCoord1sARB;
11001 +alias void function(GLenum, GLshort*) pfglMultiTexCoord1svARB;
11002 +alias void function(GLenum, GLdouble, GLdouble) pfglMultiTexCoord2dARB;
11003 +alias void function(GLenum, GLdouble*) pfglMultiTexCoord2dvARB;
11004 +alias void function(GLenum, GLfloat, GLfloat) pfglMultiTexCoord2fARB;
11005 +alias void function(GLenum, GLfloat*) pfglMultiTexCoord2fvARB;
11006 +alias void function(GLenum, GLint, GLint) pfglMultiTexCoord2iARB;
11007 +alias void function(GLenum, GLint*) pfglMultiTexCoord2ivARB;
11008 +alias void function(GLenum, GLshort, GLshort) pfglMultiTexCoord2sARB;
11009 +alias void function(GLenum, GLshort*) pfglMultiTexCoord2svARB;
11010 +alias void function(GLenum, GLdouble, GLdouble, GLdouble) pfglMultiTexCoord3dARB;
11011 +alias void function(GLenum, GLdouble*) pfglMultiTexCoord3dvARB;
11012 +alias void function(GLenum, GLfloat, GLfloat, GLfloat) pfglMultiTexCoord3fARB;
11013 +alias void function(GLenum, GLfloat*) pfglMultiTexCoord3fvARB;
11014 +alias void function(GLenum, GLint, GLint, GLint) pfglMultiTexCoord3iARB;
11015 +alias void function(GLenum, GLint*) pfglMultiTexCoord3ivARB;
11016 +alias void function(GLenum, GLshort, GLshort, GLshort) pfglMultiTexCoord3sARB;
11017 +alias void function(GLenum, GLshort*) pfglMultiTexCoord3svARB;
11018 +alias void function(GLenum, GLdouble, GLdouble, GLdouble, GLdouble) pfglMultiTexCoord4dARB;
11019 +alias void function(GLenum, GLdouble*) pfglMultiTexCoord4dvARB;
11020 +alias void function(GLenum, GLfloat, GLfloat, GLfloat, GLfloat) pfglMultiTexCoord4fARB;
11021 +alias void function(GLenum, GLfloat*) pfglMultiTexCoord4fvARB;
11022 +alias void function(GLenum, GLint, GLint, GLint, GLint) pfglMultiTexCoord4iARB;
11023 +alias void function(GLenum, GLint*) pfglMultiTexCoord4ivARB;
11024 +alias void function(GLenum, GLshort, GLshort, GLshort, GLshort) pfglMultiTexCoord4sARB;
11025 +alias void function(GLenum, GLshort*) pfglMultiTexCoord4svARB;
11026 +}
11028 -typedef void function(GLenum) pfglActiveTextureARB;
11029 -typedef void function(GLenum) pfglClientActiveTextureARB;
11030 -typedef void function(GLenum, GLdouble) pfglMultiTexCoord1dARB;
11031 -typedef void function(GLenum, GLdouble*) pfglMultiTexCoord1dvARB;
11032 -typedef void function(GLenum, GLfloat) pfglMultiTexCoord1fARB;
11033 -typedef void function(GLenum, GLfloat*) pfglMultiTexCoord1fvARB;
11034 -typedef void function(GLenum, GLint) pfglMultiTexCoord1iARB;
11035 -typedef void function(GLenum, GLint*) pfglMultiTexCoord1ivARB;
11036 -typedef void function(GLenum, GLshort) pfglMultiTexCoord1sARB;
11037 -typedef void function(GLenum, GLshort*) pfglMultiTexCoord1svARB;
11038 -typedef void function(GLenum, GLdouble, GLdouble) pfglMultiTexCoord2dARB;
11039 -typedef void function(GLenum, GLdouble*) pfglMultiTexCoord2dvARB;
11040 -typedef void function(GLenum, GLfloat, GLfloat) pfglMultiTexCoord2fARB;
11041 -typedef void function(GLenum, GLfloat*) pfglMultiTexCoord2fvARB;
11042 -typedef void function(GLenum, GLint, GLint) pfglMultiTexCoord2iARB;
11043 -typedef void function(GLenum, GLint*) pfglMultiTexCoord2ivARB;
11044 -typedef void function(GLenum, GLshort, GLshort) pfglMultiTexCoord2sARB;
11045 -typedef void function(GLenum, GLshort*) pfglMultiTexCoord2svARB;
11046 -typedef void function(GLenum, GLdouble, GLdouble, GLdouble) pfglMultiTexCoord3dARB;
11047 -typedef void function(GLenum, GLdouble*) pfglMultiTexCoord3dvARB;
11048 -typedef void function(GLenum, GLfloat, GLfloat, GLfloat) pfglMultiTexCoord3fARB;
11049 -typedef void function(GLenum, GLfloat*) pfglMultiTexCoord3fvARB;
11050 -typedef void function(GLenum, GLint, GLint, GLint) pfglMultiTexCoord3iARB;
11051 -typedef void function(GLenum, GLint*) pfglMultiTexCoord3ivARB;
11052 -typedef void function(GLenum, GLshort, GLshort, GLshort) pfglMultiTexCoord3sARB;
11053 -typedef void function(GLenum, GLshort*) pfglMultiTexCoord3svARB;
11054 -typedef void function(GLenum, GLdouble, GLdouble, GLdouble, GLdouble) pfglMultiTexCoord4dARB;
11055 -typedef void function(GLenum, GLdouble*) pfglMultiTexCoord4dvARB;
11056 -typedef void function(GLenum, GLfloat, GLfloat, GLfloat, GLfloat) pfglMultiTexCoord4fARB;
11057 -typedef void function(GLenum, GLfloat*) pfglMultiTexCoord4fvARB;
11058 -typedef void function(GLenum, GLint, GLint, GLint, GLint) pfglMultiTexCoord4iARB;
11059 -typedef void function(GLenum, GLint*) pfglMultiTexCoord4ivARB;
11060 -typedef void function(GLenum, GLshort, GLshort, GLshort, GLshort) pfglMultiTexCoord4sARB;
11061 -typedef void function(GLenum, GLshort*) pfglMultiTexCoord4svARB;
11062 -
11063 pfglActiveTextureARB glActiveTextureARB;
11064 pfglClientActiveTextureARB glClientActiveTextureARB;
11065 pfglMultiTexCoord1dARB glMultiTexCoord1dARB;
11066 Index: DerelictGL/derelict/opengl/extension/arb/shader_objects.d
11067 ===================================================================
11068 --- DerelictGL/derelict/opengl/extension/arb/shader_objects.d (revision 318)
11069 +++ DerelictGL/derelict/opengl/extension/arb/shader_objects.d (working copy)
11070 @@ -188,48 +188,48 @@
11071 alias char GLcharARB;
11072 alias uint GLhandleARB;
11074 -extern(System):
11075 +extern(System) {
11076 +alias void function(GLhandleARB) pfglDeleteObjectARB;
11077 +alias GLhandleARB function(GLenum) pfglGetHandleARB;
11078 +alias void function(GLhandleARB, GLhandleARB) pfglDetachObjectARB;
11079 +alias GLhandleARB function(GLenum) pfglCreateShaderObjectARB;
11080 +alias void function(GLhandleARB, GLsizei, GLcharARB**, GLint*) pfglShaderSourceARB;
11081 +alias void function(GLhandleARB) pfglCompileShaderARB;
11082 +alias GLhandleARB function() pfglCreateProgramObjectARB;
11083 +alias void function(GLhandleARB, GLhandleARB) pfglAttachObjectARB;
11084 +alias void function(GLhandleARB) pfglLinkProgramARB;
11085 +alias void function(GLhandleARB) pfglUseProgramObjectARB;
11086 +alias void function(GLhandleARB) pfglValidateProgramARB;
11087 +alias void function(GLint, GLfloat) pfglUniform1fARB;
11088 +alias void function(GLint, GLfloat, GLfloat) pfglUniform2fARB;
11089 +alias void function(GLint, GLfloat, GLfloat, GLfloat) pfglUniform3fARB;
11090 +alias void function(GLint, GLfloat, GLfloat, GLfloat, GLfloat) pfglUniform4fARB;
11091 +alias void function(GLint, GLint) pfglUniform1iARB;
11092 +alias void function(GLint, GLint, GLint) pfglUniform2iARB;
11093 +alias void function(GLint, GLint, GLint, GLint) pfglUniform3iARB;
11094 +alias void function(GLint, GLint, GLint, GLint, GLint) pfglUniform4iARB;
11095 +alias void function(GLint, GLsizei, GLfloat*) pfglUniform1fvARB;
11096 +alias void function(GLint, GLsizei, GLfloat*) pfglUniform2fvARB;
11097 +alias void function(GLint, GLsizei, GLfloat*) pfglUniform3fvARB;
11098 +alias void function(GLint, GLsizei, GLfloat*) pfglUniform4fvARB;
11099 +alias void function(GLint, GLsizei, GLint*) pfglUniform1ivARB;
11100 +alias void function(GLint, GLsizei, GLint*) pfglUniform2ivARB;
11101 +alias void function(GLint, GLsizei, GLint*) pfglUniform3ivARB;
11102 +alias void function(GLint, GLsizei, GLint*) pfglUniform4ivARB;
11103 +alias void function(GLint, GLsizei, GLboolean, GLfloat*) pfglUniformMatrix2fvARB;
11104 +alias void function(GLint, GLsizei, GLboolean, GLfloat*) pfglUniformMatrix3fvARB;
11105 +alias void function(GLint, GLsizei, GLboolean, GLfloat*) pfglUniformMatrix4fvARB;
11106 +alias void function(GLhandleARB, GLenum, GLfloat*) pfglGetObjectParameterfvARB;
11107 +alias void function(GLhandleARB, GLenum, GLint*) pfglGetObjectParameterivARB;
11108 +alias void function(GLhandleARB, GLsizei, GLsizei*, GLcharARB*) pfglGetInfoLogARB;
11109 +alias void function(GLhandleARB, GLsizei, GLsizei*, GLhandleARB*) pfglGetAttachedObjectsARB;
11110 +alias GLint function(GLhandleARB, GLcharARB*) pfglGetUniformLocationARB;
11111 +alias void function(GLhandleARB, GLuint, GLsizei, GLsizei*, GLint*, GLenum*, GLcharARB*) pfglGetActiveUniformARB;
11112 +alias void function(GLhandleARB, GLint, GLfloat*) pfglGetUniformfvARB;
11113 +alias void function(GLhandleARB, GLint, GLint*) pfglGetUniformivARB;
11114 +alias void function(GLhandleARB, GLsizei, GLsizei*, GLcharARB*) pfglGetShaderSourceARB;
11115 +}
11117 -typedef void function(GLhandleARB) pfglDeleteObjectARB;
11118 -typedef GLhandleARB function(GLenum) pfglGetHandleARB;
11119 -typedef void function(GLhandleARB, GLhandleARB) pfglDetachObjectARB;
11120 -typedef GLhandleARB function(GLenum) pfglCreateShaderObjectARB;
11121 -typedef void function(GLhandleARB, GLsizei, GLcharARB**, GLint*) pfglShaderSourceARB;
11122 -typedef void function(GLhandleARB) pfglCompileShaderARB;
11123 -typedef GLhandleARB function() pfglCreateProgramObjectARB;
11124 -typedef void function(GLhandleARB, GLhandleARB) pfglAttachObjectARB;
11125 -typedef void function(GLhandleARB) pfglLinkProgramARB;
11126 -typedef void function(GLhandleARB) pfglUseProgramObjectARB;
11127 -typedef void function(GLhandleARB) pfglValidateProgramARB;
11128 -typedef void function(GLint, GLfloat) pfglUniform1fARB;
11129 -typedef void function(GLint, GLfloat, GLfloat) pfglUniform2fARB;
11130 -typedef void function(GLint, GLfloat, GLfloat, GLfloat) pfglUniform3fARB;
11131 -typedef void function(GLint, GLfloat, GLfloat, GLfloat, GLfloat) pfglUniform4fARB;
11132 -typedef void function(GLint, GLint) pfglUniform1iARB;
11133 -typedef void function(GLint, GLint, GLint) pfglUniform2iARB;
11134 -typedef void function(GLint, GLint, GLint, GLint) pfglUniform3iARB;
11135 -typedef void function(GLint, GLint, GLint, GLint, GLint) pfglUniform4iARB;
11136 -typedef void function(GLint, GLsizei, GLfloat*) pfglUniform1fvARB;
11137 -typedef void function(GLint, GLsizei, GLfloat*) pfglUniform2fvARB;
11138 -typedef void function(GLint, GLsizei, GLfloat*) pfglUniform3fvARB;
11139 -typedef void function(GLint, GLsizei, GLfloat*) pfglUniform4fvARB;
11140 -typedef void function(GLint, GLsizei, GLint*) pfglUniform1ivARB;
11141 -typedef void function(GLint, GLsizei, GLint*) pfglUniform2ivARB;
11142 -typedef void function(GLint, GLsizei, GLint*) pfglUniform3ivARB;
11143 -typedef void function(GLint, GLsizei, GLint*) pfglUniform4ivARB;
11144 -typedef void function(GLint, GLsizei, GLboolean, GLfloat*) pfglUniformMatrix2fvARB;
11145 -typedef void function(GLint, GLsizei, GLboolean, GLfloat*) pfglUniformMatrix3fvARB;
11146 -typedef void function(GLint, GLsizei, GLboolean, GLfloat*) pfglUniformMatrix4fvARB;
11147 -typedef void function(GLhandleARB, GLenum, GLfloat*) pfglGetObjectParameterfvARB;
11148 -typedef void function(GLhandleARB, GLenum, GLint*) pfglGetObjectParameterivARB;
11149 -typedef void function(GLhandleARB, GLsizei, GLsizei*, GLcharARB*) pfglGetInfoLogARB;
11150 -typedef void function(GLhandleARB, GLsizei, GLsizei*, GLhandleARB*) pfglGetAttachedObjectsARB;
11151 -typedef GLint function(GLhandleARB, GLcharARB*) pfglGetUniformLocationARB;
11152 -typedef void function(GLhandleARB, GLuint, GLsizei, GLsizei*, GLint*, GLenum*, GLcharARB*) pfglGetActiveUniformARB;
11153 -typedef void function(GLhandleARB, GLint, GLfloat*) pfglGetUniformfvARB;
11154 -typedef void function(GLhandleARB, GLint, GLint*) pfglGetUniformivARB;
11155 -typedef void function(GLhandleARB, GLsizei, GLsizei*, GLcharARB*) pfglGetShaderSourceARB;
11156 -
11157 pfglDeleteObjectARB glDeleteObjectARB;
11158 pfglGetHandleARB glGetHandleARB;
11159 pfglDetachObjectARB glDetachObjectARB;
11160 Index: DerelictGL/derelict/opengl/extension/arb/texture_compression.d
11161 ===================================================================
11162 --- DerelictGL/derelict/opengl/extension/arb/texture_compression.d (revision 318)
11163 +++ DerelictGL/derelict/opengl/extension/arb/texture_compression.d (working copy)
11164 @@ -98,16 +98,16 @@
11165 GL_COMPRESSED_TEXTURE_FORMATS_ARB = 0x86A3,
11166 }
11168 -extern(System):
11169 +extern(System) {
11170 +alias void function(GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLsizei, GLvoid*) pfglCompressedTexImage3DARB;
11171 +alias void function(GLenum, GLint, GLenum, GLsizei, GLsizei, GLint, GLsizei, GLvoid*) pfglCompressedTexImage2DARB;
11172 +alias void function(GLenum, GLint, GLenum, GLsizei, GLint, GLsizei, GLvoid*) pfglCompressedTexImage1DARB;
11173 +alias void function(GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLsizei, GLvoid*) pfglCompressedTexSubImage3DARB;
11174 +alias void function(GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLsizei, GLvoid*) pfglCompressedTexSubImage2DARB;
11175 +alias void function(GLenum, GLint, GLint, GLsizei, GLenum, GLsizei, GLvoid*) pfglCompressedTexSubImage1DARB;
11176 +alias void function(GLenum, GLint, GLvoid*) pfglGetCompressedTexImageARB;
11177 +}
11179 -typedef void function(GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLsizei, GLvoid*) pfglCompressedTexImage3DARB;
11180 -typedef void function(GLenum, GLint, GLenum, GLsizei, GLsizei, GLint, GLsizei, GLvoid*) pfglCompressedTexImage2DARB;
11181 -typedef void function(GLenum, GLint, GLenum, GLsizei, GLint, GLsizei, GLvoid*) pfglCompressedTexImage1DARB;
11182 -typedef void function(GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLsizei, GLvoid*) pfglCompressedTexSubImage3DARB;
11183 -typedef void function(GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLsizei, GLvoid*) pfglCompressedTexSubImage2DARB;
11184 -typedef void function(GLenum, GLint, GLint, GLsizei, GLenum, GLsizei, GLvoid*) pfglCompressedTexSubImage1DARB;
11185 -typedef void function(GLenum, GLint, GLvoid*) pfglGetCompressedTexImageARB;
11186 -
11187 pfglCompressedTexImage3DARB glCompressedTexImage3DARB;
11188 pfglCompressedTexImage2DARB glCompressedTexImage2DARB;
11189 pfglCompressedTexImage1DARB glCompressedTexImage1DARB;
11190 Index: DerelictGL/derelict/opengl/extension/arb/vertex_buffer_object.d
11191 ===================================================================
11192 --- DerelictGL/derelict/opengl/extension/arb/vertex_buffer_object.d (revision 318)
11193 +++ DerelictGL/derelict/opengl/extension/arb/vertex_buffer_object.d (working copy)
11194 @@ -129,20 +129,20 @@
11195 GL_DYNAMIC_COPY_ARB = 0x88EA,
11196 }
11198 -extern(System):
11199 +extern(System) {
11200 +alias void function(GLenum, GLuint) pfglBindBufferARB;
11201 +alias void function(GLsizei, GLuint*) pfglDeleteBuffersARB;
11202 +alias void function(GLsizei, GLuint*) pfglGenBuffersARB;
11203 +alias GLboolean function(GLuint) pfglIsBufferARB;
11204 +alias void function(GLenum, GLsizeiptrARB, GLvoid*, GLenum) pfglBufferDataARB;
11205 +alias void function(GLenum, GLintptrARB, GLsizeiptrARB, GLvoid*) pfglBufferSubDataARB;
11206 +alias void function(GLenum, GLintptrARB, GLsizeiptrARB, GLvoid*) pfglGetBufferSubDataARB;
11207 +alias GLvoid* function(GLenum, GLenum) pfglMapBufferARB;
11208 +alias GLboolean function(GLenum) pfglUnmapBufferARB;
11209 +alias void function(GLenum, GLenum, GLint*) pfglGetBufferParameterivARB;
11210 +alias void function(GLenum, GLenum, GLvoid*) pfglGetBufferPointervARB;
11211 +}
11213 -typedef void function(GLenum, GLuint) pfglBindBufferARB;
11214 -typedef void function(GLsizei, GLuint*) pfglDeleteBuffersARB;
11215 -typedef void function(GLsizei, GLuint*) pfglGenBuffersARB;
11216 -typedef GLboolean function(GLuint) pfglIsBufferARB;
11217 -typedef void function(GLenum, GLsizeiptrARB, GLvoid*, GLenum) pfglBufferDataARB;
11218 -typedef void function(GLenum, GLintptrARB, GLsizeiptrARB, GLvoid*) pfglBufferSubDataARB;
11219 -typedef void function(GLenum, GLintptrARB, GLsizeiptrARB, GLvoid*) pfglGetBufferSubDataARB;
11220 -typedef GLvoid* function(GLenum, GLenum) pfglMapBufferARB;
11221 -typedef GLboolean function(GLenum) pfglUnmapBufferARB;
11222 -typedef void function(GLenum, GLenum, GLint*) pfglGetBufferParameterivARB;
11223 -typedef void function(GLenum, GLenum, GLvoid*) pfglGetBufferPointervARB;
11224 -
11225 pfglBindBufferARB glBindBufferARB;
11226 pfglDeleteBuffersARB glDeleteBuffersARB;
11227 pfglGenBuffersARB glGenBuffersARB;
11228 Index: DerelictGL/derelict/opengl/extension/arb/color_buffer_float.d
11229 ===================================================================
11230 --- DerelictGL/derelict/opengl/extension/arb/color_buffer_float.d (revision 318)
11231 +++ DerelictGL/derelict/opengl/extension/arb/color_buffer_float.d (working copy)
11232 @@ -80,8 +80,7 @@
11233 GL_FIXED_ONLY_COLOR_ARB = 0x891D,
11234 }
11236 -extern(System):
11237 -
11238 -typedef void function(GLenum,GLenum) pfglClampColorARB;
11239 -
11240 +extern(System) {
11241 +alias void function(GLenum,GLenum) pfglClampColorARB;
11242 +}
11243 pfglClampColorARB glClampColorARB;
11244 Index: DerelictGL/derelict/opengl/extension/loader.d
11245 ===================================================================
11246 --- DerelictGL/derelict/opengl/extension/loader.d (revision 318)
11247 +++ DerelictGL/derelict/opengl/extension/loader.d (working copy)
11248 @@ -29,8 +29,8 @@
11249 * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
11250 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
11251 */
11252 -module derelict.opengl.extension.loader;
11253 -
11254 +module derelict.opengl.extension.loader;
11255 +
11256 private
11257 {
11258 version(Windows)
11259 @@ -45,20 +45,20 @@
11260 import derelict.util.exception;
11261 import derelict.opengl.glfuncs;
11262 }
11263 -
11264 +
11265 version(UsingGLX)
11266 {
11267 import derelict.opengl.glx;
11268 }
11270 import derelict.util.wrapper;
11271 -}
11272 +}
11274 bool glBindExtFunc(void **ptr, char[] funcName)
11275 {
11276 version(Windows)
11277 *ptr = wglGetProcAddress(toCString(funcName));
11278 - else version(UsingGLX)
11279 + else version(UsingGLX)
11280 *ptr = glXGetProcAddress(toCString(funcName));
11281 else version(darwin)
11282 {
11283 @@ -72,5 +72,4 @@
11284 }
11285 }
11286 return (*ptr !is null);
11287 -}
11288 -
11289 +}
11290 Index: DerelictGL/derelict/opengl/extension/ati/vertex_array_object.d
11291 ===================================================================
11292 --- DerelictGL/derelict/opengl/extension/ati/vertex_array_object.d (revision 318)
11293 +++ DerelictGL/derelict/opengl/extension/ati/vertex_array_object.d (working copy)
11294 @@ -106,21 +106,20 @@
11295 GL_ARRAY_OBJECT_OFFSET_ATI = 0x8767,
11296 }
11298 -extern(System):
11299 -
11300 -typedef GLuint function(GLsizei, GLvoid *, GLenum) pfglNewObjectBufferATI;
11301 -typedef GLboolean function(GLuint) pfglIsObjectBufferATI;
11302 -typedef void function(GLuint, GLuint, GLsizei, GLvoid *, GLenum) pfglUpdateObjectBufferATI;
11303 -typedef void function(GLuint, GLenum, GLfloat *) pfglGetObjectBufferfvATI;
11304 -typedef void function(GLuint, GLenum, GLint *) pfglGetObjectBufferivATI;
11305 -typedef void function(GLuint) pfglFreeObjectBufferATI;
11306 -typedef void function(GLenum, GLint, GLenum, GLsizei, GLuint, GLuint) pfglArrayObjectATI;
11307 -typedef void function(GLenum, GLenum, GLfloat *) pfglGetArrayObjectfvATI;
11308 -typedef void function(GLenum, GLenum, GLint *) pfglGetArrayObjectivATI;
11309 -typedef void function(GLuint, GLenum, GLsizei, GLuint, GLuint) pfglVariantArrayObjectATI;
11310 -typedef void function(GLuint, GLenum, GLfloat *) pfglGetVariantArrayObjectfvATI;
11311 -typedef void function(GLuint, GLenum, GLint *) pfglGetVariantArrayObjectivATI;
11312 -
11313 +extern(System) {
11314 +alias GLuint function(GLsizei, GLvoid *, GLenum) pfglNewObjectBufferATI;
11315 +alias GLboolean function(GLuint) pfglIsObjectBufferATI;
11316 +alias void function(GLuint, GLuint, GLsizei, GLvoid *, GLenum) pfglUpdateObjectBufferATI;
11317 +alias void function(GLuint, GLenum, GLfloat *) pfglGetObjectBufferfvATI;
11318 +alias void function(GLuint, GLenum, GLint *) pfglGetObjectBufferivATI;
11319 +alias void function(GLuint) pfglFreeObjectBufferATI;
11320 +alias void function(GLenum, GLint, GLenum, GLsizei, GLuint, GLuint) pfglArrayObjectATI;
11321 +alias void function(GLenum, GLenum, GLfloat *) pfglGetArrayObjectfvATI;
11322 +alias void function(GLenum, GLenum, GLint *) pfglGetArrayObjectivATI;
11323 +alias void function(GLuint, GLenum, GLsizei, GLuint, GLuint) pfglVariantArrayObjectATI;
11324 +alias void function(GLuint, GLenum, GLfloat *) pfglGetVariantArrayObjectfvATI;
11325 +alias void function(GLuint, GLenum, GLint *) pfglGetVariantArrayObjectivATI;
11326 +}
11327 pfglNewObjectBufferATI glNewObjectBufferATI;
11328 pfglIsObjectBufferATI glIsObjectBufferATI;
11329 pfglUpdateObjectBufferATI glUpdateObjectBufferATI;
11330 Index: DerelictGL/derelict/opengl/extension/ati/vertex_attrib_array_object.d
11331 ===================================================================
11332 --- DerelictGL/derelict/opengl/extension/ati/vertex_attrib_array_object.d (revision 318)
11333 +++ DerelictGL/derelict/opengl/extension/ati/vertex_attrib_array_object.d (working copy)
11334 @@ -76,12 +76,11 @@
11335 }
11336 }
11338 -extern(System):
11339 -
11340 -typedef void function(GLuint, GLint, GLenum, GLboolean, GLsizei, GLuint, GLuint) pfglVertexAttribArrayObjectATI;
11341 -typedef void function(GLuint, GLenum, GLfloat *) pfglGetVertexAttribArrayObjectfvATI;
11342 -typedef void function(GLuint, GLenum, GLint *) pfglGetVertexAttribArrayObjectivATI;
11343 -
11344 +extern(System) {
11345 +alias void function(GLuint, GLint, GLenum, GLboolean, GLsizei, GLuint, GLuint) pfglVertexAttribArrayObjectATI;
11346 +alias void function(GLuint, GLenum, GLfloat *) pfglGetVertexAttribArrayObjectfvATI;
11347 +alias void function(GLuint, GLenum, GLint *) pfglGetVertexAttribArrayObjectivATI;
11348 +}
11349 pfglVertexAttribArrayObjectATI glVertexAttribArrayObjectATI;
11350 pfglGetVertexAttribArrayObjectfvATI glGetVertexAttribArrayObjectfvATI;
11351 pfglGetVertexAttribArrayObjectivATI glGetVertexAttribArrayObjectivATI;
11352 Index: DerelictGL/derelict/opengl/extension/ati/envmap_bumpmap.d
11353 ===================================================================
11354 --- DerelictGL/derelict/opengl/extension/ati/envmap_bumpmap.d (revision 318)
11355 +++ DerelictGL/derelict/opengl/extension/ati/envmap_bumpmap.d (working copy)
11356 @@ -90,13 +90,12 @@
11357 GL_BUMP_TARGET_ATI = 0x877C,
11358 }
11360 -extern(System):
11361 -
11362 -typedef void function(GLenum, GLint *) pfglTexBumpParameterivATI;
11363 -typedef void function(GLenum, GLfloat *) pfglTexBumpParameterfvATI;
11364 -typedef void function(GLenum, GLint *) pfglGetTexBumpParameterivATI;
11365 -typedef void function(GLenum, GLfloat *) pfglGetTexBumpParameterfvATI;
11366 -
11367 +extern(System) {
11368 +alias void function(GLenum, GLint *) pfglTexBumpParameterivATI;
11369 +alias void function(GLenum, GLfloat *) pfglTexBumpParameterfvATI;
11370 +alias void function(GLenum, GLint *) pfglGetTexBumpParameterivATI;
11371 +alias void function(GLenum, GLfloat *) pfglGetTexBumpParameterfvATI;
11372 +}
11373 pfglTexBumpParameterivATI glTexBumpParameterivATI;
11374 pfglTexBumpParameterfvATI glTexBumpParameterfvATI;
11375 pfglGetTexBumpParameterivATI glGetTexBumpParameterivATI;
11376 Index: DerelictGL/derelict/opengl/extension/ati/draw_buffers.d
11377 ===================================================================
11378 --- DerelictGL/derelict/opengl/extension/ati/draw_buffers.d (revision 318)
11379 +++ DerelictGL/derelict/opengl/extension/ati/draw_buffers.d (working copy)
11380 @@ -93,9 +93,8 @@
11381 GL_DRAW_BUFFER15_ATI = 0x8834,
11382 }
11384 -extern(System):
11385 -
11386 -typedef void function(GLsizei, GLenum *) pfglDrawBuffersATI;
11387 -
11388 +extern(System) {
11389 +alias void function(GLsizei, GLenum *) pfglDrawBuffersATI;
11390 +}
11391 pfglDrawBuffersATI glDrawBuffersATI;
11393 Index: DerelictGL/derelict/opengl/extension/ati/vertex_streams.d
11394 ===================================================================
11395 --- DerelictGL/derelict/opengl/extension/ati/vertex_streams.d (revision 318)
11396 +++ DerelictGL/derelict/opengl/extension/ati/vertex_streams.d (working copy)
11397 @@ -174,59 +174,58 @@
11398 GL_VERTEX_SOURCE_ATI = 0x8774,
11399 }
11401 -extern(System):
11402 +extern(System) {
11403 +alias void function(GLenum, GLshort) pfglVertexStream1sATI;
11404 +alias void function(GLenum, GLshort *) pfglVertexStream1svATI;
11405 +alias void function(GLenum, GLint) pfglVertexStream1iATI;
11406 +alias void function(GLenum, GLint *) pfglVertexStream1ivATI;
11407 +alias void function(GLenum, GLfloat) pfglVertexStream1fATI;
11408 +alias void function(GLenum, GLfloat *) pfglVertexStream1fvATI;
11409 +alias void function(GLenum, GLdouble) pfglVertexStream1dATI;
11410 +alias void function(GLenum, GLdouble *) pfglVertexStream1dvATI;
11412 -typedef void function(GLenum, GLshort) pfglVertexStream1sATI;
11413 -typedef void function(GLenum, GLshort *) pfglVertexStream1svATI;
11414 -typedef void function(GLenum, GLint) pfglVertexStream1iATI;
11415 -typedef void function(GLenum, GLint *) pfglVertexStream1ivATI;
11416 -typedef void function(GLenum, GLfloat) pfglVertexStream1fATI;
11417 -typedef void function(GLenum, GLfloat *) pfglVertexStream1fvATI;
11418 -typedef void function(GLenum, GLdouble) pfglVertexStream1dATI;
11419 -typedef void function(GLenum, GLdouble *) pfglVertexStream1dvATI;
11420 +alias void function(GLenum, GLshort, GLshort) pfglVertexStream2sATI;
11421 +alias void function(GLenum, GLshort *) pfglVertexStream2svATI;
11422 +alias void function(GLenum, GLint, GLint) pfglVertexStream2iATI;
11423 +alias void function(GLenum, GLint *) pfglVertexStream2ivATI;
11424 +alias void function(GLenum, GLfloat, GLfloat) pfglVertexStream2fATI;
11425 +alias void function(GLenum, GLfloat *) pfglVertexStream2fvATI;
11426 +alias void function(GLenum, GLdouble, GLdouble) pfglVertexStream2dATI;
11427 +alias void function(GLenum, GLdouble *) pfglVertexStream2dvATI;
11429 -typedef void function(GLenum, GLshort, GLshort) pfglVertexStream2sATI;
11430 -typedef void function(GLenum, GLshort *) pfglVertexStream2svATI;
11431 -typedef void function(GLenum, GLint, GLint) pfglVertexStream2iATI;
11432 -typedef void function(GLenum, GLint *) pfglVertexStream2ivATI;
11433 -typedef void function(GLenum, GLfloat, GLfloat) pfglVertexStream2fATI;
11434 -typedef void function(GLenum, GLfloat *) pfglVertexStream2fvATI;
11435 -typedef void function(GLenum, GLdouble, GLdouble) pfglVertexStream2dATI;
11436 -typedef void function(GLenum, GLdouble *) pfglVertexStream2dvATI;
11437 +alias void function(GLenum, GLshort, GLshort, GLshort) pfglVertexStream3sATI;
11438 +alias void function(GLenum, GLshort *) pfglVertexStream3svATI;
11439 +alias void function(GLenum, GLint, GLint, GLint) pfglVertexStream3iATI;
11440 +alias void function(GLenum, GLint *) pfglVertexStream3ivATI;
11441 +alias void function(GLenum, GLfloat, GLfloat, GLfloat) pfglVertexStream3fATI;
11442 +alias void function(GLenum, GLfloat *) pfglVertexStream3fvATI;
11443 +alias void function(GLenum, GLdouble, GLdouble, GLdouble) pfglVertexStream3dATI;
11444 +alias void function(GLenum, GLdouble *) pfglVertexStream3dvATI;
11446 -typedef void function(GLenum, GLshort, GLshort, GLshort) pfglVertexStream3sATI;
11447 -typedef void function(GLenum, GLshort *) pfglVertexStream3svATI;
11448 -typedef void function(GLenum, GLint, GLint, GLint) pfglVertexStream3iATI;
11449 -typedef void function(GLenum, GLint *) pfglVertexStream3ivATI;
11450 -typedef void function(GLenum, GLfloat, GLfloat, GLfloat) pfglVertexStream3fATI;
11451 -typedef void function(GLenum, GLfloat *) pfglVertexStream3fvATI;
11452 -typedef void function(GLenum, GLdouble, GLdouble, GLdouble) pfglVertexStream3dATI;
11453 -typedef void function(GLenum, GLdouble *) pfglVertexStream3dvATI;
11454 +alias void function(GLenum, GLshort, GLshort, GLshort, GLshort) pfglVertexStream4sATI;
11455 +alias void function(GLenum, GLshort *) pfglVertexStream4svATI;
11456 +alias void function(GLenum, GLint, GLint, GLint, GLint) pfglVertexStream4iATI;
11457 +alias void function(GLenum, GLint *) pfglVertexStream4ivATI;
11458 +alias void function(GLenum, GLfloat, GLfloat, GLfloat, GLfloat) pfglVertexStream4fATI;
11459 +alias void function(GLenum, GLfloat *) pfglVertexStream4fvATI;
11460 +alias void function(GLenum, GLdouble, GLdouble, GLdouble, GLdouble) pfglVertexStream4dATI;
11461 +alias void function(GLenum, GLdouble *) pfglVertexStream4dvATI;
11463 -typedef void function(GLenum, GLshort, GLshort, GLshort, GLshort) pfglVertexStream4sATI;
11464 -typedef void function(GLenum, GLshort *) pfglVertexStream4svATI;
11465 -typedef void function(GLenum, GLint, GLint, GLint, GLint) pfglVertexStream4iATI;
11466 -typedef void function(GLenum, GLint *) pfglVertexStream4ivATI;
11467 -typedef void function(GLenum, GLfloat, GLfloat, GLfloat, GLfloat) pfglVertexStream4fATI;
11468 -typedef void function(GLenum, GLfloat *) pfglVertexStream4fvATI;
11469 -typedef void function(GLenum, GLdouble, GLdouble, GLdouble, GLdouble) pfglVertexStream4dATI;
11470 -typedef void function(GLenum, GLdouble *) pfglVertexStream4dvATI;
11471 +alias void function(GLenum, GLbyte, GLbyte, GLbyte) pfglNormalStream3bATI;
11472 +alias void function(GLenum, GLbyte *) pfglNormalStream3bvATI;
11473 +alias void function(GLenum, GLshort, GLshort, GLshort) pfglNormalStream3sATI;
11474 +alias void function(GLenum, GLshort *) pfglNormalStream3svATI;
11475 +alias void function(GLenum, GLint, GLint, GLint) pfglNormalStream3iATI;
11476 +alias void function(GLenum, GLint *) pfglNormalStream3ivATI;
11477 +alias void function(GLenum, GLfloat, GLfloat, GLfloat) pfglNormalStream3fATI;
11478 +alias void function(GLenum, GLfloat *) pfglNormalStream3fvATI;
11479 +alias void function(GLenum, GLdouble, GLdouble, GLdouble) pfglNormalStream3dATI;
11480 +alias void function(GLenum, GLdouble *) pfglNormalStream3dvATI;
11482 -typedef void function(GLenum, GLbyte, GLbyte, GLbyte) pfglNormalStream3bATI;
11483 -typedef void function(GLenum, GLbyte *) pfglNormalStream3bvATI;
11484 -typedef void function(GLenum, GLshort, GLshort, GLshort) pfglNormalStream3sATI;
11485 -typedef void function(GLenum, GLshort *) pfglNormalStream3svATI;
11486 -typedef void function(GLenum, GLint, GLint, GLint) pfglNormalStream3iATI;
11487 -typedef void function(GLenum, GLint *) pfglNormalStream3ivATI;
11488 -typedef void function(GLenum, GLfloat, GLfloat, GLfloat) pfglNormalStream3fATI;
11489 -typedef void function(GLenum, GLfloat *) pfglNormalStream3fvATI;
11490 -typedef void function(GLenum, GLdouble, GLdouble, GLdouble) pfglNormalStream3dATI;
11491 -typedef void function(GLenum, GLdouble *) pfglNormalStream3dvATI;
11492 -
11493 -typedef void function(GLenum) pfglClientActiveVertexStreamATI;
11494 -typedef void function(GLenum, GLint) pfglVertexBlendEnviATI;
11495 -typedef void function(GLenum, GLfloat) pfglVertexBlendEnvfATI;
11496 -
11497 +alias void function(GLenum) pfglClientActiveVertexStreamATI;
11498 +alias void function(GLenum, GLint) pfglVertexBlendEnviATI;
11499 +alias void function(GLenum, GLfloat) pfglVertexBlendEnvfATI;
11500 +}
11501 pfglVertexStream1sATI glVertexStream1sATI;
11502 pfglVertexStream1svATI glVertexStream1svATI;
11503 pfglVertexStream1iATI glVertexStream1iATI;
11504 Index: DerelictGL/derelict/opengl/extension/ati/separate_stencil.d
11505 ===================================================================
11506 --- DerelictGL/derelict/opengl/extension/ati/separate_stencil.d (revision 318)
11507 +++ DerelictGL/derelict/opengl/extension/ati/separate_stencil.d (working copy)
11508 @@ -82,11 +82,10 @@
11509 GL_STENCIL_BACK_PASS_DEPTH_PASS_ATI = 0x8803,
11510 }
11512 -extern(System):
11513 -
11514 -typedef void function(GLenum, GLenum, GLenum, GLenum) pfglStencilOpSeparateATI;
11515 -typedef void function(GLenum, GLenum, GLint, GLuint) pfglStencilFuncSeparateATI;
11516 -
11517 +extern(System) {
11518 +alias void function(GLenum, GLenum, GLenum, GLenum) pfglStencilOpSeparateATI;
11519 +alias void function(GLenum, GLenum, GLint, GLuint) pfglStencilFuncSeparateATI;
11520 +}
11521 pfglStencilOpSeparateATI glStencilOpSeparateATI;
11522 pfglStencilFuncSeparateATI glStencilFuncSeparateATI;
11524 Index: DerelictGL/derelict/opengl/extension/ati/pn_triangles.d
11525 ===================================================================
11526 --- DerelictGL/derelict/opengl/extension/ati/pn_triangles.d (revision 318)
11527 +++ DerelictGL/derelict/opengl/extension/ati/pn_triangles.d (working copy)
11528 @@ -87,11 +87,10 @@
11529 GL_PN_TRIANGLES_NORMAL_MODE_QUADRATIC_ATI = 0x87F8,
11530 }
11532 -extern(System):
11533 -
11534 -typedef void function(GLenum, GLint) pfglPNTrianglesiATI;
11535 -typedef void function(GLenum, GLfloat) pfglPNTrianglesfATI;
11536 -
11537 +extern(System) {
11538 +alias void function(GLenum, GLint) pfglPNTrianglesiATI;
11539 +alias void function(GLenum, GLfloat) pfglPNTrianglesfATI;
11540 +}
11541 pfglPNTrianglesiATI glPNTrianglesiATI;
11542 pfglPNTrianglesfATI glPNTrianglesfATI;
11544 Index: DerelictGL/derelict/opengl/extension/ati/element_array.d
11545 ===================================================================
11546 --- DerelictGL/derelict/opengl/extension/ati/element_array.d (revision 318)
11547 +++ DerelictGL/derelict/opengl/extension/ati/element_array.d (working copy)
11548 @@ -83,12 +83,11 @@
11549 GL_ELEMENT_ARRAY_POINTER_ATI = 0x876A,
11550 }
11552 -extern(System):
11553 -
11554 -typedef void function(GLenum, GLvoid*) pfglElementPointerATI;
11555 -typedef void function(GLenum, GLsizei) pfglDrawElementArrayATI;
11556 -typedef void function(GLenum, GLuint, GLuint, GLsizei) pfglDrawRangeElementArrayATI;
11557 -
11558 +extern(System) {
11559 +alias void function(GLenum, GLvoid*) pfglElementPointerATI;
11560 +alias void function(GLenum, GLsizei) pfglDrawElementArrayATI;
11561 +alias void function(GLenum, GLuint, GLuint, GLsizei) pfglDrawRangeElementArrayATI;
11562 +}
11563 pfglElementPointerATI glElementPointerATI;
11564 pfglDrawElementArrayATI glDrawElementArrayATI;
11565 pfglDrawRangeElementArrayATI glDrawRangeElementArrayATI;
11566 Index: DerelictGL/derelict/opengl/extension/ati/fragment_shader.d
11567 ===================================================================
11568 --- DerelictGL/derelict/opengl/extension/ati/fragment_shader.d (revision 318)
11569 +++ DerelictGL/derelict/opengl/extension/ati/fragment_shader.d (working copy)
11570 @@ -210,23 +210,23 @@
11571 GL_BIAS_BIT_ATI = 0x00000008,
11572 }
11574 -extern(System):
11575 +extern(System) {
11576 +alias GLuint function(GLuint) pfglGenFragmentShadersATI;
11577 +alias void function(GLuint) pfglBindFragmentShaderATI;
11578 +alias void function(GLuint) pfglDeleteFragmentShaderATI;
11579 +alias void function() pfglBeginFragmentShaderATI;
11580 +alias void function() pfglEndFragmentShaderATI;
11581 +alias void function(GLuint, GLuint, GLenum) pfglPassTexCoordATI;
11582 +alias void function(GLuint, GLuint, GLenum) pfglSampleMapATI;
11583 +alias void function(GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint) pfglColorFragmentOp1ATI;
11584 +alias void function(GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint) pfglColorFragmentOp2ATI;
11585 +alias void function(GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint) pfglColorFragmentOp3ATI;
11586 +alias void function(GLenum, GLuint, GLuint, GLuint, GLuint, GLuint) pfglAlphaFragmentOp1ATI;
11587 +alias void function(GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint) pfglAlphaFragmentOp2ATI;
11588 +alias void function(GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint) pfglAlphaFragmentOp3ATI;
11589 +alias void function(GLuint, GLfloat *) pfglSetFragmentShaderConstantATI;
11590 +}
11592 -typedef GLuint function(GLuint) pfglGenFragmentShadersATI;
11593 -typedef void function(GLuint) pfglBindFragmentShaderATI;
11594 -typedef void function(GLuint) pfglDeleteFragmentShaderATI;
11595 -typedef void function() pfglBeginFragmentShaderATI;
11596 -typedef void function() pfglEndFragmentShaderATI;
11597 -typedef void function(GLuint, GLuint, GLenum) pfglPassTexCoordATI;
11598 -typedef void function(GLuint, GLuint, GLenum) pfglSampleMapATI;
11599 -typedef void function(GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint) pfglColorFragmentOp1ATI;
11600 -typedef void function(GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint) pfglColorFragmentOp2ATI;
11601 -typedef void function(GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint) pfglColorFragmentOp3ATI;
11602 -typedef void function(GLenum, GLuint, GLuint, GLuint, GLuint, GLuint) pfglAlphaFragmentOp1ATI;
11603 -typedef void function(GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint) pfglAlphaFragmentOp2ATI;
11604 -typedef void function(GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint) pfglAlphaFragmentOp3ATI;
11605 -typedef void function(GLuint, GLfloat *) pfglSetFragmentShaderConstantATI;
11606 -
11607 pfglGenFragmentShadersATI glGenFragmentShadersATI;
11608 pfglBindFragmentShaderATI glBindFragmentShaderATI;
11609 pfglDeleteFragmentShaderATI glDeleteFragmentShaderATI;
11610 Index: DerelictGL/derelict/opengl/extension/ati/map_object_buffer.d
11611 ===================================================================
11612 --- DerelictGL/derelict/opengl/extension/ati/map_object_buffer.d (revision 318)
11613 +++ DerelictGL/derelict/opengl/extension/ati/map_object_buffer.d (working copy)
11614 @@ -74,10 +74,9 @@
11615 }
11616 }
11618 -extern(System):
11619 -
11620 -typedef GLvoid* function(GLuint) pfglMapObjectBufferATI;
11621 -typedef void function(GLuint) pfglUnmapObjectBufferATI;
11622 -
11623 +extern(System) {
11624 +alias GLvoid* function(GLuint) pfglMapObjectBufferATI;
11625 +alias void function(GLuint) pfglUnmapObjectBufferATI;
11626 +}
11627 pfglMapObjectBufferATI glMapObjectBufferATI;
11628 pfglUnmapObjectBufferATI glUnmapObjectBufferATI;
11629 Index: DerelictGL/derelict/opengl/glx.d
11630 ===================================================================
11631 --- DerelictGL/derelict/opengl/glx.d (revision 318)
11632 +++ DerelictGL/derelict/opengl/glx.d (working copy)
11633 @@ -40,31 +40,30 @@
11634 import derelict.util.loader;
11635 }
11637 -extern (C):
11639 -typedef int Bool;
11640 -typedef uint VisualID;
11641 +alias int Bool;
11642 +alias uint VisualID;
11644 struct __GLXcontextRec {}
11645 struct __GLXFBConfigRec {}
11647 -typedef uint GLXContentID;
11648 -typedef uint GLXPixmap;
11649 -typedef uint GLXDrawable;
11650 -typedef uint GLXPbuffer;
11651 -typedef uint GLXWindow;
11652 -typedef uint GLXFBConfigID;
11653 +alias uint GLXContentID;
11654 +alias uint GLXPixmap;
11655 +alias uint GLXDrawable;
11656 +alias uint GLXPbuffer;
11657 +alias uint GLXWindow;
11658 +alias uint GLXFBConfigID;
11660 -typedef __GLXcontextRec *GLXContext; // __GLXcontextRec type is opaque
11661 -typedef __GLXFBConfigRec *GLXFBConfig; // __GLXFBConfigRec type is opaque
11662 +alias __GLXcontextRec *GLXContext; // __GLXcontextRec type is opaque
11663 +alias __GLXFBConfigRec *GLXFBConfig; // __GLXFBConfigRec type is opaque
11665 -typedef byte* XPointer;
11666 +alias byte* XPointer;
11668 -typedef void Display;
11669 -typedef uint XID;
11670 -typedef XID Pixmap;
11671 -typedef XID Font;
11672 -typedef XID Window;
11673 +alias void Display;
11674 +alias uint XID;
11675 +alias XID Pixmap;
11676 +alias XID Font;
11677 +alias XID Window;
11679 struct XExtData
11680 {
11681 @@ -125,88 +124,89 @@
11683 // Function pointer variables
11685 -typedef XVisualInfo* function(Display*,int,int*)
11686 +extern (C) {
11687 +alias XVisualInfo* function(Display*,int,int*)
11688 pfglXChooseVisual;
11689 -typedef void function(Display*,GLXContext,GLXContext,uint)
11690 +alias void function(Display*,GLXContext,GLXContext,uint)
11691 pfglXCopyContext;
11692 -typedef GLXContext function(Display*,XVisualInfo*,GLXContext,Bool)
11693 +alias GLXContext function(Display*,XVisualInfo*,GLXContext,Bool)
11694 pfglXCreateContext;
11695 -typedef GLXPixmap function(Display*,XVisualInfo*,Pixmap)
11696 +alias GLXPixmap function(Display*,XVisualInfo*,Pixmap)
11697 pfglXCreateGLXPixmap;
11698 -typedef void function(Display*,GLXContext)
11699 +alias void function(Display*,GLXContext)
11700 pfglXDestroyContext;
11701 -typedef void function(Display*,GLXPixmap)
11702 +alias void function(Display*,GLXPixmap)
11703 pfglXDestroyGLXPixmap;
11704 -typedef int function(Display*,XVisualInfo*,int,int*)
11705 +alias int function(Display*,XVisualInfo*,int,int*)
11706 pfglXGetConfig;
11707 -typedef GLXContext function()
11708 +alias GLXContext function()
11709 pfglXGetCurrentContext;
11710 -typedef GLXDrawable function()
11711 +alias GLXDrawable function()
11712 pfglXGetCurrentDrawable;
11713 -typedef Bool function(Display*,GLXContext)
11714 +alias Bool function(Display*,GLXContext)
11715 pfglXIsDirect;
11716 -typedef Bool function(Display*,GLXDrawable,GLXContext)
11717 +alias Bool function(Display*,GLXDrawable,GLXContext)
11718 pfglXMakeCurrent;
11719 -typedef Bool function(Display*,int*,int*)
11720 +alias Bool function(Display*,int*,int*)
11721 pfglXQueryExtension;
11722 -typedef Bool function(Display*,int*,int*)
11723 +alias Bool function(Display*,int*,int*)
11724 pfglXQueryVersion;
11725 -typedef void function(Display*,GLXDrawable)
11726 +alias void function(Display*,GLXDrawable)
11727 pfglXSwapBuffers;
11728 -typedef void function(Font,int,int,int)
11729 +alias void function(Font,int,int,int)
11730 pfglXUseXFont;
11731 -typedef void function()
11732 +alias void function()
11733 pfglXWaitGL;
11734 -typedef void function()
11735 +alias void function()
11736 pfglXWaitX;
11737 -typedef const char* function(Display*,int)
11738 +alias char* function(Display*,int)
11739 pfglXGetClientString;
11740 -typedef const char* function(Display*,int,int)
11741 +alias char* function(Display*,int,int)
11742 pfglXQueryServerString;
11743 -typedef const char* function(Display*,int)
11744 +alias char* function(Display*,int)
11745 pfglXQueryExtensionsString;
11747 /* GLX 1.3 */
11749 -typedef GLXFBConfig* function(Display*,int,int*)
11750 +alias GLXFBConfig* function(Display*,int,int*)
11751 pfglXGetFBConfigs;
11752 -typedef GLXFBConfig* function(Display*,int,int*,int*)
11753 +alias GLXFBConfig* function(Display*,int,int*,int*)
11754 pfglXChooseFBConfig;
11755 -typedef int function(Display*,GLXFBConfig,int,int*)
11756 +alias int function(Display*,GLXFBConfig,int,int*)
11757 pfglXGetFBConfigAttrib;
11758 -typedef XVisualInfo* function(Display*,GLXFBConfig)
11759 +alias XVisualInfo* function(Display*,GLXFBConfig)
11760 pfglXGetVisualFromFBConfig;
11761 -typedef GLXWindow function(Display*,GLXFBConfig,Window,int*)
11762 +alias GLXWindow function(Display*,GLXFBConfig,Window,int*)
11763 pfglXCreateWindow;
11764 -typedef void function(Display*,GLXWindow)
11765 +alias void function(Display*,GLXWindow)
11766 pfglXDestroyWindow;
11767 -typedef GLXPixmap function(Display*,GLXFBConfig,Pixmap,int*)
11768 +alias GLXPixmap function(Display*,GLXFBConfig,Pixmap,int*)
11769 pfglXCreatePixmap;
11770 -typedef void function(Display*,GLXPixmap)
11771 +alias void function(Display*,GLXPixmap)
11772 pfglXDestroyPixmap;
11773 -typedef GLXPbuffer function(Display*,GLXFBConfig,int*)
11774 +alias GLXPbuffer function(Display*,GLXFBConfig,int*)
11775 pfglXCreatePbuffer;
11776 -typedef void function(Display*,GLXPbuffer)
11777 +alias void function(Display*,GLXPbuffer)
11778 pfglXDestroyPbuffer;
11779 -typedef void function(Display*,GLXDrawable,int,uint*)
11780 +alias void function(Display*,GLXDrawable,int,uint*)
11781 pfglXQueryDrawable;
11782 -typedef GLXContext function(Display*,GLXFBConfig,int,GLXContext,Bool)
11783 +alias GLXContext function(Display*,GLXFBConfig,int,GLXContext,Bool)
11784 pfglXCreateNewContext;
11785 -typedef Bool function(Display*,GLXDrawable,GLXDrawable,GLXContext)
11786 +alias Bool function(Display*,GLXDrawable,GLXDrawable,GLXContext)
11787 pfglXMakeContextCurrent;
11788 -typedef GLXDrawable function()
11789 +alias GLXDrawable function()
11790 pfglXGetCurrentReadDrawable;
11791 -typedef Display* function()
11792 +alias Display* function()
11793 pfglXGetCurrentDisplay;
11794 -typedef int function(Display*,GLXContext,int,int*)
11795 +alias int function(Display*,GLXContext,int,int*)
11796 pfglXQueryContext;
11797 -typedef void function(Display*,GLXDrawable,uint)
11798 +alias void function(Display*,GLXDrawable,uint)
11799 pfglXSelectEvent;
11800 -typedef void function(Display*,GLXDrawable,uint*)
11801 +alias void function(Display*,GLXDrawable,uint*)
11802 pfglXGetSelectedEvent;
11804 /* GLX 1.4+ */
11805 -typedef void* function(GLchar*)
11806 +alias void* function(GLchar*)
11807 pfglXGetProcAddress;
11809 /* GLX extensions -- legacy */
11810 @@ -226,7 +226,6 @@
11811 pfglXGetProcAddressARB;
11812 */
11814 -/+
11816 // All extensions are disabled in the current version
11817 // until further testing is done and need is established.
11818 @@ -253,8 +252,7 @@
11819 Bool function(Display*,GLXDrawable,int*)
11820 glXDrawableAttribARB;
11822 -+/
11823 -
11824 +}
11825 pfglXChooseVisual glXChooseVisual;
11826 pfglXCopyContext glXCopyContext;
11827 pfglXCreateContext glXCreateContext;