Changeset 303

Show
Ignore:
Timestamp:
06/06/08 06:19:35 (3 months ago)
Author:
aldacron
Message:

[DerelictAL]
* removed some commented out code
[DerelictGL]
* typos and formatting issues in bindable_uniform.d
[DerelictGL/GLU/IL/ILU/ILUT]
* replaced CTFE mixin hack for function typedef declarations with extern(System)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/DerelictAL/derelict/openal/alfuncs.d

    r300 r303  
    154154 
    155155 
    156 /*    version(Windows) 
    157     extern(Windows): 
    158 else 
    159 */     extern(C): 
     156extern(C): 
    160157 
    161158typedef void function(ALenum) pfalEnable; 
  • trunk/DerelictGL/derelict/opengl/extension/arb/color_buffer_float.d

    r300 r303  
    8181} 
    8282 
    83 private const char[] Funcs = 
    84 
    85     typedef void function(GLenum,GLenum) pfglClampColorARB; 
    86 "; 
     83extern(System): 
    8784 
    88 version(Windows) 
    89 
    90     extern(Windows): mixin(Funcs); 
    91 
    92 else 
    93 
    94     extern(C): mixin(Funcs); 
    95 
     85typedef void function(GLenum,GLenum) pfglClampColorARB; 
    9686 
    9787pfglClampColorARB       glClampColorARB; 
  • trunk/DerelictGL/derelict/opengl/extension/arb/draw_buffers.d

    r300 r303  
    9393} 
    9494 
    95 private const char[] Funcs = 
    96 
    97     typedef void function(GLsizei, GLenum*) pfglDrawBuffersARB; 
    98 "; 
     95extern(System): 
    9996 
    100 version(Windows) 
    101 
    102     extern(Windows): mixin(Funcs); 
    103 
    104 else 
    105 
    106     extern(C): mixin(Funcs); 
    107 
     97typedef void function(GLsizei, GLenum*) pfglDrawBuffersARB; 
    10898 
    10999pfglDrawBuffersARB          glDrawBuffersARB; 
  • trunk/DerelictGL/derelict/opengl/extension/arb/matrix_palette.d

    r300 r303  
    9494} 
    9595 
    96 private const char[] Funcs = 
    97 
    98     typedef void function(GLint) pfglCurrentPaletteMatrixARB; 
    99     typedef void function(GLint, GLubyte*) pfglMatrixIndexubvARB; 
    100     typedef void function(GLint, GLushort*) pfglMatrixIndexusvARB; 
    101     typedef void function(GLint, GLuint*) pfglMatrixIndexuivARB; 
    102     typedef void function(GLint, GLenum, GLsizei, GLvoid*) pfglMatrixIndexPointerARB; 
    103 "; 
     96extern(System): 
    10497 
    105 version(Windows) 
    106 
    107     extern(Windows): mixin(Funcs); 
    108 
    109 else 
    110 
    111     extern(C): mixin(Funcs); 
    112 
     98typedef void function(GLint) pfglCurrentPaletteMatrixARB; 
     99typedef void function(GLint, GLubyte*) pfglMatrixIndexubvARB; 
     100typedef void function(GLint, GLushort*) pfglMatrixIndexusvARB; 
     101typedef void function(GLint, GLuint*) pfglMatrixIndexuivARB; 
     102typedef void function(GLint, GLenum, GLsizei, GLvoid*) pfglMatrixIndexPointerARB; 
    113103 
    114104pfglCurrentPaletteMatrixARB         glCurrentPaletteMatrixARB; 
  • trunk/DerelictGL/derelict/opengl/extension/arb/multisample.d

    r300 r303  
    8585} 
    8686 
    87 private const char[] Funcs = 
    88 
    89     typedef void function(GLclampf, GLboolean) pfglSampleCoverageARB; 
    90 "; 
     87extern(System): 
    9188 
    92 version(Windows) 
    93 
    94     extern(Windows): mixin(Funcs); 
    95 
    96 else 
    97 
    98     extern(C): mixin(Funcs); 
    99 
    100  
     89typedef void function(GLclampf, GLboolean) pfglSampleCoverageARB; 
    10190 
    10291pfglSampleCoverageARB       glSampleCoverageARB; 
  • trunk/DerelictGL/derelict/opengl/extension/arb/multitexture.d

    r300 r303  
    178178} 
    179179 
    180 private const char[] Funcs = 
    181 
    182     typedef void function(GLenum) pfglActiveTextureARB; 
    183     typedef void function(GLenum) pfglClientActiveTextureARB; 
    184     typedef void function(GLenum, GLdouble) pfglMultiTexCoord1dARB; 
    185     typedef void function(GLenum, GLdouble*) pfglMultiTexCoord1dvARB; 
    186     typedef void function(GLenum, GLfloat) pfglMultiTexCoord1fARB; 
    187     typedef void function(GLenum, GLfloat*) pfglMultiTexCoord1fvARB; 
    188     typedef void function(GLenum, GLint) pfglMultiTexCoord1iARB; 
    189     typedef void function(GLenum, GLint*) pfglMultiTexCoord1ivARB; 
    190     typedef void function(GLenum, GLshort) pfglMultiTexCoord1sARB; 
    191     typedef void function(GLenum, GLshort*) pfglMultiTexCoord1svARB; 
    192     typedef void function(GLenum, GLdouble, GLdouble) pfglMultiTexCoord2dARB; 
    193     typedef void function(GLenum, GLdouble*) pfglMultiTexCoord2dvARB; 
    194     typedef void function(GLenum, GLfloat, GLfloat) pfglMultiTexCoord2fARB; 
    195     typedef void function(GLenum, GLfloat*) pfglMultiTexCoord2fvARB; 
    196     typedef void function(GLenum, GLint, GLint) pfglMultiTexCoord2iARB; 
    197     typedef void function(GLenum, GLint*) pfglMultiTexCoord2ivARB; 
    198     typedef void function(GLenum, GLshort, GLshort) pfglMultiTexCoord2sARB; 
    199     typedef void function(GLenum, GLshort*) pfglMultiTexCoord2svARB; 
    200     typedef void function(GLenum, GLdouble, GLdouble, GLdouble) pfglMultiTexCoord3dARB; 
    201     typedef void function(GLenum, GLdouble*) pfglMultiTexCoord3dvARB; 
    202     typedef void function(GLenum, GLfloat, GLfloat, GLfloat) pfglMultiTexCoord3fARB; 
    203     typedef void function(GLenum, GLfloat*) pfglMultiTexCoord3fvARB; 
    204     typedef void function(GLenum, GLint, GLint, GLint) pfglMultiTexCoord3iARB; 
    205     typedef void function(GLenum, GLint*) pfglMultiTexCoord3ivARB; 
    206     typedef void function(GLenum, GLshort, GLshort, GLshort) pfglMultiTexCoord3sARB; 
    207     typedef void function(GLenum, GLshort*) pfglMultiTexCoord3svARB; 
    208     typedef void function(GLenum, GLdouble, GLdouble, GLdouble, GLdouble) pfglMultiTexCoord4dARB; 
    209     typedef void function(GLenum, GLdouble*) pfglMultiTexCoord4dvARB; 
    210     typedef void function(GLenum, GLfloat, GLfloat, GLfloat, GLfloat) pfglMultiTexCoord4fARB; 
    211     typedef void function(GLenum, GLfloat*) pfglMultiTexCoord4fvARB; 
    212     typedef void function(GLenum, GLint, GLint, GLint, GLint) pfglMultiTexCoord4iARB; 
    213     typedef void function(GLenum, GLint*) pfglMultiTexCoord4ivARB; 
    214     typedef void function(GLenum, GLshort, GLshort, GLshort, GLshort) pfglMultiTexCoord4sARB; 
    215     typedef void function(GLenum, GLshort*) pfglMultiTexCoord4svARB; 
    216 "; 
    217  
    218 version(Windows) 
    219 
    220     extern(Windows): mixin(Funcs); 
    221 
    222 else 
    223 
    224     extern(C): mixin(Funcs); 
    225 
     180extern(System): 
     181 
     182typedef void function(GLenum) pfglActiveTextureARB; 
     183typedef void function(GLenum) pfglClientActiveTextureARB; 
     184typedef void function(GLenum, GLdouble) pfglMultiTexCoord1dARB; 
     185typedef void function(GLenum, GLdouble*) pfglMultiTexCoord1dvARB; 
     186typedef void function(GLenum, GLfloat) pfglMultiTexCoord1fARB; 
     187typedef void function(GLenum, GLfloat*) pfglMultiTexCoord1fvARB; 
     188typedef void function(GLenum, GLint) pfglMultiTexCoord1iARB; 
     189typedef void function(GLenum, GLint*) pfglMultiTexCoord1ivARB; 
     190typedef void function(GLenum, GLshort) pfglMultiTexCoord1sARB; 
     191typedef void function(GLenum, GLshort*) pfglMultiTexCoord1svARB; 
     192typedef void function(GLenum, GLdouble, GLdouble) pfglMultiTexCoord2dARB; 
     193typedef void function(GLenum, GLdouble*) pfglMultiTexCoord2dvARB; 
     194typedef void function(GLenum, GLfloat, GLfloat) pfglMultiTexCoord2fARB; 
     195typedef void function(GLenum, GLfloat*) pfglMultiTexCoord2fvARB; 
     196typedef void function(GLenum, GLint, GLint) pfglMultiTexCoord2iARB; 
     197typedef void function(GLenum, GLint*) pfglMultiTexCoord2ivARB; 
     198typedef void function(GLenum, GLshort, GLshort) pfglMultiTexCoord2sARB; 
     199typedef void function(GLenum, GLshort*) pfglMultiTexCoord2svARB; 
     200typedef void function(GLenum, GLdouble, GLdouble, GLdouble) pfglMultiTexCoord3dARB; 
     201typedef void function(GLenum, GLdouble*) pfglMultiTexCoord3dvARB; 
     202typedef void function(GLenum, GLfloat, GLfloat, GLfloat) pfglMultiTexCoord3fARB; 
     203typedef void function(GLenum, GLfloat*) pfglMultiTexCoord3fvARB; 
     204typedef void function(GLenum, GLint, GLint, GLint) pfglMultiTexCoord3iARB; 
     205typedef void function(GLenum, GLint*) pfglMultiTexCoord3ivARB; 
     206typedef void function(GLenum, GLshort, GLshort, GLshort) pfglMultiTexCoord3sARB; 
     207typedef void function(GLenum, GLshort*) pfglMultiTexCoord3svARB; 
     208typedef void function(GLenum, GLdouble, GLdouble, GLdouble, GLdouble) pfglMultiTexCoord4dARB; 
     209typedef void function(GLenum, GLdouble*) pfglMultiTexCoord4dvARB; 
     210typedef void function(GLenum, GLfloat, GLfloat, GLfloat, GLfloat) pfglMultiTexCoord4fARB; 
     211typedef void function(GLenum, GLfloat*) pfglMultiTexCoord4fvARB; 
     212typedef void function(GLenum, GLint, GLint, GLint, GLint) pfglMultiTexCoord4iARB; 
     213typedef void function(GLenum, GLint*) pfglMultiTexCoord4ivARB; 
     214typedef void function(GLenum, GLshort, GLshort, GLshort, GLshort) pfglMultiTexCoord4sARB; 
     215typedef void function(GLenum, GLshort*) pfglMultiTexCoord4svARB; 
    226216 
    227217pfglActiveTextureARB            glActiveTextureARB; 
  • trunk/DerelictGL/derelict/opengl/extension/arb/occlusion_query.d

    r300 r303  
    9595} 
    9696 
    97 private const char[] Funcs = 
    98 
    99     typedef void function(GLsizei, GLuint*) pfglGenQueriesARB; 
    100     typedef void function(GLsizei, GLuint*) pfglDeleteQueriesARB; 
    101     typedef GLboolean function(GLuint) pfglIsQueryARB; 
    102     typedef void function(GLenum, GLuint) pfglBeginQueryARB; 
    103     typedef void function(GLenum) pfglEndQueryARB; 
    104     typedef void function(GLenum, GLenum, GLint*) pfglGetQueryivARB; 
    105     typedef void function(GLuint, GLenum, GLint*) pfglGetQueryObjectivARB; 
    106     typedef void function(GLuint, GLenum, GLuint*) pfglGetQueryObjectuivARB; 
    107 "; 
     97extern(System): 
    10898 
    109 version(Windows) 
    110 
    111     extern(Windows): mixin(Funcs)
    112 
    113 else 
    114 
    115     extern(C): mixin(Funcs)
    116 
     99typedef void function(GLsizei, GLuint*) pfglGenQueriesARB; 
     100typedef void function(GLsizei, GLuint*) pfglDeleteQueriesARB; 
     101typedef GLboolean function(GLuint) pfglIsQueryARB
     102typedef void function(GLenum, GLuint) pfglBeginQueryARB; 
     103typedef void function(GLenum) pfglEndQueryARB; 
     104typedef void function(GLenum, GLenum, GLint*) pfglGetQueryivARB; 
     105typedef void function(GLuint, GLenum, GLint*) pfglGetQueryObjectivARB
     106typedef void function(GLuint, GLenum, GLuint*) pfglGetQueryObjectuivARB; 
    117107 
    118108pfglGenQueriesARB           glGenQueriesARB; 
  • trunk/DerelictGL/derelict/opengl/extension/arb/point_parameters.d

    r300 r303  
    8282} 
    8383 
    84 private const char[] Funcs = 
    85 
    86     typedef void function(GLenum, GLfloat) pfglPointParameterfARB; 
    87     typedef void function(GLenum, GLfloat*) pfglPointParameterfvARB; 
    88 "; 
     84extern(System): 
    8985 
    90 version(Windows) 
    91 
    92     extern(Windows): mixin(Funcs); 
    93 
    94 else 
    95 
    96     extern(C): mixin(Funcs); 
    97 
     86typedef void function(GLenum, GLfloat) pfglPointParameterfARB; 
     87typedef void function(GLenum, GLfloat*) pfglPointParameterfvARB; 
    9888 
    9989pfglPointParameterfARB          glPointParameterfARB; 
  • trunk/DerelictGL/derelict/opengl/extension/arb/shader_objects.d

    r300 r303  
    189189alias uint GLhandleARB; 
    190190 
    191 private const char[] Funcs = 
    192 
    193     typedef void function(GLhandleARB) pfglDeleteObjectARB; 
    194     typedef GLhandleARB function(GLenum) pfglGetHandleARB; 
    195     typedef void function(GLhandleARB, GLhandleARB) pfglDetachObjectARB; 
    196     typedef GLhandleARB function(GLenum) pfglCreateShaderObjectARB; 
    197     typedef void function(GLhandleARB, GLsizei, GLcharARB**, GLint*) pfglShaderSourceARB; 
    198     typedef void function(GLhandleARB) pfglCompileShaderARB; 
    199     typedef GLhandleARB function() pfglCreateProgramObjectARB; 
    200     typedef void function(GLhandleARB, GLhandleARB) pfglAttachObjectARB; 
    201     typedef void function(GLhandleARB) pfglLinkProgramARB; 
    202     typedef void function(GLhandleARB) pfglUseProgramObjectARB; 
    203     typedef void function(GLhandleARB) pfglValidateProgramARB; 
    204     typedef void function(GLint, GLfloat) pfglUniform1fARB; 
    205     typedef void function(GLint, GLfloat, GLfloat) pfglUniform2fARB; 
    206     typedef void function(GLint, GLfloat, GLfloat, GLfloat) pfglUniform3fARB; 
    207     typedef void function(GLint, GLfloat, GLfloat, GLfloat, GLfloat) pfglUniform4fARB; 
    208     typedef void function(GLint, GLint) pfglUniform1iARB; 
    209     typedef void function(GLint, GLint, GLint) pfglUniform2iARB; 
    210     typedef void function(GLint, GLint, GLint, GLint) pfglUniform3iARB; 
    211     typedef void function(GLint, GLint, GLint, GLint, GLint) pfglUniform4iARB; 
    212     typedef void function(GLint, GLsizei, GLfloat*) pfglUniform1fvARB; 
    213     typedef void function(GLint, GLsizei, GLfloat*) pfglUniform2fvARB; 
    214     typedef void function(GLint, GLsizei, GLfloat*) pfglUniform3fvARB; 
    215     typedef void function(GLint, GLsizei, GLfloat*) pfglUniform4fvARB; 
    216     typedef void function(GLint, GLsizei, GLint*) pfglUniform1ivARB; 
    217     typedef void function(GLint, GLsizei, GLint*) pfglUniform2ivARB; 
    218     typedef void function(GLint, GLsizei, GLint*) pfglUniform3ivARB; 
    219     typedef void function(GLint, GLsizei, GLint*) pfglUniform4ivARB; 
    220     typedef void function(GLint, GLsizei, GLboolean, GLfloat*) pfglUniformMatrix2fvARB; 
    221     typedef void function(GLint, GLsizei, GLboolean, GLfloat*) pfglUniformMatrix3fvARB; 
    222     typedef void function(GLint, GLsizei, GLboolean, GLfloat*) pfglUniformMatrix4fvARB; 
    223     typedef void function(GLhandleARB, GLenum, GLfloat*) pfglGetObjectParameterfvARB; 
    224     typedef void function(GLhandleARB, GLenum, GLint*) pfglGetObjectParameterivARB; 
    225     typedef void function(GLhandleARB, GLsizei, GLsizei*, GLcharARB*) pfglGetInfoLogARB; 
    226     typedef void function(GLhandleARB, GLsizei, GLsizei*, GLhandleARB*) pfglGetAttachedObjectsARB; 
    227     typedef GLint function(GLhandleARB, GLcharARB*) pfglGetUniformLocationARB; 
    228     typedef void function(GLhandleARB, GLuint, GLsizei, GLsizei*, GLint*, GLenum*, GLcharARB*) pfglGetActiveUniformARB; 
    229     typedef void function(GLhandleARB, GLint, GLfloat*) pfglGetUniformfvARB; 
    230     typedef void function(GLhandleARB, GLint, GLint*) pfglGetUniformivARB; 
    231     typedef void function(GLhandleARB, GLsizei, GLsizei*, GLcharARB*) pfglGetShaderSourceARB; 
    232 "; 
    233  
    234 version(Windows) 
    235 
    236     extern(Windows): mixin(Funcs); 
    237 
    238 else 
    239 
    240     extern(C): mixin(Funcs); 
    241 
     191extern(System): 
     192 
     193typedef void function(GLhandleARB) pfglDeleteObjectARB; 
     194typedef GLhandleARB function(GLenum) pfglGetHandleARB; 
     195typedef void function(GLhandleARB, GLhandleARB) pfglDetachObjectARB; 
     196typedef GLhandleARB function(GLenum) pfglCreateShaderObjectARB; 
     197typedef void function(GLhandleARB, GLsizei, GLcharARB**, GLint*) pfglShaderSourceARB; 
     198typedef void function(GLhandleARB) pfglCompileShaderARB; 
     199typedef GLhandleARB function() pfglCreateProgramObjectARB; 
     200typedef void function(GLhandleARB, GLhandleARB) pfglAttachObjectARB; 
     201typedef void function(GLhandleARB) pfglLinkProgramARB; 
     202typedef void function(GLhandleARB) pfglUseProgramObjectARB; 
     203typedef void function(GLhandleARB) pfglValidateProgramARB; 
     204typedef void function(GLint, GLfloat) pfglUniform1fARB; 
     205typedef void function(GLint, GLfloat, GLfloat) pfglUniform2fARB; 
     206typedef void function(GLint, GLfloat, GLfloat, GLfloat) pfglUniform3fARB; 
     207typedef void function(GLint, GLfloat, GLfloat, GLfloat, GLfloat) pfglUniform4fARB; 
     208typedef void function(GLint, GLint) pfglUniform1iARB; 
     209typedef void function(GLint, GLint, GLint) pfglUniform2iARB; 
     210typedef void function(GLint, GLint, GLint, GLint) pfglUniform3iARB; 
     211typedef void function(GLint, GLint, GLint, GLint, GLint) pfglUniform4iARB; 
     212typedef void function(GLint, GLsizei, GLfloat*) pfglUniform1fvARB; 
     213typedef void function(GLint, GLsizei, GLfloat*) pfglUniform2fvARB; 
     214typedef void function(GLint, GLsizei, GLfloat*) pfglUniform3fvARB; 
     215typedef void function(GLint, GLsizei, GLfloat*) pfglUniform4fvARB; 
     216typedef void function(GLint, GLsizei, GLint*) pfglUniform1ivARB; 
     217typedef void function(GLint, GLsizei, GLint*) pfglUniform2ivARB; 
     218typedef void function(GLint, GLsizei, GLint*) pfglUniform3ivARB; 
     219typedef void function(GLint, GLsizei, GLint*) pfglUniform4ivARB; 
     220typedef void function(GLint, GLsizei, GLboolean, GLfloat*) pfglUniformMatrix2fvARB; 
     221typedef void function(GLint, GLsizei, GLboolean, GLfloat*) pfglUniformMatrix3fvARB; 
     222typedef void function(GLint, GLsizei, GLboolean, GLfloat*) pfglUniformMatrix4fvARB; 
     223typedef void function(GLhandleARB, GLenum, GLfloat*) pfglGetObjectParameterfvARB; 
     224typedef void function(GLhandleARB, GLenum, GLint*) pfglGetObjectParameterivARB; 
     225typedef void function(GLhandleARB, GLsizei, GLsizei*, GLcharARB*) pfglGetInfoLogARB; 
     226typedef void function(GLhandleARB, GLsizei, GLsizei*, GLhandleARB*) pfglGetAttachedObjectsARB; 
     227typedef GLint function(GLhandleARB, GLcharARB*) pfglGetUniformLocationARB; 
     228typedef void function(GLhandleARB, GLuint, GLsizei, GLsizei*, GLint*, GLenum*, GLcharARB*) pfglGetActiveUniformARB; 
     229typedef void function(GLhandleARB, GLint, GLfloat*) pfglGetUniformfvARB; 
     230typedef void function(GLhandleARB, GLint, GLint*) pfglGetUniformivARB; 
     231typedef void function(GLhandleARB, GLsizei, GLsizei*, GLcharARB*) pfglGetShaderSourceARB; 
    242232 
    243233pfglDeleteObjectARB                     glDeleteObjectARB; 
  • trunk/DerelictGL/derelict/opengl/extension/arb/texture_compression.d

    r300 r303  
    9999} 
    100100 
    101 private const char[] Funcs = 
    102 
    103     typedef void function(GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLsizei, GLvoid*) pfglCompressedTexImage3DARB; 
    104     typedef void function(GLenum, GLint, GLenum, GLsizei, GLsizei, GLint, GLsizei, GLvoid*) pfglCompressedTexImage2DARB; 
    105     typedef void function(GLenum, GLint, GLenum, GLsizei, GLint, GLsizei, GLvoid*) pfglCompressedTexImage1DARB; 
    106     typedef void function(GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLsizei, GLvoid*) pfglCompressedTexSubImage3DARB; 
    107     typedef void function(GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLsizei, GLvoid*) pfglCompressedTexSubImage2DARB; 
    108     typedef void function(GLenum, GLint, GLint, GLsizei, GLenum, GLsizei, GLvoid*) pfglCompressedTexSubImage1DARB; 
    109     typedef void function(GLenum, GLint, GLvoid*) pfglGetCompressedTexImageARB; 
    110 "; 
     101extern(System): 
    111102 
    112 version(Windows) 
    113 
    114     extern(Windows): mixin(Funcs); 
    115 
    116 else 
    117 
    118     extern(C): mixin(Funcs); 
    119 
     103typedef void function(GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLsizei, GLvoid*) pfglCompressedTexImage3DARB; 
     104typedef void function(GLenum, GLint, GLenum, GLsizei, GLsizei, GLint, GLsizei, GLvoid*) pfglCompressedTexImage2DARB; 
     105typedef void function(GLenum, GLint, GLenum, GLsizei, GLint, GLsizei, GLvoid*) pfglCompressedTexImage1DARB; 
     106typedef void function(GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLsizei, GLvoid*) pfglCompressedTexSubImage3DARB; 
     107typedef void function(GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLsizei, GLvoid*) pfglCompressedTexSubImage2DARB; 
     108typedef void function(GLenum, GLint, GLint, GLsizei, GLenum, GLsizei, GLvoid*) pfglCompressedTexSubImage1DARB; 
     109typedef void function(GLenum, GLint, GLvoid*) pfglGetCompressedTexImageARB; 
    120110 
    121111pfglCompressedTexImage3DARB         glCompressedTexImage3DARB; 
  • trunk/DerelictGL/derelict/opengl/extension/arb/transpose_matrix.d

    r300 r303  
    8686} 
    8787 
    88 private const char[] Funcs = 
    89 
    90     typedef void function(GLfloat*) pfglLoadTransposeMatrixfARB; 
    91     typedef void function(GLdouble*) pfglLoadTransposeMatrixdARB; 
    92     typedef void function(GLfloat*) pfglMultTransposeMatrixfARB; 
    93     typedef void function(GLdouble*) pfglMultTransposeMatrixdARB; 
    94 "; 
     88extern(System): 
    9589 
    96 version(Windows) 
    97 
    98     extern(Windows): mixin(Funcs); 
    99 
    100 else 
    101 
    102     extern(C): mixin(Funcs); 
    103 
     90typedef void function(GLfloat*) pfglLoadTransposeMatrixfARB; 
     91typedef void function(GLdouble*) pfglLoadTransposeMatrixdARB; 
     92typedef void function(GLfloat*) pfglMultTransposeMatrixfARB; 
     93typedef void function(GLdouble*) pfglMultTransposeMatrixdARB; 
    10494 
    10595pfglLoadTransposeMatrixfARB             glLoadTransposeMatrixfARB; 
  • trunk/DerelictGL/derelict/opengl/extension/arb/vertex_blend.d

    r300 r303  
    136136} 
    137137 
    138 private const char[] Funcs = 
    139 
    140     typedef void function(GLint, GLbyte*) pfglWeightbvARB; 
    141     typedef void function(GLint, GLshort*) pfglWeightsvARB; 
    142     typedef void function(GLint, GLint*) pfglWeightivARB; 
    143     typedef void function(GLint, GLfloat*) pfglWeightfvARB; 
    144     typedef void function(GLint, GLdouble*) pfglWeightdvARB; 
    145     typedef void function(GLint, GLubyte*) pfglWeightubvARB; 
    146     typedef void function(GLint, GLushort*) pfglWeightusvARB; 
    147     typedef void function(GLint, GLuint*) pfglWeightuivARB; 
    148     typedef void function(GLint, GLenum, GLsizei, GLvoid*) pfglWeightPointerARB; 
    149     typedef void function(GLint) pfglVertexBlendARB; 
    150 "; 
     138extern(System): 
    151139 
    152 version(Windows) 
    153 
    154     extern(Windows): mixin(Funcs); 
    155 
    156 else 
    157 
    158     extern(C): mixin(Funcs); 
    159 
     140typedef void function(GLint, GLbyte*) pfglWeightbvARB; 
     141typedef void function(GLint, GLshort*) pfglWeightsvARB; 
     142typedef void function(GLint, GLint*) pfglWeightivARB; 
     143typedef void function(GLint, GLfloat*) pfglWeightfvARB; 
     144typedef void function(GLint, GLdouble*) pfglWeightdvARB; 
     145typedef void function(GLint, GLubyte*) pfglWeightubvARB; 
     146typedef void function(GLint, GLushort*) pfglWeightusvARB; 
     147typedef void function(GLint, GLuint*) pfglWeightuivARB; 
     148typedef void function(GLint, GLenum, GLsizei, GLvoid*) pfglWeightPointerARB; 
     149typedef void function(GLint) pfglVertexBlendARB; 
    160150 
    161151pfglWeightbvARB             glWeightbvARB; 
  • trunk/DerelictGL/derelict/opengl/extension/arb/vertex_buffer_object.d

    r300 r303  
    130130} 
    131131 
    132 private const char[] Funcs = 
    133 
    134     typedef void function(GLenum, GLuint) pfglBindBufferARB; 
    135     typedef void function(GLsizei, GLuint*) pfglDeleteBuffersARB; 
    136     typedef void function(GLsizei, GLuint*) pfglGenBuffersARB; 
    137     typedef GLboolean function(GLuint) pfglIsBufferARB; 
    138     typedef void function(GLenum, GLsizeiptrARB, GLvoid*, GLenum) pfglBufferDataARB; 
    139     typedef void function(GLenum, GLintptrARB, GLsizeiptrARB, GLvoid*) pfglBufferSubDataARB; 
    140     typedef void function(GLenum, GLintptrARB, GLsizeiptrARB, GLvoid*) pfglGetBufferSubDataARB; 
    141     typedef GLvoid* function(GLenum, GLenum) pfglMapBufferARB; 
    142     typedef GLboolean function(GLenum) pfglUnmapBufferARB; 
    143     typedef void function(GLenum, GLenum, GLint*) pfglGetBufferParameterivARB; 
    144     typedef void function(GLenum, GLenum, GLvoid*) pfglGetBufferPointervARB; 
    145 "; 
     132extern(System): 
    146133 
    147 version(Windows) 
    148 
    149     extern(Windows): mixin(Funcs); 
    150 
    151 else 
    152 
    153     extern(C): mixin(Funcs); 
    154 
     134typedef void function(GLenum, GLuint) pfglBindBufferARB; 
     135typedef void function(GLsizei, GLuint*) pfglDeleteBuffersARB; 
     136typedef void function(GLsizei, GLuint*) pfglGenBuffersARB; 
     137typedef GLboolean function(GLuint) pfglIsBufferARB; 
     138typedef void function(GLenum, GLsizeiptrARB, GLvoid*, GLenum) pfglBufferDataARB; 
     139typedef void function(GLenum, GLintptrARB, GLsizeiptrARB, GLvoid*) pfglBufferSubDataARB; 
     140typedef void function(GLenum, GLintptrARB, GLsizeiptrARB, GLvoid*) pfglGetBufferSubDataARB; 
     141typedef GLvoid* function(GLenum, GLenum) pfglMapBufferARB; 
     142typedef GLboolean function(GLenum) pfglUnmapBufferARB; 
     143typedef void function(GLenum, GLenum, GLint*) pfglGetBufferParameterivARB; 
     144typedef void function(GLenum, GLenum, GLvoid*) pfglGetBufferPointervARB; 
    155145 
    156146pfglBindBufferARB               glBindBufferARB; 
  • trunk/DerelictGL/derelict/opengl/extension/arb/vertex_program.d

    r300 r303  
    277277} 
    278278 
    279 private const char[] Funcs = 
    280 
    281     typedef void function(GLuint, GLdouble) pfglVertexAttrib1dARB; 
    282     typedef void function(GLuint, GLdouble*) pfglVertexAttrib1dvARB; 
    283     typedef void function(GLuint, GLfloat) pfglVertexAttrib1fARB; 
    284     typedef void function(GLuint, GLfloat*) pfglVertexAttrib1fvARB; 
    285     typedef void function(GLuint, GLshort) pfglVertexAttrib1sARB; 
    286     typedef void function(GLuint, GLshort*) pfglVertexAttrib1svARB; 
    287     typedef void function(GLuint, GLdouble, GLdouble) pfglVertexAttrib2dARB; 
    288     typedef void function(GLuint, GLdouble*) pfglVertexAttrib2dvARB; 
    289     typedef void function(GLuint, GLfloat, GLfloat) pfglVertexAttrib2fARB; 
    290     typedef void function(GLuint, GLfloat*) pfglVertexAttrib2fvARB; 
    291     typedef void function(GLuint, GLshort, GLshort) pfglVertexAttrib2sARB; 
    292     typedef void function(GLuint, GLshort*) pfglVertexAttrib2svARB; 
    293     typedef void function(GLuint, GLdouble, GLdouble, GLdouble) pfglVertexAttrib3dARB; 
    294     typedef void function(GLuint, GLdouble*) pfglVertexAttrib3dvARB; 
    295     typedef void function(GLuint, GLfloat, GLfloat, GLfloat) pfglVertexAttrib3fARB; 
    296     typedef void function(GLuint, GLfloat*) pfglVertexAttrib3fvARB; 
    297     typedef void function(GLuint, GLshort, GLshort, GLshort) pfglVertexAttrib3sARB; 
    298     typedef void function(GLuint, GLshort*) pfglVertexAttrib3svARB; 
    299     typedef void function(GLuint, GLbyte*) pfglVertexAttrib4NbvARB; 
    300     typedef void function(GLuint, GLint*) pfglVertexAttrib4NivARB; 
    301     typedef void function(GLuint, GLshort*) pfglVertexAttrib4NsvARB; 
    302     typedef void function(GLuint, GLubyte, GLubyte, GLubyte, GLubyte) pfglVertexAttrib4NubARB; 
    303     typedef void function(GLuint, GLubyte*) pfglVertexAttrib4NubvARB; 
    304     typedef void function(GLuint, GLuint*) pfglVertexAttrib4NuivARB; 
    305     typedef void function(GLuint, GLushort*) pfglVertexAttrib4NusvARB; 
    306     typedef void function(GLuint, GLbyte*) pfglVertexAttrib4bvARB; 
    307     typedef void function(GLuint, GLdouble, GLdouble, GLdouble, GLdouble) pfglVertexAttrib4dARB; 
    308     typedef void function(GLuint, GLdouble*) pfglVertexAttrib4dvARB; 
    309     typedef void function(GLuint, GLfloat, GLfloat, GLfloat, GLfloat) pfglVertexAttrib4fARB; 
    310     typedef void function(GLuint, GLfloat*) pfglVertexAttrib4fvARB; 
    311     typedef void function(GLuint, GLint*) pfglVertexAttrib4ivARB; 
    312     typedef void function(GLuint, GLshort, GLshort, GLshort, GLshort) pfglVertexAttrib4sARB; 
    313     typedef void function(GLuint, GLshort*) pfglVertexAttrib4svARB; 
    314     typedef void function(GLuint, GLubyte*) pfglVertexAttrib4ubvARB; 
    315     typedef void function(GLuint, GLuint*) pfglVertexAttrib4uivARB; 
    316     typedef void function(GLuint, GLushort*) pfglVertexAttrib4usvARB; 
    317     typedef void function(GLuint, GLint, GLenum, GLboolean, GLsizei, GLvoid*) pfglVertexAttribPointerARB; 
    318     typedef void function(GLuint) pfglEnableVertexAttribArrayARB; 
    319     typedef void function(GLuint) pfglDisableVertexAttribArrayARB; 
    320     typedef void function(GLenum, GLenum, GLsizei, GLvoid*) pfglProgramStringARB; 
    321     typedef void function(GLenum, GLuint) pfglBindProgramARB; 
    322     typedef void function(GLsizei, GLuint*) pfglDeleteProgramsARB; 
    323     typedef void function(GLsizei, GLuint*) pfglGenProgramsARB; 
    324     typedef void function(GLenum, GLuint, GLdouble, GLdouble, GLdouble, GLdouble) pfglProgramEnvParameter4dARB; 
    325     typedef void function(GLenum, GLuint, GLdouble*) pfglProgramEnvParameter4dvARB; 
    326     typedef void function(GLenum, GLuint, GLfloat, GLfloat, GLfloat, GLfloat) pfglProgramEnvParameter4fARB; 
    327     typedef void function(GLenum, GLuint, GLfloat*) pfglProgramEnvParameter4fvARB; 
    328     typedef void function(GLenum, GLuint, GLdouble, GLdouble, GLdouble, GLdouble) pfglProgramLocalParameter4dARB; 
    329     typedef void function(GLenum, GLuint, GLdouble*) pfglProgramLocalParameter4dvARB; 
    330     typedef void function(GLenum, GLuint, GLfloat, GLfloat, GLfloat, GLfloat) pfglProgramLocalParameter4fARB; 
    331     typedef void function(GLenum, GLuint, GLfloat*) pfglProgramLocalParameter4fvARB; 
    332     typedef void function(GLenum, GLuint, GLdouble*) pfglGetProgramEnvParameterdvARB; 
    333     typedef void function(GLenum, GLuint, GLfloat*) pfglGetProgramEnvParameterfvARB; 
    334     typedef void function(GLenum, GLuint, GLdouble*) pfglGetProgramLocalParameterdvARB; 
    335     typedef void function(GLenum, GLuint, GLfloat*) pfglGetProgramLocalParameterfvARB; 
    336     typedef void function(GLenum, GLenum, GLint*) pfglGetProgramivARB; 
    337     typedef void function(GLenum, GLenum, GLvoid*) pfglGetProgramStringARB; 
    338     typedef void function(GLuint, GLenum, GLdouble*) pfglGetVertexAttribdvARB; 
    339     typedef void function(GLuint, GLenum, GLfloat*) pfglGetVertexAttribfvARB; 
    340     typedef void function(GLuint, GLenum, GLint*) pfglGetVertexAttribivARB; 
    341     typedef void function(GLuint, GLenum, GLvoid*) pfglGetVertexAttribPointervARB; 
    342     typedef GLboolean function(GLuint) pfglIsProgramARB; 
    343 "; 
    344  
    345 version(Windows) 
    346 
    347     extern(Windows): mixin(Funcs); 
    348 
    349 else 
    350 
    351     extern(C): mixin(Funcs); 
    352 
     279extern(System): 
     280 
     281typedef void function(GLuint, GLdouble) pfglVertexAttrib1dARB; 
     282typedef void function(GLuint, GLdouble*) pfglVertexAttrib1dvARB; 
     283typedef void function(GLuint, GLfloat) pfglVertexAttrib1fARB; 
     284typedef void function(GLuint, GLfloat*) pfglVertexAttrib1fvARB; 
     285typedef void function(GLuint, GLshort) pfglVertexAttrib1sARB; 
     286typedef void function(GLuint, GLshort*) pfglVertexAttrib1svARB; 
     287typedef void function(GLuint, GLdouble, GLdouble) pfglVertexAttrib2dARB; 
     288typedef void function(GLuint, GLdouble*) pfglVertexAttrib2dvARB; 
     289typedef void function(GLuint, GLfloat, GLfloat) pfglVertexAttrib2fARB; 
     290typedef void function(GLuint, GLfloat*) pfglVertexAttrib2fvARB; 
     291typedef void function(GLuint, GLshort, GLshort) pfglVertexAttrib2sARB; 
     292typedef void function(GLuint, GLshort*) pfglVertexAttrib2svARB; 
     293typedef void function(GLuint, GLdouble, GLdouble, GLdouble) pfglVertexAttrib3dARB; 
     294typedef void function(GLuint, GLdouble*) pfglVertexAttrib3dvARB; 
     295typedef void function(GLuint, GLfloat, GLfloat, GLfloat) pfglVertexAttrib3fARB; 
     296typedef void function(GLuint, GLfloat*) pfglVertexAttrib3fvARB; 
     297typedef void function(GLuint, GLshort, GLshort, GLshort) pfglVertexAttrib3sARB; 
     298typedef void function(GLuint, GLshort*) pfglVertexAttrib3svARB; 
     299typedef void function(GLuint, GLbyte*) pfglVertexAttrib4NbvARB; 
     300typedef void function(GLuint, GLint*) pfglVertexAttrib4NivARB; 
     301typedef void function(GLuint, GLshort*) pfglVertexAttrib4NsvARB; 
     302typedef void function(GLuint, GLubyte, GLubyte, GLubyte, GLubyte) pfglVertexAttrib4NubARB; 
     303typedef void function(GLuint, GLubyte*) pfglVertexAttrib4NubvARB; 
     304typedef void function(GLuint, GLuint*) pfglVertexAttrib4NuivARB; 
     305typedef void function(GLuint, GLushort*) pfglVertexAttrib4NusvARB; 
     306typedef void function(GLuint, GLbyte*) pfglVertexAttrib4bvARB; 
     307typedef void function(GLuint, GLdouble, GLdouble, GLdouble, GLdouble) pfglVertexAttrib4dARB; 
     308typedef void function(GLuint, GLdouble*) pfglVertexAttrib4dvARB; 
     309typedef void function(GLuint, GLfloat, GLfloat, GLfloat, GLfloat) pfglVertexAttrib4fARB; 
     310typedef void function(GLuint, GLfloat*) pfglVertexAttrib4fvARB; 
     311typedef void function(GLuint, GLint*) pfglVertexAttrib4ivARB; 
     312typedef void function(GLuint, GLshort, GLshort, GLshort, GLshort) pfglVertexAttrib4sARB; 
     313typedef void function(GLuint, GLshort*) pfglVertexAttrib4svARB; 
     314typedef void function(GLuint, GLubyte*) pfglVertexAttrib4ubvARB; 
     315typedef void function(GLuint, GLuint*) pfglVertexAttrib4uivARB; 
     316typedef void function(GLuint, GLushort*) pfglVertexAttrib4usvARB; 
     317typedef void function(GLuint, GLint, GLenum, GLboolean, GLsizei, GLvoid*) pfglVertexAttribPointerARB; 
     318typedef void function(GLuint) pfglEnableVertexAttribArrayARB; 
     319typedef void function(GLuint) pfglDisableVertexAttribArrayARB; 
     320typedef void function(GLenum, GLenum, GLsizei, GLvoid*) pfglProgramStringARB; 
     321typedef void function(GLenum, GLuint) pfglBindProgramARB; 
     322typedef void function(GLsizei, GLuint*) pfglDeleteProgramsARB; 
     323typedef void function(GLsizei, GLuint*) pfglGenProgramsARB; 
     324typedef void function(GLenum, GLuint, GLdouble, GLdouble, GLdouble, GLdouble) pfglProgramEnvParameter4dARB; 
     325typedef void function(GLenum, GLuint, GLdouble*) pfglProgramEnvParameter4dvARB; 
     326typedef void function(GLenum, GLuint, GLfloat, GLfloat, GLfloat, GLfloat) pfglProgramEnvParameter4fARB; 
     327typedef void function(GLenum, GLuint, GLfloat*) pfglProgramEnvParameter4fvARB; 
     328typedef void function(GLenum, GLuint, GLdouble, GLdouble, GLdouble, GLdouble) pfglProgramLocalParameter4dARB; 
     329typedef void function(GLenum, GLuint, GLdouble*) pfglProgramLocalParameter4dvARB; 
     330typedef void function(GLenum, GLuint, GLfloat, GLfloat, GLfloat, GLfloat) pfglProgramLocalParameter4fARB; 
     331typedef void function(GLenum, GLuint, GLfloat*) pfglProgramLocalParameter4fvARB; 
     332typedef void function(GLenum, GLuint, GLdouble*) pfglGetProgramEnvParameterdvARB; 
     333typedef void function(GLenum, GLuint, GLfloat*) pfglGetProgramEnvParameterfvARB; 
     334typedef void function(GLenum, GLuint, GLdouble*) pfglGetProgramLocalParameterdvARB; 
     335typedef void function(GLenum, GLuint, GLfloat*) pfglGetProgramLocalParameterfvARB; 
     336typedef void function(GLenum, GLenum, GLint*) pfglGetProgramivARB; 
     337typedef void function(GLenum, GLenum, GLvoid*) pfglGetProgramStringARB; 
     338typedef void function(GLuint, GLenum, GLdouble*) pfglGetVertexAttribdvARB; 
     339typedef void function(GLuint, GLenum, GLfloat*) pfglGetVertexAttribfvARB; 
     340typedef void function(GLuint, GLenum, GLint*) pfglGetVertexAttribivARB; 
     341typedef void function(GLuint, GLenum, GLvoid*) pfglGetVertexAttribPointervARB; 
     342typedef GLboolean function(GLuint) pfglIsProgramARB; 
    353343 
    354344pfglVertexAttrib1dARB               glVertexAttrib1dARB; 
  • trunk/DerelictGL/derelict/opengl/extension/arb/vertex_shader.d

    r300 r303  
    9393} 
    9494 
    95 private const char[] Funcs = 
    96 
    97     typedef void function (GLhandleARB, GLuint, GLcharARB*) pfglBindAttribLocationARB; 
    98     typedef void function (GLhandleARB, GLuint, GLsizei, GLsizei*, GLint*, GLenum*, GLcharARB*) pfglGetActiveAttribARB; 
    99     typedef GLint function (GLhandleARB, GLcharARB* name) pfglGetAttribLocationARB; 
    100 "; 
     95extern(System): 
    10196 
    102 version(Windows) 
    103 
    104     extern(Windows): mixin(Funcs); 
    105 
    106 else 
    107 
    108     extern(C): mixin(Funcs); 
    109 
     97typedef void function (GLhandleARB, GLuint, GLcharARB*) pfglBindAttribLocationARB; 
     98typedef void function (GLhandleARB, GLuint, GLsizei, GLsizei*, GLint*, GLenum*, GLcharARB*) pfglGetActiveAttribARB; 
     99typedef GLint function (GLhandleARB, GLcharARB* name) pfglGetAttribLocationARB; 
    110100 
    111101pfglBindAttribLocationARB           glBindAttribLocationARB; 
  • trunk/DerelictGL/derelict/opengl/extension/arb/window_pos.d

    r300 r303  
    102102} 
    103103 
    104 private const char[] Funcs = 
    105