ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gdi32: Avoid using the system GL headers.

This commit is contained in:
Alexandre Julliard 2012-11-07 14:43:02 +01:00
parent fdc1f2d432
commit af3f3cb1b2
2 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/gdi32/Makefile.in
View File

@ -2,7 +2,7 @@ EXTRADEFS = -D_GDI32_
MODULE = gdi32.dll MODULE = gdi32.dll
IMPORTLIB = gdi32 IMPORTLIB = gdi32
IMPORTS = advapi32 IMPORTS = advapi32
EXTRAINCL = @FREETYPEINCL@ @FONTCONFIGINCL@ @X_CFLAGS@ EXTRAINCL = @FREETYPEINCL@ @FONTCONFIGINCL@
EXTRALIBS = @CARBONLIB@ EXTRALIBS = @CARBONLIB@
DELAYIMPORTS = usp10 DELAYIMPORTS = usp10

34
dlls/gdi32/dibdrv/opengl.c
View File

@ -21,13 +21,6 @@
#include "config.h" #include "config.h"
#include "wine/port.h" #include "wine/port.h"
#ifdef HAVE_GL_OSMESA_H
#include <GL/osmesa.h>
#undef APIENTRY
#undef GLAPI
#undef WINGDIAPI
#endif
#include "gdi_private.h" #include "gdi_private.h"
#include "dibdrv.h" #include "dibdrv.h"
@ -38,8 +31,21 @@ WINE_DEFAULT_DEBUG_CHANNEL(dib);
#ifdef SONAME_LIBOSMESA #ifdef SONAME_LIBOSMESA
#include "wine/wgl.h"
#include "wine/wgl_driver.h" #include "wine/wgl_driver.h"
#define OSMESA_COLOR_INDEX GL_COLOR_INDEX
#define OSMESA_RGBA GL_RGBA
#define OSMESA_BGRA 0x1
#define OSMESA_ARGB 0x2
#define OSMESA_RGB GL_RGB
#define OSMESA_BGR 0x4
#define OSMESA_RGB_565 0x5
#define OSMESA_ROW_LENGTH 0x10
#define OSMESA_Y_UP 0x11
typedef struct osmesa_context *OSMesaContext;
extern BOOL WINAPI GdiSetPixelFormat( HDC hdc, INT fmt, const PIXELFORMATDESCRIPTOR *pfd ); extern BOOL WINAPI GdiSetPixelFormat( HDC hdc, INT fmt, const PIXELFORMATDESCRIPTOR *pfd );
struct wgl_context struct wgl_context
@ -54,13 +60,13 @@ static struct opengl_funcs opengl_funcs;
static const char *opengl_func_names[] = { ALL_WGL_FUNCS }; static const char *opengl_func_names[] = { ALL_WGL_FUNCS };
#undef USE_GL_FUNC #undef USE_GL_FUNC
#define MAKE_FUNCPTR(f) static typeof(f) * p##f; static OSMesaContext (*pOSMesaCreateContextExt)( GLenum format, GLint depthBits, GLint stencilBits,
MAKE_FUNCPTR(OSMesaCreateContextExt) GLint accumBits, OSMesaContext sharelist );
MAKE_FUNCPTR(OSMesaDestroyContext) static void (*pOSMesaDestroyContext)( OSMesaContext ctx );
MAKE_FUNCPTR(OSMesaGetProcAddress) static void * (*pOSMesaGetProcAddress)( const char *funcName );
MAKE_FUNCPTR(OSMesaMakeCurrent) static GLboolean (*pOSMesaMakeCurrent)( OSMesaContext ctx, void *buffer, GLenum type,
MAKE_FUNCPTR(OSMesaPixelStore) GLsizei width, GLsizei height );
#undef MAKE_FUNCPTR static void (*pOSMesaPixelStore)( GLint pname, GLint value );
static const struct static const struct
{ {