Changeset 284

Show
Ignore:
Timestamp:
02/26/08 23:47:20 (6 months ago)
Author:
aldacron
Message:

[DerelictGL]
* all HDC and HGLRC parms and returns in the wgl* functions redeclared to void* to further avoid conflict with external Windows modules.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r279 r284  
    5454        import derelict.opengl.wgl; 
    5555        import derelict.util.wintypes; 
    56         alias HGLRC DerelictGLContext; 
     56        alias void* DerelictGLContext; 
    5757    } 
    5858    else version(linux) 
    …… 
    108108        } 
    109109 
    110         extern(Windows) export int GetPixelFormat(HDC hdc); 
     110        extern(Windows) export int GetPixelFormat(void* hdc); 
    111111        int currentPixelFormat      = 0; 
    112112    } 
    …… 
    116116        version(Windows) 
    117117        { 
    118             HDC hdc = wglGetCurrentDC(); 
     118            void* hdc = wglGetCurrentDC(); 
    119119            if(hdc is null) 
    120120                throw new DerelictException("Could not obtain a device context for the current OpenGL context"); 

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

    r261 r284  
    4848    { 
    4949        // WGL functions 
    50         typedef BOOL function(HGLRC,HGLRC) pfwglCopyContext; 
    51         typedef HGLRC function(HDC) pfwglCreateContext; 
    52         typedef HGLRC function(HDC,int) pfwglCreateLayerContext; 
    53         typedef BOOL function(HGLRC) pfwglDeleteContext; 
    54         typedef BOOL function(HDC,int,int,UINT,LAYERPLANEDESCRIPTOR*) pfwglDescribeLayerPlane; 
    55         typedef HGLRC function() pfwglGetCurrentContext; 
    56         typedef HDC function() pfwglGetCurrentDC; 
    57         typedef int function(HDC,int,int,int,COLORREF*) pfwglGetLayerPaletteEntries; 
     50        typedef BOOL function(void*,void*) pfwglCopyContext; 
     51        typedef void* function(void*) pfwglCreateContext; 
     52        typedef void* function(void*,int) pfwglCreateLayerContext; 
     53        typedef BOOL function(void*) pfwglDeleteContext; 
     54        typedef BOOL function(void*,int,int,UINT,LAYERPLANEDESCRIPTOR*) pfwglDescribeLayerPlane; 
     55        typedef void* function() pfwglGetCurrentContext; 
     56        typedef void* function() pfwglGetCurrentDC; 
     57        typedef int function(void*,int,int,int,COLORREF*) pfwglGetLayerPaletteEntries; 
    5858        typedef FARPROC function(LPCSTR) pfwglGetProcAddress; 
    59         typedef BOOL function(HDC,HGLRC) pfwglMakeCurrent; 
    60         typedef BOOL function(HDC,int,BOOL) pfwglRealizeLayerPalette; 
    61         typedef int function(HDC,int,int,int,COLORREF*) pfwglSetLayerPaletteEntries; 
    62         typedef BOOL function(HGLRC,HGLRC) pfwglShareLists; 
    63         typedef BOOL function(HDC,UINT) pfwglSwapLayerBuffers; 
    64         typedef BOOL function(HDC,DWORD,DWORD,DWORD) pfwglUseFontBitmapsA; 
    65         typedef BOOL function(HDC,DWORD,DWORD,DWORD,FLOAT,FLOAT,int,GLYPHMETRICSFLOAT*) pfwglUseFontOutlinesA; 
    66         typedef BOOL function(HDC,DWORD,DWORD,DWORD) pfwglUseFontBitmapsW; 
    67         typedef BOOL function(HDC,DWORD,DWORD,DWORD,FLOAT,FLOAT,int,GLYPHMETRICSFLOAT*) pfwglUseFontOutlinesW; 
     59        typedef BOOL function(void*,void*) pfwglMakeCurrent; 
     60        typedef BOOL function(void*,int,BOOL) pfwglRealizeLayerPalette; 
     61        typedef int function(void*,int,int,int,COLORREF*) pfwglSetLayerPaletteEntries; 
     62        typedef BOOL function(void*,void*) pfwglShareLists; 
     63        typedef BOOL function(void*,UINT) pfwglSwapLayerBuffers; 
     64        typedef BOOL function(void*,DWORD,DWORD,DWORD) pfwglUseFontBitmapsA; 
     65        typedef BOOL function(void*,DWORD,DWORD,DWORD,FLOAT,FLOAT,int,GLYPHMETRICSFLOAT*) pfwglUseFontOutlinesA; 
     66        typedef BOOL function(void*,DWORD,DWORD,DWORD) pfwglUseFontBitmapsW; 
     67        typedef BOOL function(void*,DWORD,DWORD,DWORD,FLOAT,FLOAT,int,GLYPHMETRICSFLOAT*) pfwglUseFontOutlinesW; 
    6868        pfwglCopyContext            wglCopyContext; 
    6969        pfwglCreateContext          wglCreateContext;