Changeset 165

Show
Ignore:
Timestamp:
07/30/06 12:24:45 (2 years ago)
Author:
aldacron
Message:

* updated derelictify.html to reflect Tom's OPTLINK comaptability changes to the the loading mechanism (i.e. the ditiching of templates for structs)
* updated gl.html to reflect the new version loading system
* the original implementation of the version loading system wasn't actually behaving as I had described it, so I changed the behavior - including an interface breaking change (loadVersions no longer has a bool return, but is declared void instead)
* the version loading system now has 100% support for selective loading for those who need it

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/DerelictGL/derelict/opengl/gl.d

    r164 r165  
    114114    } 
    115115     
    116     static bool loadVersions(GLVersion minVersion) 
     116    static void loadVersions(GLVersion minVersion) 
    117117    { 
    118118        version(Windows) 
    …… 
    125125            setVersion(); 
    126126             
    127          
    128         // version 1.2 
    129         if(minVersion >= GLVersion.Version12) 
    130             if(!loadVersion(&loadGL12, GLVersion.Version12))             
    131                 return false; 
    132         // version 1.3   
    133         if(minVersion >= GLVersion.Version13) 
    134             if(!loadVersion(&loadGL13, GLVersion.Version13))             
    135                 return false;            
    136         // version 1.4       
    137         if(minVersion >= GLVersion.Version14) 
    138             if(!loadVersion(&loadGL14, GLVersion.Version14)) 
    139                 return false; 
    140         // version 1.5   
    141         if(minVersion >= GLVersion.Version15) 
    142             if(!loadVersion(&loadGL15, GLVersion.Version15)) 
    143                 return false; 
    144         // version 2.0   
    145         if(minVersion >= GLVersion.Version20) 
    146             if(!loadVersion(&loadGL20, GLVersion.Version20)) 
    147                 return false; 
    148              
    149         // at this point, the supported version has been verified, so set 
    150          
    151         return true; 
     127        try  
     128        { 
     129            // version 1.2 
     130            if(minVersion >= GLVersion.Version12) 
     131                loadVersion(&loadGL12, GLVersion.Version12);     
     132                 
     133            // version 1.3   
     134            if(minVersion >= GLVersion.Version13) 
     135                loadVersion(&loadGL13, GLVersion.Version13); 
     136                 
     137            // version 1.4       
     138            if(minVersion >= GLVersion.Version14) 
     139                loadVersion(&loadGL14, GLVersion.Version14); 
     140                 
     141            // version 1.5   
     142            if(minVersion >= GLVersion.Version15) 
     143                loadVersion(&loadGL15, GLVersion.Version15); 
     144                 
     145            // version 2.0   
     146            if(minVersion >= GLVersion.Version20) 
     147                loadVersion(&loadGL20, GLVersion.Version20); 
     148        } 
     149        catch(SharedLibProcLoadException slple)  
     150        { 
     151            if(maxVersionAvail >= minVersion) 
     152                return; 
     153            else 
     154                throw slple;     
     155        } 
    152156    } 
    153157     
    …… 
    203207    } 
    204208     
    205     private static bool loadVersion(bool function(SharedLib) loadFunc, GLVersion glv) 
    206     { 
    207         if(!loadFunc(glLib)) 
    208         { 
    209             if(glv <= maxVersionAvail) 
    210             { 
    211                 // if the minimum version requested is reported to be supported 
    212                 // (as per maxVersionAvail), throw an Exception 
    213                 throw new SharedLibProcLoadException( 
    214                     "OpenGL reports that " ~ versionString(maxVersionAvail) ~ 
    215                     " is supported, but failed to load " ~ versionString(glv)); 
    216             } 
    217             else 
    218             { 
    219                 return false; 
    220             } 
    221         } 
     209    private static void loadVersion(void function(SharedLib) loadFunc, GLVersion glv) 
     210    {        
     211        loadFunc(glLib);     
    222212        loadedVersion = glv; 
    223213        return true; 

  • trunk/DerelictGL/derelict/opengl/gl12.d

    r164 r165  
    4141} 
    4242 
    43 package bool loadGL12(SharedLib lib) 
     43package void loadGL12(SharedLib lib) 
    4444{ 
    4545    version(Windows) 
    4646    { 
    47         if(!wglBindFunc(cast(void**)&glDrawRangeElements, "glDrawRangeElements")) return false; 
    48         if(!wglBindFunc(cast(void**)&glTexImage3D, "glTexImage3D")) return false; 
    49         if(!wglBindFunc(cast(void**)&glTexSubImage3D, "glTexSubImage3D")) return false; 
    50         if(!wglBindFunc(cast(void**)&glTexSubImage3D, "glTexSubImage3D")) return false; 
     47        wglBindFunc(cast(void**)&glDrawRangeElements, "glDrawRangeElements", lib); 
     48        wglBindFunc(cast(void**)&glTexImage3D, "glTexImage3D", lib); 
     49        wglBindFunc(cast(void**)&glTexSubImage3D, "glTexSubImage3D", lib); 
     50        wglBindFunc(cast(void**)&glTexSubImage3D, "glTexSubImage3D", lib); 
    5151    } 
    5252    else 
    5353    { 
    54         try 
    55         { 
    56             bindFunc(glDrawRangeElements)("glDrawRangeElements", lib); 
    57             bindFunc(glTexImage3D)("glTexImage3D", lib); 
    58             bindFunc(glTexSubImage3D)("glTexSubImage3D", lib); 
    59             bindFunc(glTexSubImage3D)("glTexSubImage3D", lib); 
    60         } 
    61         catch(SharedLibProcLoadException(slple)) 
    62         { 
    63             return false; 
    64         } 
     54        bindFunc(glDrawRangeElements)("glDrawRangeElements", lib); 
     55        bindFunc(glTexImage3D)("glTexImage3D", lib); 
     56        bindFunc(glTexSubImage3D)("glTexSubImage3D", lib); 
     57        bindFunc(glTexSubImage3D)("glTexSubImage3D", lib); 
    6558    } 
    66  
    67     return true; 
    6859} 
    6960 

  • trunk/DerelictGL/derelict/opengl/gl13.d

    r164 r165  
    4141} 
    4242 
    43 package bool loadGL13(SharedLib lib) 
     43package void loadGL13(SharedLib lib) 
    4444{ 
    4545    version(Windows) 
    4646    { 
    47         wglBindFunc(cast(void**)&glActiveTexture, "glActiveTexture"); 
    48         wglBindFunc(cast(void**)&glClientActiveTexture, "glClientActiveTexture"); 
    49         wglBindFunc(cast(void**)&glMultiTexCoord1d, "glMultiTexCoord1d"); 
    50         wglBindFunc(cast(void**)&glMultiTexCoord1dv, "glMultiTexCoord1dv"); 
    51         wglBindFunc(cast(void**)&glMultiTexCoord1f, "glMultiTexCoord1f"); 
    52         wglBindFunc(cast(void**)&glMultiTexCoord1fv, "glMultiTexCoord1fv"); 
    53         wglBindFunc(cast(void**)&glMultiTexCoord1i, "glMultiTexCoord1i"); 
    54         wglBindFunc(cast(void**)&glMultiTexCoord1iv, "glMultiTexCoord1iv"); 
    55         wglBindFunc(cast(void**)&glMultiTexCoord1s, "glMultiTexCoord1s"); 
    56         wglBindFunc(cast(void**)&glMultiTexCoord1sv, "glMultiTexCoord1sv"); 
    57         wglBindFunc(cast(void**)&glMultiTexCoord2d, "glMultiTexCoord2d"); 
    58         wglBindFunc(cast(void**)&glMultiTexCoord2dv, "glMultiTexCoord2dv"); 
    59         wglBindFunc(cast(void**)&glMultiTexCoord2f, "glMultiTexCoord2f"); 
    60         wglBindFunc(cast(void**)&glMultiTexCoord2fv, "glMultiTexCoord2fv"); 
    61         wglBindFunc(cast(void**)&glMultiTexCoord2i, "glMultiTexCoord2i"); 
    62         wglBindFunc(cast(void**)&glMultiTexCoord2iv, "glMultiTexCoord2iv"); 
    63         wglBindFunc(cast(void**)&glMultiTexCoord2s, "glMultiTexCoord2s"); 
    64         wglBindFunc(cast(void**)&glMultiTexCoord2sv, "glMultiTexCoord2s"); 
    65         wglBindFunc(cast(void**)&glMultiTexCoord3d, "glMultiTexCoord3d"); 
    66         wglBindFunc(cast(void**)&glMultiTexCoord3dv, "glMultiTexCoord3d"); 
    67         wglBindFunc(cast(void**)&glMultiTexCoord3f, "glMultiTexCoord3f"); 
    68         wglBindFunc(cast(void**)&glMultiTexCoord3fv, "glMultiTexCoord3fv"); 
    69         wglBindFunc(cast(void**)&glMultiTexCoord3i, "glMultiTexCoord3i"); 
    70         wglBindFunc(cast(void**)&glMultiTexCoord3iv, "glMultiTexCoord3iv"); 
    71         wglBindFunc(cast(void**)&glMultiTexCoord3s, "glMultiTexCoord3s"); 
    72         wglBindFunc(cast(void**)&glMultiTexCoord3sv, "glMultiTexCoord3sv"); 
    73         wglBindFunc(cast(void**)&glMultiTexCoord4d, "glMultiTexCoord4d"); 
    74         wglBindFunc(cast(void**)&glMultiTexCoord4dv, "glMultiTexCoord4dv"); 
    75         wglBindFunc(cast(void**)&glMultiTexCoord4f, "glMultiTexCoord4f"); 
    76         wglBindFunc(cast(void**)&glMultiTexCoord4fv, "glMultiTexCoord4fv"); 
    77         wglBindFunc(cast(void**)&glMultiTexCoord4i, "glMultiTexCoord4i"); 
    78         wglBindFunc(cast(void**)&glMultiTexCoord4iv, "glMultiTexCoord4iv"); 
    79         wglBindFunc(cast(void**)&glMultiTexCoord4s, "glMultiTexCoord4s"); 
    80         wglBindFunc(cast(void**)&glMultiTexCoord4sv, "glMultiTexCoord4sv"); 
    81         wglBindFunc(cast(void**)&glLoadTransposeMatrixd, "glLoadTransposeMatrixd"); 
    82         wglBindFunc(cast(void**)&glLoadTransposeMatrixf, "glLoadTransposeMatrixf"); 
    83         wglBindFunc(cast(void**)&glMultTransposeMatrixd, "glMultTransposeMatrixd"); 
    84         wglBindFunc(cast(void**)&glMultTransposeMatrixf, "glMultTransposeMatrixf"); 
    85         wglBindFunc(cast(void**)&glSampleCoverage, "glSampleCoverage"); 
    86         wglBindFunc(cast(void**)&glCompressedTexImage1D, "glCompressedTexImage1D"); 
    87         wglBindFunc(cast(void**)&glCompressedTexImage2D, "glCompressedTexImage2D"); 
    88         wglBindFunc(cast(void**)&glCompressedTexImage3D, "glCompressedTexImage3D"); 
    89         wglBindFunc(cast(void**)&glCompressedTexSubImage1D, "glCompressedTexSubImage1D"); 
    90         wglBindFunc(cast(void**)&glCompressedTexSubImage2D, "glCompressedTexSubImage2D"); 
    91         wglBindFunc(cast(void**)&glCompressedTexSubImage3D, "glCompressedTexSubImage3D"); 
    92         wglBindFunc(cast(void**)&glGetCompressedTexImage, "glGetCompressedTexImage"); 
     47        wglBindFunc(cast(void**)&glActiveTexture, "glActiveTexture", lib); 
     48        wglBindFunc(cast(void**)&glClientActiveTexture, "glClientActiveTexture", lib); 
     49        wglBindFunc(cast(void**)&glMultiTexCoord1d, "glMultiTexCoord1d", lib); 
     50        wglBindFunc(cast(void**)&glMultiTexCoord1dv, "glMultiTexCoord1dv", lib); 
     51        wglBindFunc(cast(void**)&glMultiTexCoord1f, "glMultiTexCoord1f", lib); 
     52        wglBindFunc(cast(void**)&glMultiTexCoord1fv, "glMultiTexCoord1fv", lib); 
     53        wglBindFunc(cast(void**)&glMultiTexCoord1i, "glMultiTexCoord1i", lib); 
     54        wglBindFunc(cast(void**)&glMultiTexCoord1iv, "glMultiTexCoord1iv", lib); 
     55        wglBindFunc(cast(void**)&glMultiTexCoord1s, "glMultiTexCoord1s", lib); 
     56        wglBindFunc(cast(void**)&glMultiTexCoord1sv, "glMultiTexCoord1sv", lib); 
     57        wglBindFunc(cast(void**)&glMultiTexCoord2d, "glMultiTexCoord2d", lib); 
     58        wglBindFunc(cast(void**)&glMultiTexCoord2dv, "glMultiTexCoord2dv", lib); 
     59        wglBindFunc(cast(void**)&glMultiTexCoord2f, "glMultiTexCoord2f", lib); 
     60        wglBindFunc(cast(void**)&glMultiTexCoord2fv, "glMultiTexCoord2fv", lib); 
     61        wglBindFunc(cast(void**)&glMultiTexCoord2i, "glMultiTexCoord2i", lib); 
     62        wglBindFunc(cast(void**)&glMultiTexCoord2iv, "glMultiTexCoord2iv", lib); 
     63        wglBindFunc(cast(void**)&glMultiTexCoord2s, "glMultiTexCoord2s", lib); 
     64        wglBindFunc(cast(void**)&glMultiTexCoord2sv, "glMultiTexCoord2s", lib); 
     65        wglBindFunc(cast(void**)&glMultiTexCoord3d, "glMultiTexCoord3d", lib); 
     66        wglBindFunc(cast(void**)&glMultiTexCoord3dv, "glMultiTexCoord3d", lib); 
     67        wglBindFunc(cast(void**)&glMultiTexCoord3f, "glMultiTexCoord3f", lib); 
     68        wglBindFunc(cast(void**)&glMultiTexCoord3fv, "glMultiTexCoord3fv", lib); 
     69        wglBindFunc(cast(void**)&glMultiTexCoord3i, "glMultiTexCoord3i", lib); 
     70        wglBindFunc(cast(void**)&glMultiTexCoord3iv, "glMultiTexCoord3iv", lib); 
     71        wglBindFunc(cast(void**)&glMultiTexCoord3s, "glMultiTexCoord3s", lib); 
     72        wglBindFunc(cast(void**)&glMultiTexCoord3sv, "glMultiTexCoord3sv", lib); 
     73        wglBindFunc(cast(void**)&glMultiTexCoord4d, "glMultiTexCoord4d", lib); 
     74        wglBindFunc(cast(void**)&glMultiTexCoord4dv, "glMultiTexCoord4dv", lib); 
     75        wglBindFunc(cast(void**)&glMultiTexCoord4f, "glMultiTexCoord4f", lib); 
     76        wglBindFunc(cast(void**)&glMultiTexCoord4fv, "glMultiTexCoord4fv", lib); 
     77        wglBindFunc(cast(void**)&glMultiTexCoord4i, "glMultiTexCoord4i", lib); 
     78        wglBindFunc(cast(void**)&glMultiTexCoord4iv, "glMultiTexCoord4iv", lib); 
     79        wglBindFunc(cast(void**)&glMultiTexCoord4s, "glMultiTexCoord4s", lib); 
     80        wglBindFunc(cast(void**)&glMultiTexCoord4sv, "glMultiTexCoord4sv", lib); 
     81        wglBindFunc(cast(void**)&glLoadTransposeMatrixd, "glLoadTransposeMatrixd", lib); 
     82        wglBindFunc(cast(void**)&glLoadTransposeMatrixf, "glLoadTransposeMatrixf", lib); 
     83        wglBindFunc(cast(void**)&glMultTransposeMatrixd, "glMultTransposeMatrixd", lib); 
     84        wglBindFunc(cast(void**)&glMultTransposeMatrixf, "glMultTransposeMatrixf", lib); 
     85        wglBindFunc(cast(void**)&glSampleCoverage, "glSampleCoverage", lib); 
     86        wglBindFunc(cast(void**)&glCompressedTexImage1D, "glCompressedTexImage1D", lib); 
     87        wglBindFunc(cast(void**)&glCompressedTexImage2D, "glCompressedTexImage2D", lib); 
     88        wglBindFunc(cast(void**)&glCompressedTexImage3D, "glCompressedTexImage3D", lib); 
     89        wglBindFunc(cast(void**)&glCompressedTexSubImage1D, "glCompressedTexSubImage1D", lib); 
     90        wglBindFunc(cast(void**)&glCompressedTexSubImage2D, "glCompressedTexSubImage2D", lib); 
     91        wglBindFunc(cast(void**)&glCompressedTexSubImage3D, "glCompressedTexSubImage3D", lib); 
     92        wglBindFunc(cast(void**)&glGetCompressedTexImage, "glGetCompressedTexImage", lib); 
    9393    } 
    9494    else 
    9595    { 
    96         try 
    97         { 
    98             bindFunc(glActiveTexture)("glActiveTexture", lib); 
    99             bindFunc(glClientActiveTexture)("glClientActiveTexture", lib); 
    100             bindFunc(glMultiTexCoord1d)("glMultiTexCoord1d", lib); 
    101             bindFunc(glMultiTexCoord1dv)("glMultiTexCoord1dv", lib); 
    102             bindFunc(glMultiTexCoord1f)("glMultiTexCoord1f", lib); 
    103             bindFunc(glMultiTexCoord1fv)("glMultiTexCoord1fv", lib); 
    104             bindFunc(glMultiTexCoord1i)("glMultiTexCoord1i", lib); 
    105             bindFunc(glMultiTexCoord1iv)("glMultiTexCoord1iv", lib); 
    106             bindFunc(glMultiTexCoord1s)("glMultiTexCoord1s", lib); 
    107             bindFunc(glMultiTexCoord1sv)("glMultiTexCoord1sv", lib); 
    108             bindFunc(glMultiTexCoord2d)("glMultiTexCoord2d", lib); 
    109             bindFunc(glMultiTexCoord2dv)("glMultiTexCoord2dv", lib); 
    110             bindFunc(glMultiTexCoord2f)("glMultiTexCoord2f", lib); 
    111             bindFunc(glMultiTexCoord2fv)("glMultiTexCoord2fv", lib); 
    112             bindFunc(glMultiTexCoord2i)("glMultiTexCoord2i", lib); 
    113             bindFunc(glMultiTexCoord2iv)("glMultiTexCoord2iv", lib); 
    114             bindFunc(glMultiTexCoord2s)("glMultiTexCoord2s", lib); 
    115             bindFunc(glMultiTexCoord2sv)("glMultiTexCoord2s", lib); 
    116             bindFunc(glMultiTexCoord3d)("glMultiTexCoord3d", lib); 
    117             bindFunc(glMultiTexCoord3dv)("glMultiTexCoord3d", lib); 
    118             bindFunc(glMultiTexCoord3f)("glMultiTexCoord3f", lib); 
    119             bindFunc(glMultiTexCoord3fv)("glMultiTexCoord3fv", lib); 
    120             bindFunc(glMultiTexCoord3i)("glMultiTexCoord3i", lib); 
    121             bindFunc(glMultiTexCoord3iv)("glMultiTexCoord3iv", lib); 
    122             bindFunc(glMultiTexCoord3s)("glMultiTexCoord3s", lib); 
    123             bindFunc(glMultiTexCoord3sv)("glMultiTexCoord3sv", lib); 
    124             bindFunc(glMultiTexCoord4d)("glMultiTexCoord4d", lib); 
    125             bindFunc(glMultiTexCoord4dv)("glMultiTexCoord4dv", lib); 
    126             bindFunc(glMultiTexCoord4f)("glMultiTexCoord4f", lib); 
    127             bindFunc(glMultiTexCoord4fv)("glMultiTexCoord4fv", lib); 
    128             bindFunc(glMultiTexCoord4i)("glMultiTexCoord4i", lib); 
    129             bindFunc(glMultiTexCoord4iv)("glMultiTexCoord4iv", lib); 
    130             bindFunc(glMultiTexCoord4s)("glMultiTexCoord4s", lib); 
    131             bindFunc(glMultiTexCoord4sv)("glMultiTexCoord4sv", lib); 
    132             bindFunc(glLoadTransposeMatrixd)("glLoadTransposeMatrixd", lib); 
    133             bindFunc(glLoadTransposeMatrixf)("glLoadTransposeMatrixf", lib); 
    134             bindFunc(glMultTransposeMatrixd)("glMultTransposeMatrixd", lib); 
    135             bindFunc(glMultTransposeMatrixf)("glMultTransposeMatrixf", lib); 
    136             bindFunc(glSampleCoverage)("glSampleCoverage", lib); 
    137             bindFunc(glCompressedTexImage1D)("glCompressedTexImage1D", lib); 
    138             bindFunc(glCompressedTexImage2D)("glCompressedTexImage2D", lib); 
    139             bindFunc(glCompressedTexImage3D)("glCompressedTexImage3D", lib); 
    140             bindFunc(glCompressedTexSubImage1D)("glCompressedTexSubImage1D", lib); 
    141             bindFunc(glCompressedTexSubImage2D)("glCompressedTexSubImage2D", lib); 
    142             bindFunc(glCompressedTexSubImage3D)("glCompressedTexSubImage3D", lib); 
    143             bindFunc(glGetCompressedTexImage)("glGetCompressedTexImage", lib); 
    144         } 
    145         catch(SharedLibProcLoadException slple) 
    146         { 
    147             return false; 
    148         } 
     96        bindFunc(glActiveTexture)("glActiveTexture", lib); 
     97        bindFunc(glClientActiveTexture)("glClientActiveTexture", lib); 
     98        bindFunc(glMultiTexCoord1d)("glMultiTexCoord1d", lib); 
     99        bindFunc(glMultiTexCoord1dv)("glMultiTexCoord1dv", lib); 
     100        bindFunc(glMultiTexCoord1f)("glMultiTexCoord1f", lib); 
     101        bindFunc(glMultiTexCoord1fv)("glMultiTexCoord1fv", lib); 
     102        bindFunc(glMultiTexCoord1i)("glMultiTexCoord1i", lib); 
     103        bindFunc(glMultiTexCoord1iv)("glMultiTexCoord1iv", lib); 
     104        bindFunc(glMultiTexCoord1s)("glMultiTexCoord1s", lib); 
     105        bindFunc(glMultiTexCoord1sv)("glMultiTexCoord1sv", lib); 
     106        bindFunc(glMultiTexCoord2d)("glMultiTexCoord2d", lib); 
     107        bindFunc(glMultiTexCoord2dv)("glMultiTexCoord2dv", lib); 
     108        bindFunc(glMultiTexCoord2f)("glMultiTexCoord2f", lib); 
     109        bindFunc(glMultiTexCoord2fv)("glMultiTexCoord2fv", lib); 
     110        bindFunc(glMultiTexCoord2i)("glMultiTexCoord2i", lib); 
     111        bindFunc(glMultiTexCoord2iv)("glMultiTexCoord2iv", lib); 
     112        bindFunc(glMultiTexCoord2s)("glMultiTexCoord2s", lib); 
     113        bindFunc(glMultiTexCoord2sv)("glMultiTexCoord2s", lib); 
     114        bindFunc(glMultiTexCoord3d)("glMultiTexCoord3d", lib); 
     115        bindFunc(glMultiTexCoord3dv)("glMultiTexCoord3d", lib); 
     116        bindFunc(glMultiTexCoord3f)("glMultiTexCoord3f", lib); 
     117        bindFunc(glMultiTexCoord3fv)("glMultiTexCoord3fv", lib); 
     118        bindFunc(glMultiTexCoord3i)("glMultiTexCoord3i", lib); 
     119        bindFunc(glMultiTexCoord3iv)("glMultiTexCoord3iv", lib); 
     120        bindFunc(glMultiTexCoord3s)("glMultiTexCoord3s", lib); 
     121        bindFunc(glMultiTexCoord3sv)("glMultiTexCoord3sv", lib); 
     122        bindFunc(glMultiTexCoord4d)("glMultiTexCoord4d", lib); 
     123        bindFunc(glMultiTexCoord4dv)("glMultiTexCoord4dv", lib); 
     124        bindFunc(glMultiTexCoord4f)("glMultiTexCoord4f", lib); 
     125        bindFunc(glMultiTexCoord4fv)("glMultiTexCoord4fv", lib); 
     126        bindFunc(glMultiTexCoord4i)("glMultiTexCoord4i", lib); 
     127        bindFunc(glMultiTexCoord4iv)("glMultiTexCoord4iv", lib); 
     128        bindFunc(glMultiTexCoord4s)("glMultiTexCoord4s", lib); 
     129        bindFunc(glMultiTexCoord4sv)("glMultiTexCoord4sv", lib); 
     130        bindFunc(glLoadTransposeMatrixd)("glLoadTransposeMatrixd", lib); 
     131        bindFunc(glLoadTransposeMatrixf)("glLoadTransposeMatrixf", lib); 
     132        bindFunc(glMultTransposeMatrixd)("glMultTransposeMatrixd", lib); 
     133        bindFunc(glMultTransposeMatrixf)("glMultTransposeMatrixf", lib); 
     134        bindFunc(glSampleCoverage)("glSampleCoverage", lib); 
     135        bindFunc(glCompressedTexImage1D)("glCompressedTexImage1D", lib); 
     136        bindFunc(glCompressedTexImage2D)("glCompressedTexImage2D", lib); 
     137        bindFunc(glCompressedTexImage3D)("glCompressedTexImage3D", lib); 
     138        bindFunc(glCompressedTexSubImage1D)("glCompressedTexSubImage1D", lib); 
     139        bindFunc(glCompressedTexSubImage2D)("glCompressedTexSubImage2D", lib); 
     140        bindFunc(glCompressedTexSubImage3D)("glCompressedTexSubImage3D", lib); 
     141        bindFunc(glGetCompressedTexImage)("glGetCompressedTexImage", lib); 
    149142    } 
    150     return true; 
    151143} 
    152144 

  • trunk/DerelictGL/derelict/opengl/gl14.d

    r164 r165  
    4141} 
    4242 
    43 package bool loadGL14(SharedLib lib) 
     43package void loadGL14(SharedLib lib) 
    4444{ 
    4545    version(Windows) 
    4646    { 
    47         if(!wglBindFunc(cast(void**)&glBlendFuncSeparate, "glBlendFuncSeparate")) return false; 
    48         if(!wglBindFunc(cast(void**)&glFogCoordf, "glFogCoordf")) return false; 
    49         if(!wglBindFunc(cast(void**)&glFogCoordfv, "glFogCoordfv")) return false; 
    50         if(!wglBindFunc(cast(void**)&glFogCoordd, "glFogCoordd")) return false; 
    51         if(!wglBindFunc(cast(void**)&glFogCoorddv, "glFogCoorddv")) return false; 
    52         if(!wglBindFunc(cast(void**)&glFogCoordPointer, "glFogCoordPointer")) return false; 
    53         if(!wglBindFunc(cast(void**)&glMultiDrawArrays, "glMultiDrawArrays")) return false; 
    54         if(!wglBindFunc(cast(void**)&glMultiDrawElements, "glMultiDrawElements")) return false; 
    55         if(!wglBindFunc(cast(void**)&glPointParameterf, "glPointParameterf")) return false; 
    56         if(!wglBindFunc(cast(void**)&glPointParameterfv, "glPointParameterfv")) return false; 
    57         if(!wglBindFunc(cast(void**)&glPointParameteri, "glPointParameteri")) return false; 
    58         if(!wglBindFunc(cast(void**)&glPointParameteriv, "glPointParameteriv")) return false; 
    59         if(!wglBindFunc(cast(void**)&glSecondaryColor3b, "glSecondaryColor3b")) return false; 
    60         if(!wglBindFunc(cast(void**)&glSecondaryColor3bv, "glSecondaryColor3bv")) return false; 
    61         if(!wglBindFunc(cast(void**)&glSecondaryColor3d, "glSecondaryColor3d")) return false; 
    62         if(!wglBindFunc(cast(void**)&glSecondaryColor3dv, "glSecondaryColor3dv")) return false; 
    63         if(!wglBindFunc(cast(void**)&glSecondaryColor3f, "glSecondaryColor3f")) return false; 
    64         if(!wglBindFunc(cast(void**)&glSecondaryColor3fv, "glSecondaryColor3fv")) return false; 
    65         if(!wglBindFunc(cast(void**)&glSecondaryColor3i, "glSecondaryColor3i")) return false; 
    66         if(!wglBindFunc(cast(void**)&glSecondaryColor3iv, "glSecondaryColor3iv")) return false; 
    67         if(!wglBindFunc(cast(void**)&glSecondaryColor3s, "glSecondaryColor3s")) return false; 
    68         if(!wglBindFunc(cast(void**)&glSecondaryColor3sv, "glSecondaryColor3sv")) return false; 
    69         if(!wglBindFunc(cast(void**)&glSecondaryColor3ub, "glSecondaryColor3ub")) return false; 
    70         if(!wglBindFunc(cast(void**)&glSecondaryColor3ubv, "glSecondaryColor3ubv")) return false; 
    71         if(!wglBindFunc(cast(void**)&glSecondaryColor3ui, "glSecondaryColor3ui")) return false; 
    72         if(!wglBindFunc(cast(void**)&glSecondaryColor3uiv, "glSecondaryColor3uiv")) return false; 
    73         if(!wglBindFunc(cast(void**)&glSecondaryColor3us, "glSecondaryColor3us")) return false; 
    74         if(!wglBindFunc(cast(void**)&glSecondaryColor3usv, "glSecondaryColor3usv")) return false; 
    75         if(!wglBindFunc(cast(void**)&glSecondaryColorPointer, "glSecondaryColorPointer")) return false; 
    76         if(!wglBindFunc(cast(void**)&glWindowPos2d, "glWindowPos2d")) return false; 
    77         if(!wglBindFunc(cast(void**)&glWindowPos2dv, "glWindowPos2dv")) return false; 
    78         if(!wglBindFunc(cast(void**)&glWindowPos2f, "glWindowPos2f")) return false; 
    79         if(!wglBindFunc(cast(void**)&glWindowPos2fv, "glWindowPos2fv")) return false; 
    80         if(!wglBindFunc(cast(void**)&glWindowPos2i, "glWindowPos2i")) return false; 
    81         if(!wglBindFunc(cast(void**)&glWindowPos2iv, "glWindowPos2iv")) return false; 
    82         if(!wglBindFunc(cast(void**)&glWindowPos2s, "glWindowPos2s")) return false; 
    83         if(!wglBindFunc(cast(void**)&glWindowPos2sv, "glWindowPos2sv")) return false; 
    84         if(!wglBindFunc(cast(void**)&glWindowPos3d, "glWindowPos3d")) return false; 
    85         if(!wglBindFunc(cast(void**)&glWindowPos3dv, "glWindowPos3dv")) return false; 
    86         if(!wglBindFunc(cast(void**)&glWindowPos3f, "glWindowPos3f")) return false; 
    87         if(!wglBindFunc(cast(void**)&glWindowPos3fv, "glWindowPos3fv")) return false; 
    88         if(!wglBindFunc(cast(void**)&glWindowPos3i, "glWindowPos3i")) return false; 
    89         if(!wglBindFunc(cast(void**)&glWindowPos3iv, "glWindowPos3iv")) return false; 
    90         if(!wglBindFunc(cast(void**)&glWindowPos3s, "glWindowPos3s")) return false; 
    91         if(!wglBindFunc(cast(void**)&glWindowPos3sv, "glWindowPos3sv")) return false; 
     47        wglBindFunc(cast(void**)&glBlendFuncSeparate, "glBlendFuncSeparate", lib); 
     48        wglBindFunc(cast(void**)&glFogCoordf, "glFogCoordf", lib); 
     49        wglBindFunc(cast(void**)&glFogCoordfv, "glFogCoordfv", lib); 
     50        wglBindFunc(cast(void**)&glFogCoordd, "glFogCoordd", lib); 
     51        wglBindFunc(cast(void**)&glFogCoorddv, "glFogCoorddv", lib); 
     52        wglBindFunc(cast(void**)&glFogCoordPointer, "glFogCoordPointer", lib); 
     53        wglBindFunc(cast(void**)&glMultiDrawArrays, "glMultiDrawArrays", lib); 
     54        wglBindFunc(cast(void**)&glMultiDrawElements, "glMultiDrawElements", lib); 
     55        wglBindFunc(cast(void**)&glPointParameterf, "glPointParameterf", lib); 
     56        wglBindFunc(cast(void**)&glPointParameterfv, "glPointParameterfv", lib); 
     57        wglBindFunc(cast(void**)&glPointParameteri, "glPointParameteri", lib); 
     58        wglBindFunc(cast(void**)&glPointParameteriv, "glPointParameteriv", lib); 
     59        wglBindFunc(cast(void**)&glSecondaryColor3b, "glSecondaryColor3b", lib); 
     60        wglBindFunc(cast(void**)&glSecondaryColor3bv, "glSecondaryColor3bv", lib); 
     61        wglBindFunc(cast(void**)&glSecondaryColor3d, "glSecondaryColor3d", lib); 
     62        wglBindFunc(cast(void**)&glSecondaryColor3dv, "glSecondaryColor3dv", lib); 
     63        wglBindFunc(cast(void**)&glSecondaryColor3f, "glSecondaryColor3f", lib); 
     64        wglBindFunc(cast(void**)&glSecondaryColor3fv, "glSecondaryColor3fv", lib); 
     65        wglBindFunc(cast(void**)&glSecondaryColor3i, "glSecondaryColor3i", lib); 
     66        wglBindFunc(cast(void**)&glSecondaryColor3iv, "glSecondaryColor3iv", lib); 
     67        wglBindFunc(cast(void**)&glSecondaryColor3s, "glSecondaryColor3s", lib); 
     68        wglBindFunc(cast(void**)&glSecondaryColor3sv, "glSecondaryColor3sv", lib); 
     69        wglBindFunc(cast(void**)&glSecondaryColor3ub, "glSecondaryColor3ub", lib); 
     70        wglBindFunc(cast(void**)&glSecondaryColor3ubv, "glSecondaryColor3ubv", lib); 
     71        wglBindFunc(cast(void**)&glSecondaryColor3ui, "glSecondaryColor3ui", lib); 
     72        wglBindFunc(cast(void**)&glSecondaryColor3uiv, "glSecondaryColor3uiv", lib); 
     73        wglBindFunc(cast(void**)&glSecondaryColor3us, "glSecondaryColor3us", lib); 
     74        wglBindFunc(cast(void**)&glSecondaryColor3usv, "glSecondaryColor3usv", lib); 
     75        wglBindFunc(cast(void**)&glSecondaryColorPointer, "glSecondaryColorPointer", lib); 
     76        wglBindFunc(cast(void**)&glWindowPos2d, "glWindowPos2d", lib); 
     77        wglBindFunc(cast(void**)&glWindowPos2dv, "glWindowPos2dv", lib); 
     78        wglBindFunc(cast(void**)&glWindowPos2f, "glWindowPos2f", lib); 
     79        wglBindFunc(cast(void**)&glWindowPos2fv, "glWindowPos2fv", lib); 
     80        wglBindFunc(cast(void**)&glWindowPos2i, "glWindowPos2i", lib); 
     81        wglBindFunc(cast(void**)&glWindowPos2iv, "glWindowPos2iv", lib); 
     82        wglBindFunc(cast(void**)&glWindowPos2s, "glWindowPos2s", lib); 
     83        wglBindFunc(cast(void**)&glWindowPos2sv, "glWindowPos2sv", lib); 
     84        wglBindFunc(cast(void**)&glWindowPos3d, "glWindowPos3d", lib); 
     85        wglBindFunc(cast(void**)&glWindowPos3dv, "glWindowPos3dv", lib); 
     86        wglBindFunc(cast(void**)&glWindowPos3f, "glWindowPos3f", lib); 
     87        wglBindFunc(cast(void**)&glWindowPos3fv, "glWindowPos3fv", lib); 
     88        wglBindFunc(cast(void**)&glWindowPos3i, "glWindowPos3i", lib); 
     89        wglBindFunc(cast(void**)&glWindowPos3iv, "glWindowPos3iv", lib); 
     90        wglBindFunc(cast(void**)&glWindowPos3s, "glWindowPos3s", lib); 
     91        wglBindFunc(cast(void**)&glWindowPos3sv, "glWindowPos3sv", lib); 
    9292    } 
    9393    else 
    9494    { 
    95         try 
    96         { 
    97             bindFunc(glBlendFuncSeparate)("glBlendFuncSeparate", lib); 
    98             bindFunc(glFogCoordf)("glFogCoordf", lib); 
    99             bindFunc(glFogCoordfv)("glFogCoordfv", lib); 
    100             bindFunc(glFogCoordd)("glFogCoordd", lib); 
    101             bindFunc(glFogCoorddv)("glFogCoorddv", lib); 
    102             bindFunc(glFogCoordPointer)("glFogCoordPointer", lib); 
    103             bindFunc(glMultiDrawArrays)("glMultiDrawArrays", lib); 
    104             bindFunc(glMultiDrawElements)("glMultiDrawElements", lib); 
    105             bindFunc(glPointParameterf)("glPointParameterf", lib); 
    106             bindFunc(glPointParameterfv)("glPointParameterfv", lib); 
    107             bindFunc(glPointParameteri)("glPointParameteri", lib); 
    108             bindFunc(glPointParameteriv)("glPointParameteriv", lib); 
    109             bindFunc(glSecondaryColor3b)("glSecondaryColor3b", lib); 
    110             bindFunc(glSecondaryColor3bv)("glSecondaryColor3bv", lib); 
    111             bindFunc(glSecondaryColor3d)("glSecondaryColor3d", lib); 
    112             bindFunc(glSecondaryColor3dv)("glSecondaryColor3dv", lib); 
    113             bindFunc(glSecondaryColor3f)("glSecondaryColor3f", lib); 
    114             bindFunc(glSecondaryColor3fv)("glSecondaryColor3fv", lib); 
    115             bindFunc(glSecondaryColor3i)("glSecondaryColor3i", lib); 
    116             bindFunc(glSecondaryColor3iv)("glSecondaryColor3iv", lib); 
    117             bindFunc(glSecondaryColor3s)("glSecondaryColor3s", lib); 
    118             bindFunc(glSecondaryColor3sv)("glSecondaryColor3sv", lib); 
    119             bindFunc(glSecondaryColor3ub)("glSecondaryColor3ub", lib); 
    120             bindFunc(glSecondaryColor3ubv)("glSecondaryColor3ubv", lib); 
    121             bindFunc(glSecondaryColor3ui)("glSecondaryColor3ui", lib); 
    122             bindFunc(glSecondaryColor3uiv)("glSecondaryColor3uiv", lib); 
    123             bindFunc(glSecondaryColor3us)("glSecondaryColor3us", lib); 
    124             bindFunc(glSecondaryColor3usv)("glSecondaryColor3usv", lib); 
    125             bindFunc(glSecondaryColorPointer)("glSecondaryColorPointer", lib); 
    126             bindFunc(glWindowPos2d)("glWindowPos2d", lib); 
    127             bindFunc(glWindowPos2dv)("glWindowPos2dv", lib); 
    128             bindFunc(glWindowPos2f)("glWindowPos2f", lib); 
    129             bindFunc(glWindowPos2fv)("glWindowPos2fv", lib); 
    130             bindFunc(glWindowPos2i)("glWindowPos2i", lib); 
    131             bindFunc(glWindowPos2iv)("glWindowPos2iv", lib); 
    132             bindFunc(glWindowPos2s)("glWindowPos2s", lib); 
    133             bindFunc(glWindowPos2sv)("glWindowPos2sv", lib); 
    134             bindFunc(glWindowPos3d)("glWindowPos3d", lib); 
    135             bindFunc(glWindowPos3dv)("glWindowPos3dv", lib); 
    136             bindFunc(glWindowPos3f)("glWindowPos3f", lib); 
    137             bindFunc(glWindowPos3fv)("glWindowPos3fv", lib); 
    138             bindFunc(glWindowPos3i)("glWindowPos3i", lib); 
    139             bindFunc(glWindowPos3iv)("glWindowPos3iv", lib); 
    140             bindFunc(glWindowPos3s)("glWindowPos3s", lib); 
    141             bindFunc(glWindowPos3sv)("glWindowPos3sv", lib); 
    142         } 
    143         catch(SharedLibProcLoadException slple) 
    144         { 
    145             return false; 
    146         } 
     95        bindFunc(glBlendFuncSeparate)("glBlendFuncSeparate", lib); 
     96        bindFunc(glFogCoordf)("glFogCoordf", lib); 
     97        bindFunc(glFogCoordfv)("glFogCoordfv", lib); 
     98        bindFunc(glFogCoordd)("glFogCoordd", lib); 
     99        bindFunc(glFogCoorddv)("glFogCoorddv", lib); 
     100        bindFunc(glFogCoordPointer)("glFogCoordPointer", lib); 
     101        bindFunc(glMultiDrawArrays)("glMultiDrawArrays", lib); 
     102        bindFunc(glMultiDrawElements)("glMultiDrawElements", lib); 
     103        bindFunc(glPointParameterf)("glPointParameterf", lib); 
     104        bindFunc(glPointParameterfv)("glPointParameterfv", lib); 
     105        bindFunc(glPointParameteri)("glPointParameteri", lib); 
     106        bindFunc(glPointParameteriv)("glPointParameteriv", lib); 
     107        bindFunc(glSecondaryColor3b)("glSecondaryColor3b", lib); 
     108        bindFunc(glSecondaryColor3bv)("glSecondaryColor3bv", lib); 
     109        bindFunc(glSecondaryColor3d)("glSecondaryColor3d", lib); 
     110        bindFunc(glSecondaryColor3dv)("glSecondaryColor3dv", lib); 
     111        bindFunc(glSecondaryColor3f)("glSecondaryColor3f", lib); 
     112        bindFunc(glSecondaryColor3fv)("glSecondaryColor3fv", lib); 
     113        bindFunc(glSecondaryColor3i)("glSecondaryColor3i", lib); 
     114        bindFunc(glSecondaryColor3iv)("glSecondaryColor3iv", lib); 
     115        bindFunc(glSecondaryColor3s)("glSecondaryColor3s", lib); 
     116        bindFunc(glSecondaryColor3sv)("glSecondaryColor3sv", lib); 
     117        bindFunc(glSecondaryColor3ub)("glSecondaryColor3ub", lib); 
     118        bindFunc(glSecondaryColor3ubv)("glSecondaryColor3ubv", lib); 
     119        bindFunc(glSecondaryColor3ui)("glSecondaryColor3ui", lib); 
     120        bindFunc(glSecondaryColor3uiv)("glSecondaryColor3uiv", lib); 
     121        bindFunc(glSecondaryColor3us)("glSecondaryColor3us", lib); 
     122        bindFunc(glSecondaryColor3usv)("glSecondaryColor3usv", lib); 
     123        bindFunc(glSecondaryColorPointer)("glSecondaryColorPointer", lib); 
     124        bindFunc(glWindowPos2d)("glWindowPos2d", lib); 
     125        bindFunc(glWindowPos2dv)("glWindowPos2dv", lib); 
     126        bindFunc(glWindowPos2f)("glWindowPos2f", lib); 
     127        bindFunc(glWindowPos2fv)("glWindowPos2fv", lib); 
     128        bindFunc(glWindowPos2i)("glWindowPos2i", lib); 
     129        bindFunc(glWindowPos2iv)("glWindowPos2iv", lib); 
     130        bindFunc(glWindowPos2s)("glWindowPos2s", lib); 
     131        bindFunc(glWindowPos2sv)("glWindowPos2sv", lib); 
     132        bindFunc(glWindowPos3d)("glWindowPos3d", lib); 
     133        bindFunc(glWindowPos3dv)("glWindowPos3dv", lib); 
     134        bindFunc(glWindowPos3f)("glWindowPos3f", lib); 
     135        bindFunc(glWindowPos3fv)("glWindowPos3fv", lib); 
     136        bindFunc(glWindowPos3i)("glWindowPos3i", lib); 
     137        bindFunc(glWindowPos3iv)("glWindowPos3iv", lib); 
     138        bindFunc(glWindowPos3s)("glWindowPos3s", lib); 
     139        bindFunc(glWindowPos3sv)("glWindowPos3sv", lib); 
    147140    } 
    148  
    149     return true; 
    150141} 
    151142 

  • trunk/DerelictGL/derelict/opengl/gl15.d

    r164 r165  
    4343} 
    4444 
    45 package bool loadGL20(SharedLib lib) 
     45package void loadGL20(SharedLib lib) 
    4646{ 
    4747    version(Windows) 
    4848    { 
    49         if(!wglBindFunc(cast(void**)&glGenQueries, "glGenQueries")) return false; 
    50         if(!wglBindFunc(cast(void**)&glDeleteQueries, "glDeleteQueries")) return false; 
    51         if(!wglBindFunc(cast(void**)&glIsQuery, "glIsQuery")) return false; 
    52         if(!wglBindFunc(cast(void**)&glBeginQuery, "glBeginQuery")) return false; 
    53         if(!wglBindFunc(cast(void**)&glEndQuery, "glEndQuery")) return false; 
    54         if(!wglBindFunc(cast(void**)&glGetQueryiv, "glGetQueryiv")) return false; 
    55         if(!wglBindFunc(cast(void**)&glGetQueryObjectiv, "glGetQueryObjectiv")) return false; 
    56         if(!wglBindFunc(cast(void**)&glGetQueryObjectuiv, "glGetQueryObjectuiv")) return false; 
    57         if(!wglBindFunc(cast(void**)&glBindBuffer, "glBindBuffer")) return false; 
    58         if(!wglBindFunc(cast(void**)&glDeleteBuffers, "glDeleteBuffers")) return false; 
    59         if(!wglBindFunc(cast(void**)&glGenBuffers, "glGenBuffers")) return false; 
    60         if(!wglBindFunc(cast(void**)&glIsBuffer, "glIsBuffer")) return false; 
    61         if(!wglBindFunc(cast(void**)&glBufferData, "glBufferData")) return false; 
    62         if(!wglBindFunc(cast(void**)&glBufferSubData, "glBufferSubData")) return false; 
    63         if(!wglBindFunc(cast(void**)&glGetBufferSubData, "glGetBufferSubData")) return false; 
    64         if(!wglBindFunc(cast(void**)&glMapBuffer, "glMapBuffer")) return false; 
    65         if(!wglBindFunc(cast(void**)&glUnmapBuffer, "glUnmapBuffer")) return false; 
    66         if(!wglBindFunc(cast(void**)&glGetBufferParameteriv, "glGetBufferParameteriv")) return false; 
    67         if(!wglBindFunc(cast(void**)&glGetBufferPointerv, "glGetBufferPointerv")) return false; 
     49        wglBindFunc(cast(void**)&glGenQueries, "glGenQueries", lib); 
     50        wglBindFunc(cast(void**)&glDeleteQueries, "glDeleteQueries", lib); 
     51        wglBindFunc(cast(void**)&glIsQuery, "glIsQuery", lib); 
     52        wglBindFunc(cast(void**)&glBeginQuery, "glBeginQuery", lib); 
     53        wglBindFunc(cast(void**)&glEndQuery, "glEndQuery", lib); 
     54        wglBindFunc(cast(void**)&glGetQueryiv, "glGetQueryiv", lib); 
     55        wglBindFunc(cast(void**)&glGetQueryObjectiv, "glGetQueryObjectiv", lib); 
     56        wglBindFunc(cast(void**)&glGetQueryObjectuiv, "glGetQueryObjectuiv", lib); 
     57        wglBindFunc(cast(void**)&glBindBuffer, "glBindBuffer", lib); 
     58        wglBindFunc(cast(void**)&glDeleteBuffers, "glDeleteBuffers", lib); 
     59        wglBindFunc(cast(void**)&glGenBuffers, "glGenBuffers", lib); 
     60        wglBindFunc(cast(void**)&glIsBuffer, "glIsBuffer", lib); 
     61        wglBindFunc(cast(void**)&glBufferData, "glBufferData", lib); 
     62        wglBindFunc(cast(void**)&glBufferSubData, "glBufferSubData", lib); 
     63        wglBindFunc(cast(void**)&glGetBufferSubData, "glGetBufferSubData", lib); 
     64        wglBindFunc(cast(void**)&glMapBuffer, "glMapBuffer", lib); 
     65        wglBindFunc(cast(void**)&glUnmapBuffer, "glUnmapBuffer", lib); 
     66        wglBindFunc(cast(void**)&glGetBufferParameteriv, "glGetBufferParameteriv", lib); 
     67        wglBindFunc(cast(void**)&glGetBufferPointerv, "glGetBufferPointerv", lib); 
    6868    } 
    6969    else 
    7070    { 
    71         try 
    72         { 
    73             bindFunc(glGenQueries)("glGenQueries", lib); 
    74             bindFunc(glDeleteQueries)("glDeleteQueries", lib); 
    75             bindFunc(glIsQuery)("glIsQuery", lib); 
    76             bindFunc(glBeginQuery)("glBeginQuery", lib); 
    77             bindFunc(glEndQuery)("glEndQuery", lib); 
    78             bindFunc(glGetQueryiv)("glGetQueryiv", lib); 
    79             bindFunc(glGetQueryObjectiv)("glGetQueryObjectiv", lib); 
    80             bindFunc(glGetQueryObjectuiv)("glGetQueryObjectuiv", lib); 
    81             bindFunc(glBindBuffer)("glBindBuffer", lib); 
    82             bindFunc(glDeleteBuffers)("glDeleteBuffers", lib); 
    83             bindFunc(glGenBuffers)("glGenBuffers", lib); 
    84             bindFunc(glIsBuffer)("glIsBuffer", lib); 
    85             bindFunc(glBufferData)("glBufferData", lib); 
    86             bindFunc(glBufferSubData)("glBufferSubData", lib); 
    87             bindFunc(glGetBufferSubData)("glGetBufferSubData", lib); 
    88             bindFunc(glMapBuffer)("glMapBuffer", lib); 
    89             bindFunc(glUnmapBuffer)("glUnmapBuffer", lib); 
    90             bindFunc(glGetBufferParameteriv)("glGetBufferParameteriv", lib); 
    91             bindFunc(glGetBufferPointerv)("glGetBufferPointerv", lib); 
    92        } 
    93        catch(SharedLibProcLoadException slple) 
    94        { 
    95            return false; 
    96        } 
     71        bindFunc(glGenQueries)("glGenQueries", lib); 
     72        bindFunc(glDeleteQueries)("glDeleteQueries", lib); 
     73        bindFunc(glIsQuery)("glIsQuery", lib); 
     74        bindFunc(glBeginQuery)("glBeginQuery", lib); 
     75        bindFunc(glEndQuery)("glEndQuery", lib); 
     76        bindFunc(glGetQueryiv)("glGetQueryiv", lib); 
     77        bindFunc(glGetQueryObjectiv)("glGetQueryObjectiv", lib); 
     78        bindFunc(glGetQueryObjectuiv)("glGetQueryObjectuiv", lib); 
     79        bindFunc(glBindBuffer)("glBindBuffer", lib); 
     80        bindFunc(glDeleteBuffers)("glDeleteBuffers", lib); 
     81        bindFunc(glGenBuffers)("glGenBuffers", lib); 
     82        bindFunc(glIsBuffer)("glIsBuffer", lib); 
     83        bindFunc(glBufferData)("glBufferData", lib); 
     84        bindFunc(glBufferSubData)("glBufferSubData", lib); 
     85        bindFunc(glGetBufferSubData)("glGetBufferSubData", lib); 
     86        bindFunc(glMapBuffer)("glMapBuffer", lib); 
     87        bindFunc(glUnmapBuffer)("glUnmapBuffer", lib); 
     88        bindFunc(glGetBufferParameteriv)("glGetBufferParameteriv", lib); 
     89        bindFunc(glGetBufferPointerv)("glGetBufferPointerv", lib); 
    9790    } 
    98     return true; 
    9991} 
    10092 

  • trunk/DerelictGL/derelict/opengl/gl20.d

    r164 r165  
    4141} 
    4242 
    43 package bool loadGL15(SharedLib lib) 
     43package void loadGL15(SharedLib lib) 
    4444{ 
    4545    version(Windows) 
    4646    { 
    47        if(!wglBindFunc(cast(void**)&glBlendEquationSeparate, "glBlendEquationSeparate")) return false; 
    48        if(!wglBindFunc(cast(void**)&glDrawBuffers, "glDrawBuffers")) return false; 
    49        if(!wglBindFunc(cast(void**)&glStencilOpSeparate, "glStencilOpSeparate")) return false; 
    50        if(!wglBindFunc(cast(void**)&glStencilFuncSeparate, "glStencilFuncSeparate")) return false; 
    51        if(!wglBindFunc(cast(void**)&glStencilMaskSeparate, "glStencilMaskSeparate")) return false; 
    52        if(!wglBindFunc(cast(void**)&glAttachShader, "glAttachShader")) return false; 
    53        if(!wglBindFunc(cast(void**)&glBindAttribLocation, "glBindAttribLocation")) return false; 
    54        if(!wglBindFunc(cast(void**)&glCompileShader, "glCompileShader")) return false; 
    55        if(!wglBindFunc(cast(void**)&glCreateProgram, "glCreateProgram")) return false; 
    56        if(!wglBindFunc(cast(void**)&glCreateShader, "glCreateShader")) return false; 
    57        if(!wglBindFunc(cast(void**)&glDeleteProgram, "glDeleteProgram")) return false; 
    58        if(!wglBindFunc(cast(void**)&glDeleteShader, "glDeleteShader")) return false; 
    59        if(!wglBindFunc(cast(void**)&glDetachShader, "glDetachShader")) return false; 
    60        if(!wglBindFunc(cast(void**)&glDisableVertexAttribArray, "glDisableVertexAttribArray")) return false; 
    61        if(!wglBindFunc(cast(void**)&glEnableVertexAttribArray, "glEnableVertexAttribArray")) return false; 
    62        if(!wglBindFunc(cast(void**)&glGetActiveAttrib, "glGetActiveAttrib")) return false; 
    63        if(!wglBindFunc(cast(void**)&glGetActiveUniform, "glGetActiveUniform")) return false; 
    64        if(!wglBindFunc(cast(void**)&glGetAttachedShaders, "glGetAttachedShaders")) return false; 
    65        if(!wglBindFunc(cast(void**)&glGetAttribLocation, "glGetAttribLocation")) return false; 
    66        if(!wglBindFunc(cast(void**)&glGetProgramiv, "glGetProgramiv")) return false; 
    67        if(!wglBindFunc(cast(void**)&glGetProgramInfoLog, "glGetProgramInfoLog")) return false; 
    68        if(!wglBindFunc(cast(void**)&glGetShaderiv, "glGetShaderiv")) return false; 
    69        if(!wglBindFunc(cast(void**)&glGetShaderInfoLog, "glGetShaderInfoLog")) return false; 
    70        if(!wglBindFunc(cast(void**)&glGetShaderSource, "glGetShaderSource")) return false; 
    71        if(!wglBindFunc(cast(void**)&glGetUniformLocation, "glGetUniformLocation")) return false; 
    72        if(!wglBindFunc(cast(void**)&glGetUniformfv, "glGetUniformfv")) return false; 
    73        if(!wglBindFunc(cast(void**)&glGetUniformiv, "glGetUniformiv")) return false; 
    74        if(!wglBindFunc(cast(void**)&glGetVertexAttribdv, "glGetVertexAttribdv")) return false; 
    75        if(!wglBindFunc(cast(void**)&glGetVertexAttribfv, "glGetVertexAttribfv")) return false; 
    76        if(!wglBindFunc(cast(void**)&glGetVertexAttribiv, "glGetVertexAttribiv")) return false; 
    77        if(!wglBindFunc(cast(void**)&glGetVertexAttribPointerv, "glGetVertexAttribPointerv")) return false; 
    78        if(!wglBindFunc(cast(void**)&glIsProgram, "glIsProgram")) return false; 
    79        if(!wglBindFunc(cast(void**)&glIsShader, "glIsShader")) return false; 
    80        if(!wglBindFunc(cast(void**)&glLinkProgram, "glLinkProgram")) return false; 
    81        if(!wglBindFunc(cast(void**)&glShaderSource, "glShaderSource")) return false; 
    82        if(!wglBindFunc(cast(void**)&glUseProgram, "glUseProgram")) return false; 
    83        if(!wglBindFunc(cast(void**)&glUniform1f, "glUniform1f")) return false; 
    84        if(!wglBindFunc(cast(void**)&glUniform2f, "glUniform2f")) return false; 
    85        if(!wglBindFunc(cast(void**)&glUniform3f, "glUniform3f")) return false; 
    86        if(!wglBindFunc(cast(void**)&glUniform4f, "glUniform4f")) return false; 
    87        if(!wglBindFunc(cast(void**)&glUniform1i, "glUniform1i")) return false; 
    88        if(!wglBindFunc(cast(void**)&glUniform2i, "glUniform2i")) return false; 
    89        if(!wglBindFunc(cast(void**)&glUniform3i, "glUniform3i")) return false; 
    90        if(!wglBindFunc(cast(void**)&glUniform4i, "glUniform4i")) return false; 
    91        if(!wglBindFunc(cast(void**)&glUniform1fv, "glUniform1fv")) return false; 
    92        if(!wglBindFunc(cast(void**)&glUniform2fv, "glUniform2fv")) return false; 
    93        if(!wglBindFunc(cast(void**)&glUniform3fv, "glUniform3fv")) return false; 
    94        if(!wglBindFunc(cast(void**)&glUniform4fv, "glUniform4fv")) return false; 
    95        if(!wglBindFunc(cast(void**)&glUniform1iv, "glUniform1iv")) return false; 
    96        if(!wglBindFunc(cast(void**)&glUniform2iv, "glUniform2iv")) return false; 
    97        if(!wglBindFunc(cast(void**)&glUniform3iv, "glUniform3iv")) return false; 
    98        if(!wglBindFunc(cast(void**)&glUniform4iv, "glUniform4iv")) return false; 
    99        if(!wglBindFunc(cast(void**)&glUniformMatrix2fv, "glUniformMatrix2fv")) return false; 
    100        if(!wglBindFunc(cast(void**)&glUniformMatrix3fv, "glUniformMatrix3fv")) return false; 
    101        if(!wglBindFunc(cast(void**)&glUniformMatrix4fv, "glUniformMatrix4fv")) return false; 
    102        if(!wglBindFunc(cast(void**)&glValidateProgram, "glValidateProgram")) return false; 
    103        if(!wglBindFunc(cast(void**)&glVertexAttrib1d, "glVertexAttrib1d")) return false; 
    104        if(!wglBindFunc(cast(void**)&glVertexAttrib1dv, "glVertexAttrib1dv")) return false; 
    105        if(!wglBindFunc(cast(void**)&glVertexAttrib1f, "glVertexAttrib1f")) return false; 
    106        if(!wglBindFunc(cast(void**)&glVertexAttrib1fv, "glVertexAttrib1fv")) return false; 
    107        if(!wglBindFunc(cast(void**)&glVertexAttrib1s, "glVertexAttrib1s")) return false; 
    108        if(!wglBindFunc(cast(void**)&glVertexAttrib1sv, "glVertexAttrib1sv")) return false; 
    109        if(!wglBindFunc(cast(void**)&glVertexAttrib2d, "glVertexAttrib2d")) return false; 
    110        if(!wglBindFunc(cast(void**)&glVertexAttrib2dv, "glVertexAttrib2dv")) return false; 
    111        if(!wglBindFunc(cast(void**)&glVertexAttrib2f, "glVertexAttrib2f")) return false; 
    112        if(!wglBindFunc(cast(void**)&glVertexAttrib2fv, "glVertexAttrib2fv")) return false; 
    113        if(!wglBindFunc(cast(void**)&glVertexAttrib2s, "glVertexAttrib2s")) return false; 
    114        if(!wglBindFunc(cast(void**)&glVertexAttrib2sv, "glVertexAttrib2sv")) return false; 
    115        if(!wglBindFunc(cast(void**)&glVertexAttrib3d, "glVertexAttrib3d")) return false; 
    116        if(!wglBindFunc(cast(void**)&glVertexAttrib3dv, "glVertexAttrib3dv")) return false; 
    117        if(!wglBindFunc(cast(void**)&glVertexAttrib3f, "glVertexAttrib3f")) return false; 
    118        if(!wglBindFunc(cast(void**)&glVertexAttrib3fv, "glVertexAttrib3fv")) return false; 
    119        if(!wglBindFunc(cast(void**)&glVertexAttrib3s, "glVertexAttrib3s")) return false; 
    120        if(!wglBindFunc(cast(void**)&glVertexAttrib3sv, "glVertexAttrib3sv")) return false; 
    121        if(!wglBindFunc(cast(void**)&glVertexAttrib4Nbv, "glVertexAttrib4Nbv")) return false; 
    122        if(!wglBindFunc(cast(void**)&glVertexAttrib4Niv, "glVertexAttrib4Niv")) return false; 
    123        if(!wglBindFunc(cast(void**)&glVertexAttrib4Nsv, "glVertexAttrib4Nsv")) return false; 
    124        if(!wglBindFunc(cast(void**)&glVertexAttrib4Nub, "glVertexAttrib4Nub")) return false; 
    125        if(!wglBindFunc(cast(void**)&glVertexAttrib4Nubv, "glVertexAttrib4Nubv")) return false; 
    126        if(!wglBindFunc(cast(void**)&glVertexAttrib4Nuiv, "glVertexAttrib4Nuiv")) return false; 
    127        if(!wglBindFunc(cast(void**)&glVertexAttrib4Nusv, "glVertexAttrib4Nusv")) return false; 
    128        if(!wglBindFunc(cast(void**)&glVertexAttrib4bv, "glVertexAttrib4bv")) return false; 
    129        if(!wglBindFunc(cast(void**)&glVertexAttrib4d, "glVertexAttrib4d")) return false; 
    130        if(!wglBindFunc(cast(void**)&glVertexAttrib4dv, "glVertexAttrib4dv")) return false; 
    131        if(!wglBindFunc(cast(void**)&glVertexAttrib4f, "glVertexAttrib4f")) return false; 
    132        if(!wglBindFunc(cast(void**)&glVertexAttrib4fv, "glVertexAttrib4fv")) return false; 
    133        if(!wglBindFunc(cast(void**)&glVertexAttrib4iv, "glVertexAttrib4iv")) return false; 
    134        if(!wglBindFunc(cast(void**)&glVertexAttrib4s, "glVertexAttrib4s")) return false; 
    135        if(!wglBindFunc(cast(void**)&glVertexAttrib4sv, "glVertexAttrib4sv")) return false; 
    136        if(!wglBindFunc(cast(void**)&glVertexAttrib4ubv, "glVertexAttrib4ubv")) return false; 
    137        if(!wglBindFunc(cast(void**)&glVertexAttrib4uiv, "glVertexAttrib4uiv")) return false; 
    138        if(!wglBindFunc(cast(void**)&glVertexAttrib4usv, "glVertexAttrib4usv")) return false; 
    139        if(!wglBindFunc(cast(void**)&glVertexAttribPointer, "glVertexAttribPointer")) return false; 
     47        wglBindFunc(cast(void**)&glBlendEquationSeparate, "glBlendEquationSeparate", lib); 
     48        wglBindFunc(cast(void**)&glDrawBuffers, "glDrawBuffers", lib); 
     49        wglBindFunc(cast(void**)&glStencilOpSeparate, "glStencilOpSeparate", lib); 
     50        wglBindFunc(cast(void**)&glStencilFuncSeparate, "glStencilFuncSeparate", lib); 
     51        wglBindFunc(cast(void**)&glStencilMaskSeparate, "glStencilMaskSeparate", lib); 
     52        wglBindFunc(cast(void**)&glAttachShader, "glAttachShader", lib); 
     53        wglBindFunc(cast(void**)&glBindAttribLocation, "glBindAttribLocation", lib); 
     54        wglBindFunc(cast(void**)&glCompileShader, "glCompileShader", lib); 
     55        wglBindFunc(cast(void**)&glCreateProgram, "glCreateProgram", lib); 
     56        wglBindFunc(cast(void**)&glCreateShader, "glCreateShader", lib); 
     57        wglBindFunc(cast(void**)&glDeleteProgram, "glDeleteProgram", lib); 
     58        wglBindFunc(cast(void**)&glDeleteShader, "glDeleteShader", lib); 
     59        wglBindFunc(cast(void**)&glDetachShader, "glDetachShader", lib); 
     60        wglBindFunc(cast(void**)&glDisableVertexAttribArray, "glDisableVertexAttribArray", lib); 
     61        wglBindFunc(cast(void**)&glEnableVert