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

opengl32: Optimize thunks by storing GL context in the thread environment block.

This commit is contained in:
Mike Hearn 2006-03-20 16:55:06 +00:00 committed by Alexandre Julliard
parent e6f16250b2
commit 253a2d089c
2 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/opengl32/Makefile.in
View File

@ -4,7 +4,7 @@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = opengl32.dll MODULE = opengl32.dll
IMPORTLIB = libopengl32.$(IMPLIBEXT) IMPORTLIB = libopengl32.$(IMPLIBEXT)
IMPORTS = user32 gdi32 advapi32 kernel32 IMPORTS = user32 gdi32 advapi32 kernel32 ntdll
EXTRAINCL = @X_CFLAGS@ EXTRAINCL = @X_CFLAGS@
EXTRALIBS = @X_LIBS@ @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@ @OPENGL_LIBS@ EXTRALIBS = @X_LIBS@ @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@ @OPENGL_LIBS@

27
dlls/opengl32/wgl.c
View File

@ -31,6 +31,8 @@
#include "winerror.h" #include "winerror.h"
#include "winreg.h" #include "winreg.h"
#include "wingdi.h" #include "wingdi.h"
#include "winternl.h"
#include "winnt.h"
#include "wgl_ext.h" #include "wgl_ext.h"
#include "opengl_ext.h" #include "opengl_ext.h"
@ -82,6 +84,7 @@ typedef struct wine_glcontext {
XVisualInfo *vis; XVisualInfo *vis;
GLXFBConfig fb_conf; GLXFBConfig fb_conf;
GLXContext ctx; GLXContext ctx;
BOOL do_escape;
struct wine_glcontext *next; struct wine_glcontext *next;
struct wine_glcontext *prev; struct wine_glcontext *prev;
} Wine_GLContext; } Wine_GLContext;
@ -96,18 +99,13 @@ static inline Wine_GLContext *get_context_from_GLXContext(GLXContext ctx)
void enter_gl(void) void enter_gl(void)
{ {
GLXContext gl_ctx; Wine_GLContext *curctx = (Wine_GLContext *) NtCurrentTeb()->glContext;
Wine_GLContext *ctx;
enum x11drv_escape_codes escape = X11DRV_SYNC_PIXMAP; if (curctx && curctx->do_escape)
{
wine_tsx11_lock_ptr(); enum x11drv_escape_codes escape = X11DRV_SYNC_PIXMAP;
gl_ctx = glXGetCurrentContext(); ExtEscape(curctx->hdc, X11DRV_ESCAPE, sizeof(escape), (LPCSTR)&escape, 0, NULL);
if(!gl_ctx) return; }
ctx = get_context_from_GLXContext(gl_ctx);
wine_tsx11_unlock_ptr(); /* unlock before calling GDI apis */
if(ctx && GetObjectType(ctx->hdc) == OBJ_MEMDC)
ExtEscape(ctx->hdc, X11DRV_ESCAPE, sizeof(escape), (LPCSTR)&escape, 0, NULL);
wine_tsx11_lock_ptr(); wine_tsx11_lock_ptr();
return; return;
@ -541,6 +539,7 @@ BOOL WINAPI wglMakeCurrent(HDC hdc,
ENTER_GL(); ENTER_GL();
if (hglrc == NULL) { if (hglrc == NULL) {
ret = glXMakeCurrent(default_display, None, NULL); ret = glXMakeCurrent(default_display, None, NULL);
NtCurrentTeb()->glContext = NULL;
} else { } else {
Wine_GLContext *ctx = (Wine_GLContext *) hglrc; Wine_GLContext *ctx = (Wine_GLContext *) hglrc;
Drawable drawable = get_drawable( hdc ); Drawable drawable = get_drawable( hdc );
@ -571,8 +570,12 @@ BOOL WINAPI wglMakeCurrent(HDC hdc,
} }
TRACE(" make current for dis %p, drawable %p, ctx %p\n", ctx->display, (void*) drawable, ctx->ctx); TRACE(" make current for dis %p, drawable %p, ctx %p\n", ctx->display, (void*) drawable, ctx->ctx);
ret = glXMakeCurrent(ctx->display, drawable, ctx->ctx); ret = glXMakeCurrent(ctx->display, drawable, ctx->ctx);
NtCurrentTeb()->glContext = ctx;
if(ret && type == OBJ_MEMDC) if(ret && type == OBJ_MEMDC)
{
ctx->do_escape = TRUE;
glDrawBuffer(GL_FRONT_LEFT); glDrawBuffer(GL_FRONT_LEFT);
}
} }
LEAVE_GL(); LEAVE_GL();
TRACE(" returning %s\n", (ret ? "True" : "False")); TRACE(" returning %s\n", (ret ? "True" : "False"));