mirror of
git://source.winehq.org/git/wine.git
synced 2024-09-02 02:13:38 +00:00
Move some OpenGL defines from the private wgl.h header to where they
belong.
This commit is contained in:
parent
b10996c5e4
commit
5d91a63add
|
@ -258,7 +258,7 @@ HGLRC WINAPI wglGetCurrentContext(void) {
|
|||
|
||||
TRACE(" returning %p (GL context %p)\n", ret, gl_ctx);
|
||||
|
||||
return ret;
|
||||
return (HGLRC)ret;
|
||||
}
|
||||
|
||||
/***********************************************************************
|
||||
|
|
|
@ -22,50 +22,6 @@
|
|||
|
||||
#include "wingdi.h"
|
||||
|
||||
typedef void *HGLRC;
|
||||
|
||||
typedef struct {
|
||||
WORD nSize;
|
||||
WORD nVersion;
|
||||
DWORD dwFlags;
|
||||
BYTE iPixelType;
|
||||
BYTE cColorBits;
|
||||
BYTE cRedBits;
|
||||
BYTE cRedShift;
|
||||
BYTE cGreenBits;
|
||||
BYTE cGreenShift;
|
||||
BYTE cBlueBits;
|
||||
BYTE cBlueShift;
|
||||
BYTE cAlphaBits;
|
||||
BYTE cAlphaShift;
|
||||
BYTE cAccumBits;
|
||||
BYTE cAccumRedBits;
|
||||
BYTE cAccumGreenBits;
|
||||
BYTE cAccumBlueBits;
|
||||
BYTE cAccumAlphaBits;
|
||||
BYTE cDepthBits;
|
||||
BYTE cStencilBits;
|
||||
BYTE cAuxBuffers;
|
||||
BYTE iLayerPlane;
|
||||
BYTE bReserved;
|
||||
COLORREF crTransparent;
|
||||
} LAYERPLANEDESCRIPTOR;
|
||||
typedef LAYERPLANEDESCRIPTOR* LPLAYERPLANEDESCRIPTOR;
|
||||
|
||||
typedef struct {
|
||||
FLOAT x;
|
||||
FLOAT y;
|
||||
} POINTFLOAT;
|
||||
|
||||
typedef struct {
|
||||
FLOAT gmfBlackBoxX;
|
||||
FLOAT gmfBlackBoxY;
|
||||
POINTFLOAT gmfptGlyphOrigin;
|
||||
FLOAT gmfCellIncX;
|
||||
FLOAT gmfCellIncY;
|
||||
} GLYPHMETRICSFLOAT;
|
||||
typedef GLYPHMETRICSFLOAT *LPGLYPHMETRICSFLOAT;
|
||||
|
||||
HGLRC WINAPI wglCreateContext(HDC hdc) ;
|
||||
HGLRC WINAPI wglCreateLayerContext(HDC hdc,
|
||||
int iLayerPlane) ;
|
||||
|
|
|
@ -225,6 +225,7 @@ DECLARE_HANDLE(HDC);
|
|||
DECLARE_HANDLE(HDESK);
|
||||
DECLARE_HANDLE(HENHMETAFILE);
|
||||
DECLARE_HANDLE(HFONT);
|
||||
DECLARE_HANDLE(HGLRC);
|
||||
DECLARE_HANDLE(HHOOK);
|
||||
DECLARE_HANDLE(HICON);
|
||||
DECLARE_HANDLE(HINSTANCE);
|
||||
|
|
|
@ -1407,6 +1407,47 @@ typedef struct
|
|||
#define TT_PRIM_CSPLINE 3
|
||||
#define TT_POLYGON_TYPE 24
|
||||
|
||||
/* OpenGL defines */
|
||||
typedef struct {
|
||||
FLOAT x;
|
||||
FLOAT y;
|
||||
} POINTFLOAT, *PPOINTFLOAT;
|
||||
|
||||
typedef struct {
|
||||
FLOAT gmfBlackBoxX;
|
||||
FLOAT gmfBlackBoxY;
|
||||
POINTFLOAT gmfptGlyphOrigin;
|
||||
FLOAT gmfCellIncX;
|
||||
FLOAT gmfCellIncY;
|
||||
} GLYPHMETRICSFLOAT, *PGLYPHMETRICSFLOAT, *LPGLYPHMETRICSFLOAT;
|
||||
|
||||
typedef struct {
|
||||
WORD nSize;
|
||||
WORD nVersion;
|
||||
DWORD dwFlags;
|
||||
BYTE iPixelType;
|
||||
BYTE cColorBits;
|
||||
BYTE cRedBits;
|
||||
BYTE cRedShift;
|
||||
BYTE cGreenBits;
|
||||
BYTE cGreenShift;
|
||||
BYTE cBlueBits;
|
||||
BYTE cBlueShift;
|
||||
BYTE cAlphaBits;
|
||||
BYTE cAlphaShift;
|
||||
BYTE cAccumBits;
|
||||
BYTE cAccumRedBits;
|
||||
BYTE cAccumGreenBits;
|
||||
BYTE cAccumBlueBits;
|
||||
BYTE cAccumAlphaBits;
|
||||
BYTE cDepthBits;
|
||||
BYTE cStencilBits;
|
||||
BYTE cAuxBuffers;
|
||||
BYTE iLayerPlane;
|
||||
BYTE bReserved;
|
||||
COLORREF crTransparent;
|
||||
} LAYERPLANEDESCRIPTOR, *PLAYERPLANEDESCRIPTOR, *LPLAYERPLANEDESCRIPTOR;
|
||||
|
||||
/* Get/SetSystemPaletteUse() values */
|
||||
#define SYSPAL_ERROR 0
|
||||
#define SYSPAL_STATIC 1
|
||||
|
|
Loading…
Reference in a new issue