Roderick Colenbrander : wgl: Set PFD_GENERIC_FORMAT on bitmap formats instead of PFD_GENERIC_ACCELERATED .

[Alexandre Julliard]

Module: wine
Branch: master
Commit: d66ded939c4c21fbc3bd21e9e48a30a41303e9fc
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=d66ded939c4c21fbc3bd21e9e48a30a41303e9fc

Author: Roderick Colenbrander <thunderbird2k at gmail.com>
Date:   Tue May 19 21:42:09 2009 +0200

wgl: Set PFD_GENERIC_FORMAT on bitmap formats instead of PFD_GENERIC_ACCELERATED.

---

 dlls/winex11.drv/opengl.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c
index 3d7c456..b15b4e2 100644
--- a/dlls/winex11.drv/opengl.c
+++ b/dlls/winex11.drv/opengl.c
@@ -939,7 +939,7 @@ static WineGLPixelFormat *get_formats(Display *display, int *size_ret, int *onsc
                     list[size].fmt_id = fmt_id;
                     list[size].render_type = get_render_type_from_fbconfig(display, cfgs[i]);
                     list[size].offscreenOnly = FALSE;
-                    list[size].dwFlags = PFD_DRAW_TO_BITMAP | PFD_SUPPORT_GDI | PFD_GENERIC_ACCELERATED;
+                    list[size].dwFlags = PFD_DRAW_TO_BITMAP | PFD_SUPPORT_GDI | PFD_GENERIC_FORMAT;
                     size++;
                     onscreen_size++;
                 }
@@ -1411,11 +1411,11 @@ int CDECL X11DRV_DescribePixelFormat(X11DRV_PDEVICE *physDev,
   ppfd->dwFlags |= fmt->dwFlags & (PFD_DRAW_TO_BITMAP | PFD_SUPPORT_GDI);
 
   /* PFD_GENERIC_FORMAT - gdi software rendering
-   * PFD_GENERIC_ACCELERATED - some parts are accelerated by a display driver (ICD or MCD)
+   * PFD_GENERIC_ACCELERATED - some parts are accelerated by a display driver (MCD e.g. 3dfx minigl)
    * none set - full hardware accelerated by a ICD
    *
-   * We only set PFD_GENERIC_ACCELERATED on bitmap formats (see get_formats) as that's what ATI and Nvidia Windows drivers do  */
-  ppfd->dwFlags |= fmt->dwFlags & PFD_GENERIC_ACCELERATED;
+   * We only set PFD_GENERIC_FORMAT on bitmap formats (see get_formats) as that's what ATI and Nvidia Windows drivers do  */
+  ppfd->dwFlags |= fmt->dwFlags & (PFD_GENERIC_FORMAT | PFD_GENERIC_ACCELERATED);
 
   pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_DOUBLEBUFFER, &value);
   if (value) {