Oh well, it was more than a debug print after all...

Correct commit message would be
[OPENGL32]
- Take PFD_DRAW_TO_WINDOW, PFD_SUPPORT_OPENGL and PFD_SUPPORT_GDI into account in wglChoosePixelFormat
 - Add a debug print

Regards
Jérôme

Le 02/01/2014 09:46, jgar...@svn.reactos.org a écrit :
Author: jgardou
Date: Thu Jan  2 08:46:51 2014
New Revision: 61487

URL: http://svn.reactos.org/svn/reactos?rev=61487&view=rev
Log:
[OPENGL32]
  - Add a debug print.
CORE-7727 #comment Please retest with debugging turned on on r61487

Modified:
     trunk/reactos/dll/opengl/opengl32/wgl.c

Modified: trunk/reactos/dll/opengl/opengl32/wgl.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/opengl32/wgl.c?rev=61487&r1=61486&r2=61487&view=diff
==============================================================================
--- trunk/reactos/dll/opengl/opengl32/wgl.c     [iso-8859-1] (original)
+++ trunk/reactos/dll/opengl/opengl32/wgl.c     [iso-8859-1] Thu Jan  2 
08:46:51 2014
@@ -78,6 +78,7 @@
          data->nb_icd_formats = data->icd_data->DrvDescribePixelFormat(hdc, 0, 
0, NULL);
      else
          data->nb_icd_formats = 0;
+    TRACE("ICD %S has %u formats for HDC %x.\n", data->icd_data->DriverName, 
data->nb_icd_formats, hdc);
      data->nb_sw_formats = sw_DescribePixelFormat(hdc, 0, 0, NULL);
      data->next = dc_data_list;
      dc_data_list = data;
@@ -191,10 +192,31 @@
              continue;
          }
- /* only use bitmap capable for formats for bitmap rendering */
-        if( (ppfd->dwFlags & PFD_DRAW_TO_BITMAP) != (format.dwFlags & 
PFD_DRAW_TO_BITMAP))
+        /* only use bitmap capable formats for bitmap rendering */
+        if ((ppfd->dwFlags & PFD_DRAW_TO_BITMAP) != (format.dwFlags & 
PFD_DRAW_TO_BITMAP))
          {
              TRACE( "PFD_DRAW_TO_BITMAP mismatch for iPixelFormat=%d\n", i );
+            continue;
+        }
+
+        /* only use window capable formats for window rendering */
+        if ((ppfd->dwFlags & PFD_DRAW_TO_WINDOW) != (format.dwFlags & 
PFD_DRAW_TO_WINDOW))
+        {
+            TRACE( "PFD_DRAW_TO_WINDOW mismatch for iPixelFormat=%d\n", i );
+            continue;
+        }
+
+        /* only use opengl capable formats for opengl rendering */
+        if ((ppfd->dwFlags & PFD_SUPPORT_OPENGL) != (format.dwFlags & 
PFD_SUPPORT_OPENGL))
+        {
+            TRACE( "PFD_SUPPORT_OPENGL mismatch for iPixelFormat=%d\n", i );
+            continue;
+        }
+
+        /* only use GDI capable formats for GDI rendering */
+        if ((ppfd->dwFlags & PFD_SUPPORT_GDI) != (format.dwFlags & 
PFD_SUPPORT_GDI))
+        {
+            TRACE( "PFD_SUPPORT_GDI mismatch for iPixelFormat=%d\n", i );
              continue;
          }



_______________________________________________
Ros-dev mailing list
Ros-dev@reactos.org
http://www.reactos.org/mailman/listinfo/ros-dev

Reply via email to