diff options
| author | marha <marha@users.sourceforge.net> | 2011-07-14 16:15:03 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-07-14 16:15:03 +0200 |
| commit | 31ee9c57db79281e122d3c4acb0f8eae07f4449f (patch) | |
| tree | 222bc6f83ebdb15721e7acfdb829aa85606e243a /xorg-server/hw/xwin/glx/winpriv.c | |
| parent | 8797d6ab8ef5121c900cd74b8662305ec7aeb34b (diff) | |
| parent | d03a5f20114203fd00e0004659fd2617f4c03a32 (diff) | |
| download | vcxsrv-31ee9c57db79281e122d3c4acb0f8eae07f4449f.tar.gz vcxsrv-31ee9c57db79281e122d3c4acb0f8eae07f4449f.tar.bz2 vcxsrv-31ee9c57db79281e122d3c4acb0f8eae07f4449f.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/mesa/state_tracker/st_context.c
xorg-server/hw/xquartz/GL/indirect.c
xorg-server/hw/xwin/glx/indirect.c
xorg-server/hw/xwin/glx/wgl_ext_api.c
xorg-server/hw/xwin/glx/winpriv.c
xorg-server/hw/xwin/man/XWin.man
xorg-server/hw/xwin/winmultiwindowwindow.c
Diffstat (limited to 'xorg-server/hw/xwin/glx/winpriv.c')
| -rw-r--r-- | xorg-server/hw/xwin/glx/winpriv.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/xorg-server/hw/xwin/glx/winpriv.c b/xorg-server/hw/xwin/glx/winpriv.c index c689bae08..4e7728963 100644 --- a/xorg-server/hw/xwin/glx/winpriv.c +++ b/xorg-server/hw/xwin/glx/winpriv.c @@ -22,7 +22,7 @@ winCreateWindowsWindow (WindowPtr pWin); HWND winGetWindowInfo(WindowPtr pWin) { HWND hwnd = NULL; - winDebug("%s:%d pWin=%p\n", __FUNCTION__, __LINE__, pWin); + winDebug("%s:%d pWin %p XID 0x%x\n", __FUNCTION__, __LINE__, pWin, pWin->drawable.id); /* a real window was requested */ if (pWin != NULL) @@ -95,7 +95,7 @@ HWND winGetWindowInfo(WindowPtr pWin) GetModuleHandle(NULL), NULL); winDebug("Window created %x %x %d %d %d %d\n",pWinPriv->hWnd,hWndParent,pWin->drawable.x-offsetx,pWin->drawable.y-offsety,pWin->drawable.width, pWin->drawable.height); - pWinPriv->GlCtxWnd=TRUE; + pWinPriv->fWglUsed=TRUE; } else { @@ -107,6 +107,9 @@ HWND winGetWindowInfo(WindowPtr pWin) { /* copy window handle */ hwnd = pWinPriv->hWnd; + + /* mark GLX active on that hwnd */ + pWinPriv->fWglUsed = TRUE; } } else if (g_fXdmcpEnabled) @@ -140,7 +143,7 @@ HWND winGetWindowInfo(WindowPtr pWin) NULL, GetModuleHandle(NULL), NULL); - pWinPriv->GlCtxWnd=TRUE; + pWinPriv->fWglUsed=TRUE; /* copy size and window handle */ hwnd = pWinPriv->hWnd; } |