Alexandre Julliard : opengl32: Move wglGetCurrentContext implementation to opengl32.
Alexandre Julliard
julliard at winehq.org
Thu Jun 28 13:55:16 CDT 2012
Module: wine
Branch: master
Commit: 855f225498e4ed2dc6cb1fb71aa5d9dcedd64744
URL: http://source.winehq.org/git/wine.git/?a=commit;h=855f225498e4ed2dc6cb1fb71aa5d9dcedd64744
Author: Alexandre Julliard <julliard at winehq.org>
Date: Thu Jun 28 18:51:54 2012 +0200
opengl32: Move wglGetCurrentContext implementation to opengl32.
---
dlls/opengl32/wgl.c | 4 +---
dlls/winex11.drv/opengl.c | 9 ---------
2 files changed, 1 insertions(+), 12 deletions(-)
diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c
index 4d5510f..203ee46 100644
--- a/dlls/opengl32/wgl.c
+++ b/dlls/opengl32/wgl.c
@@ -51,7 +51,6 @@ static struct
/* internal WGL functions */
void (WINAPI *p_wglFinish)(void);
void (WINAPI *p_wglFlush)(void);
- HGLRC (WINAPI *p_wglGetCurrentContext)(void);
void (WINAPI *p_wglGetIntegerv)(GLenum pname, GLint* params);
} wine_wgl;
@@ -178,7 +177,7 @@ HGLRC WINAPI wglCreateContext(HDC hdc)
*/
HGLRC WINAPI wglGetCurrentContext(void)
{
- return wine_wgl.p_wglGetCurrentContext();
+ return NtCurrentTeb()->glContext;
}
/***********************************************************************
@@ -1119,7 +1118,6 @@ static BOOL process_attach(void)
/* internal WGL functions */
wine_wgl.p_wglFinish = (void *)wgl_driver->p_wglGetProcAddress("wglFinish");
wine_wgl.p_wglFlush = (void *)wgl_driver->p_wglGetProcAddress("wglFlush");
- wine_wgl.p_wglGetCurrentContext = (void *)wgl_driver->p_wglGetProcAddress("wglGetCurrentContext");
wine_wgl.p_wglGetIntegerv = (void *)wgl_driver->p_wglGetProcAddress("wglGetIntegerv");
return TRUE;
}
diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c
index 10cd5ef..d67b5f6 100644
--- a/dlls/winex11.drv/opengl.c
+++ b/dlls/winex11.drv/opengl.c
@@ -1779,14 +1779,6 @@ static BOOL glxdrv_wglShareLists(HGLRC hglrc1, HGLRC hglrc2)
}
/***********************************************************************
- * X11DRV_wglGetCurrentContext
- */
-static HGLRC WINAPI X11DRV_wglGetCurrentContext(void)
-{
- return NtCurrentTeb()->glContext;
-}
-
-/***********************************************************************
* glxdrv_wglGetCurrentDC
*/
static HDC glxdrv_wglGetCurrentDC(void)
@@ -3066,7 +3058,6 @@ static const WineGLExtension WGL_internal_functions =
{
{ "wglFinish", X11DRV_wglFinish },
{ "wglFlush", X11DRV_wglFlush },
- { "wglGetCurrentContext", X11DRV_wglGetCurrentContext },
{ "wglGetIntegerv", X11DRV_wglGetIntegerv },
}
};
More information about the wine-cvs
mailing list