Show
Ignore:
Timestamp:
07/15/07 23:12:21 (1 year ago)
Author:
JoeCoder
Message:

Updated to latest Derelict, DMD 1.018 now supported.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/src/derelict/opengl/extension/arb/shader_objects.d

    r32 r50  
    189189alias uint GLhandleARB; 
    190190 
     191private 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 
    191234version(Windows) 
    192235{ 
    193     extern(Windows): 
     236    extern(Windows): mixin(Funcs); 
    194237} 
    195238else 
    196239{ 
    197     extern(C): 
    198 } 
    199  
    200 typedef void function(GLhandleARB) pfglDeleteObjectARB; 
    201 typedef GLhandleARB function(GLenum) pfglGetHandleARB; 
    202 typedef void function(GLhandleARB, GLhandleARB) pfglDetachObjectARB; 
    203 typedef GLhandleARB function(GLenum) pfglCreateShaderObjectARB; 
    204 typedef void function(GLhandleARB, GLsizei, GLcharARB**, GLint*) pfglShaderSourceARB; 
    205 typedef void function(GLhandleARB) pfglCompileShaderARB; 
    206 typedef GLhandleARB function() pfglCreateProgramObjectARB; 
    207 typedef void function(GLhandleARB, GLhandleARB) pfglAttachObjectARB; 
    208 typedef void function(GLhandleARB) pfglLinkProgramARB; 
    209 typedef void function(GLhandleARB) pfglUseProgramObjectARB; 
    210 typedef void function(GLhandleARB) pfglValidateProgramARB; 
    211 typedef void function(GLint, GLfloat) pfglUniform1fARB; 
    212 typedef void function(GLint, GLfloat, GLfloat) pfglUniform2fARB; 
    213 typedef void function(GLint, GLfloat, GLfloat, GLfloat) pfglUniform3fARB; 
    214 typedef void function(GLint, GLfloat, GLfloat, GLfloat, GLfloat) pfglUniform4fARB; 
    215 typedef void function(GLint, GLint) pfglUniform1iARB; 
    216 typedef void function(GLint, GLint, GLint) pfglUniform2iARB; 
    217 typedef void function(GLint, GLint, GLint, GLint) pfglUniform3iARB; 
    218 typedef void function(GLint, GLint, GLint, GLint, GLint) pfglUniform4iARB; 
    219 typedef void function(GLint, GLsizei, GLfloat*) pfglUniform1fvARB; 
    220 typedef void function(GLint, GLsizei, GLfloat*) pfglUniform2fvARB; 
    221 typedef void function(GLint, GLsizei, GLfloat*) pfglUniform3fvARB; 
    222 typedef void function(GLint, GLsizei, GLfloat*) pfglUniform4fvARB; 
    223 typedef void function(GLint, GLsizei, GLint*) pfglUniform1ivARB; 
    224 typedef void function(GLint, GLsizei, GLint*) pfglUniform2ivARB; 
    225 typedef void function(GLint, GLsizei, GLint*) pfglUniform3ivARB; 
    226 typedef void function(GLint, GLsizei, GLint*) pfglUniform4ivARB; 
    227 typedef void function(GLint, GLsizei, GLboolean, GLfloat*) pfglUniformMatrix2fvARB; 
    228 typedef void function(GLint, GLsizei, GLboolean, GLfloat*) pfglUniformMatrix3fvARB; 
    229 typedef void function(GLint, GLsizei, GLboolean, GLfloat*) pfglUniformMatrix4fvARB; 
    230 typedef void function(GLhandleARB, GLenum, GLfloat*) pfglGetObjectParameterfvARB; 
    231 typedef void function(GLhandleARB, GLenum, GLint*) pfglGetObjectParameterivARB; 
    232 typedef void function(GLhandleARB, GLsizei, GLsizei*, GLcharARB*) pfglGetInfoLogARB; 
    233 typedef void function(GLhandleARB, GLsizei, GLsizei*, GLhandleARB*) pfglGetAttachedObjectsARB; 
    234 typedef GLint function(GLhandleARB, GLcharARB*) pfglGetUniformLocationARB; 
    235 typedef void function(GLhandleARB, GLuint, GLsizei, GLsizei*, GLint*, GLenum*, GLcharARB*) pfglGetActiveUniformARB; 
    236 typedef void function(GLhandleARB, GLint, GLfloat*) pfglGetUniformfvARB; 
    237 typedef void function(GLhandleARB, GLint, GLint*) pfglGetUniformivARB; 
    238 typedef void function(GLhandleARB, GLsizei, GLsizei*, GLcharARB*) pfglGetShaderSourceARB; 
     240    extern(C): mixin(Funcs); 
     241} 
     242 
    239243pfglDeleteObjectARB                     glDeleteObjectARB; 
    240244pfglGetHandleARB                        glGetHandleARB;