diff options
| author | Jon TURNEY <jon.turney@dronecode.org.uk> | 2014-01-11 18:07:52 +0000 |
|---|---|---|
| committer | Jon TURNEY <jon.turney@dronecode.org.uk> | 2014-01-11 18:07:52 +0000 |
| commit | ca93bacd8e69427b24109ade3b955a9bb8d47f9a (patch) | |
| tree | ce191cf0bd8a81e9128f928cddb1234b696ec52d | |
| parent | 24cc1f4d9f4475d1b0c256586fb8760dc1d92847 (diff) | |
| parent | fadf220c47f889720f7a4bca9f0f6e1bab9b27be (diff) | |
Merge branch 'cygwin-patches-for-1.15' into cygwin-release-1.15xserver-cygwin-1.15.0-2
| -rw-r--r-- | glx/glxext.c | 5 | ||||
| -rw-r--r-- | glx/glxext.h | 1 | ||||
| -rw-r--r-- | hw/xwin/glx/indirect.c | 4 |
3 files changed, 7 insertions, 3 deletions
diff --git a/glx/glxext.c b/glx/glxext.c index f93642b0c..3fa7095ee 100644 --- a/glx/glxext.c +++ b/glx/glxext.c @@ -72,6 +72,7 @@ static DevPrivateKeyRec glxClientPrivateKeyRec; ** Forward declarations. */ static int __glXDispatch(ClientPtr); +static GLboolean __glXFreeContext(__GLXcontext * cx); /* ** Called when the extension is reset. @@ -194,7 +195,7 @@ __glXRemoveFromContextList(__GLXcontext * cx) /* ** Free a context. */ -GLboolean +static GLboolean __glXFreeContext(__GLXcontext * cx) { if (cx->idExists || cx->currentClient) @@ -298,7 +299,7 @@ glxClientCallback(CallbackListPtr *list, pointer closure, pointer data) if (c->currentClient == pClient) { c->loseCurrent(c); c->currentClient = NULL; - __glXFreeContext(c); + FreeResourceByType(c, __glXContextRes, FALSE); } } diff --git a/glx/glxext.h b/glx/glxext.h index 3f2dee696..cde0e1519 100644 --- a/glx/glxext.h +++ b/glx/glxext.h @@ -51,7 +51,6 @@ #define GLX_RGBA_UNSIGNED_FLOAT_TYPE_EXT 0x20B1 #endif -extern GLboolean __glXFreeContext(__GLXcontext * glxc); extern void __glXFlushContextCache(void); extern Bool __glXAddContext(__GLXcontext * cx); diff --git a/hw/xwin/glx/indirect.c b/hw/xwin/glx/indirect.c index 3d01bed39..e8e75d534 100644 --- a/hw/xwin/glx/indirect.c +++ b/hw/xwin/glx/indirect.c @@ -1937,6 +1937,8 @@ glxWinCreateConfigs(HDC hdc, glxWinScreen * screen) /* EXT_visual_rating / GLX 1.2 */ if (pfd.dwFlags & PFD_GENERIC_FORMAT) { c->base.visualRating = GLX_SLOW_VISUAL_EXT; + GLWIN_DEBUG_MSG("pixelFormat %d is un-accelerated, skipping", i + 1); + continue; } else { // PFD_GENERIC_ACCELERATED is not considered, so this may be MCD or ICD acclerated... @@ -2277,6 +2279,8 @@ glxWinCreateConfigsExt(HDC hdc, glxWinScreen * screen) case WGL_NO_ACCELERATION_ARB: c->base.visualRating = GLX_SLOW_VISUAL_EXT; + GLWIN_DEBUG_MSG("pixelFormat %d is un-accelerated, skipping", i + 1); + continue; break; case WGL_GENERIC_ACCELERATION_ARB: |