diff options
| author | Jon TURNEY <jon.turney@dronecode.org.uk> | 2014-01-11 16:35:31 +0000 |
|---|---|---|
| committer | Mike DePaulo <mikedep333@gmail.com> | 2015-06-27 18:53:59 -0400 |
| commit | d45db884b19a0f081fcd259e3b338a13378c936d (patch) | |
| tree | e9e972389bcf7e98dd2371b3a74676d10fcc1a67 | |
| parent | 701edad03592c4f827fb57ced38a87b9ddacc83b (diff) | |
| download | vcxsrv-bugfix/bug4.tar.gz vcxsrv-bugfix/bug4.tar.bz2 vcxsrv-bugfix/bug4.zip | |
hw/xwin/glx: Don't create fbConfigs for un-accelerated pixelFormatsbugfix/bug4
For some reason, glxinfo is now selecting an un-accelerated fbConfig, which
leads to "GDI Generic" being reported as the renderer name.
For the moment, just don't create fbConfigs for un-accelerated pixelFormats.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
V2: Port to VcXsrv (X2Go/Arctica Builds) 1.17.0.0-x (Mike DePaulo)
(This empirically disables StaticColor, thus fixing bug #3).
| -rwxr-xr-x | xorg-server/hw/xwin/glx/indirect.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/xorg-server/hw/xwin/glx/indirect.c b/xorg-server/hw/xwin/glx/indirect.c index ada61561b..07bd91ad2 100755 --- a/xorg-server/hw/xwin/glx/indirect.c +++ b/xorg-server/hw/xwin/glx/indirect.c @@ -2092,6 +2092,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... @@ -2435,6 +2437,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: |