wined3d: move traces into D3DFmtMakeGlCfg and fix FIXME for depth/stencil buffer "not found"

Christoph Frick frick at sc-networks.de
Thu Apr 13 03:24:08 CDT 2006


License: LGPL
ChangeLog:
2006-04-12  Christoph Frick <rid at zefix.tv>
	* dlls/wined3d/device.c
	move traces into D3DFmtMakeGlCfg and fix FIXME for depth/stencil
	buffer "not found"
-- 
cu

Index: dlls/wined3d/device.c
===================================================================
RCS file: /home/wine/wine/dlls/wined3d/device.c,v
retrieving revision 1.177
diff -u -r1.177 device.c
--- dlls/wined3d/device.c	12 Apr 2006 19:03:44 -0000	1.177
+++ dlls/wined3d/device.c	13 Apr 2006 08:15:04 -0000
@@ -6202,7 +6202,6 @@
     PUSH2(GLX_DRAWABLE_TYPE, GLX_PBUFFER_BIT);
     PUSH2(GLX_X_RENDERABLE,  TRUE);
     PUSH2(GLX_DOUBLEBUFFER,  TRUE);
-    TRACE("calling makeglcfg\n");
     D3DFmtMakeGlCfg(BackBufferFormat, StencilBufferFormat, attribs, &nAttribs, FALSE /* alternate */);
     PUSH1(None);
 
@@ -6219,7 +6218,6 @@
        /* PUSH2(GLX_X_RENDERABLE,  TRUE); */
         PUSH2(GLX_RENDER_TYPE,   GLX_RGBA_BIT);
         PUSH2(GLX_DOUBLEBUFFER, FALSE);
-        TRACE("calling makeglcfg\n");
         D3DFmtMakeGlCfg(BackBufferFormat, StencilBufferFormat, attribs, &nAttribs, TRUE /* alternate */);
         PUSH1(None);
         cfgs = glXChooseFBConfig(impSwapChain->display, DefaultScreen(impSwapChain->display),
Index: dlls/wined3d/utils.c
===================================================================
RCS file: /home/wine/wine/dlls/wined3d/utils.c,v
retrieving revision 1.29
diff -u -r1.29 utils.c
--- dlls/wined3d/utils.c	10 Apr 2006 14:34:09 -0000	1.29
+++ dlls/wined3d/utils.c	13 Apr 2006 08:15:05 -0000
@@ -1889,6 +1889,7 @@
     D3D now supports floating point format buffers, and there are a number of different OpelGl ways of managing these e.g.
     GLX_ATI_pixel_format_float
     */
+    TRACE("search for BackBufferFormat: %s\n", debug_d3dformat(BackBufferFormat));
     switch (BackBufferFormat) {
         /* color buffer */
     case WINED3DFMT_P8:
@@ -1947,6 +1948,7 @@
         break;
     }
     if(!alternate){
+        TRACE("search for StencilBufferFormat: %s\n", debug_d3dformat(StencilBufferFormat));
         switch (StencilBufferFormat) {
     case WINED3DFMT_D16_LOCKABLE:
     case WINED3DFMT_D16:
@@ -1984,11 +1986,12 @@
         break;
 
     default:
-        FIXME("Unsupported stencil format: %s\n", debug_d3dformat(BackBufferFormat));
+        FIXME("Unsupported stencil format: %s\n", debug_d3dformat(StencilBufferFormat));
         break;
     }
 
     } else { /* it the device doesn't support the 'exact' format, try to find something close */
+        TRACE("search for alternate StencilBufferFormat: %s\n", debug_d3dformat(StencilBufferFormat));
         switch (StencilBufferFormat) {
         case WINED3DFMT_D16_LOCKABLE:
         case WINED3DFMT_D16:
@@ -2026,7 +2029,7 @@
             break;
 
         default:
-            FIXME("Unsupported stencil format: %s\n", debug_d3dformat(BackBufferFormat));
+            FIXME("Unsupported stencil format: %s\n", debug_d3dformat(StencilBufferFormat));
             break;
         }
     }
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 163 bytes
Desc: not available
Url : http://www.winehq.org/pipermail/wine-patches/attachments/20060413/2db3896c/attachment-0001.pgp


More information about the wine-patches mailing list