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

opengl32: Move wglGetCurrentContext implementation to opengl32.

Browse Source
This commit is contained in:
Alexandre Julliard 2012-06-28 18:51:54 +02:00
parent edfc7f0de0
commit 855f225498
2 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/opengl32/wgl.c
View File

@ -51,7 +51,6 @@ static struct
/* internal WGL functions */ /* internal WGL functions */
void (WINAPI *p_wglFinish)(void); void (WINAPI *p_wglFinish)(void);
void (WINAPI *p_wglFlush)(void); void (WINAPI *p_wglFlush)(void);
HGLRC (WINAPI *p_wglGetCurrentContext)(void);
void (WINAPI *p_wglGetIntegerv)(GLenum pname, GLint* params); void (WINAPI *p_wglGetIntegerv)(GLenum pname, GLint* params);
} wine_wgl; } wine_wgl;
@ -178,7 +177,7 @@ HGLRC WINAPI wglCreateContext(HDC hdc)
*/ */
HGLRC WINAPI wglGetCurrentContext(void) HGLRC WINAPI wglGetCurrentContext(void)
{ {
return wine_wgl.p_wglGetCurrentContext(); return NtCurrentTeb()->glContext;
} }
/*********************************************************************** /***********************************************************************
@ -1119,7 +1118,6 @@ static BOOL process_attach(void)
/* internal WGL functions */ /* internal WGL functions */
wine_wgl.p_wglFinish = (void *)wgl_driver->p_wglGetProcAddress("wglFinish"); wine_wgl.p_wglFinish = (void *)wgl_driver->p_wglGetProcAddress("wglFinish");
wine_wgl.p_wglFlush = (void *)wgl_driver->p_wglGetProcAddress("wglFlush"); 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"); wine_wgl.p_wglGetIntegerv = (void *)wgl_driver->p_wglGetProcAddress("wglGetIntegerv");
return TRUE; return TRUE;
} }

9
dlls/winex11.drv/opengl.c
View File

@ -1778,14 +1778,6 @@ static BOOL glxdrv_wglShareLists(HGLRC hglrc1, HGLRC hglrc2)
return FALSE; return FALSE;
} }
/***********************************************************************
* X11DRV_wglGetCurrentContext
*/
static HGLRC WINAPI X11DRV_wglGetCurrentContext(void)
{
return NtCurrentTeb()->glContext;
}
/*********************************************************************** /***********************************************************************
* glxdrv_wglGetCurrentDC * glxdrv_wglGetCurrentDC
*/ */
@ -3066,7 +3058,6 @@ static const WineGLExtension WGL_internal_functions =
{ {
{ "wglFinish", X11DRV_wglFinish }, { "wglFinish", X11DRV_wglFinish },
{ "wglFlush", X11DRV_wglFlush }, { "wglFlush", X11DRV_wglFlush },
{ "wglGetCurrentContext", X11DRV_wglGetCurrentContext },
{ "wglGetIntegerv", X11DRV_wglGetIntegerv }, { "wglGetIntegerv", X11DRV_wglGetIntegerv },
} }
}; };