occlusion query moved down again and fixme's got eaten up

[Christoph Frick]

hiho

i sent a similar patch some time ago and with todays CVS it changed
back. or this now intentional? as in: WINE will never support this
queries? would for that case a TRACE('wontfix') be better?

License: LGPL
ChangeLog:
	dlls/wined3d/device.c:
	- warn about missing hardware occlusion query
	- call FIXME for every unimplemented case in CreateQuery

-- 
cu

Index: dlls/wined3d/device.c
===================================================================
RCS file: /home/wine/wine/dlls/wined3d/device.c,v
retrieving revision 1.99
diff -u -r1.99 device.c
--- dlls/wined3d/device.c	21 Nov 2005 16:27:55 -0000	1.99
+++ dlls/wined3d/device.c	22 Nov 2005 07:42:41 -0000
@@ -1096,6 +1096,13 @@
         HRESULT hr = D3DERR_NOTAVAILABLE;
         /* Lie and say everything is good (we can return ok fake data from a stub) */
         switch(Type) {
+        case WINED3DQUERYTYPE_OCCLUSION:
+            TRACE("(%p) occlusion query\n", This);
+            if (GL_SUPPORT(ARB_OCCLUSION_QUERY) || GL_SUPPORT(NV_OCCLUSION_QUERY))
+                hr = D3D_OK;
+            else
+                WARN("Not supported: ARB_OCCLUSION_QUERY/NV_OCCLUSION_QUERY\n");
+            break;
         case WINED3DQUERYTYPE_VCACHE:
         case WINED3DQUERYTYPE_RESOURCEMANAGER:
         case WINED3DQUERYTYPE_VERTEXSTATS:
@@ -1109,12 +1116,6 @@
         case WINED3DQUERYTYPE_PIXELTIMINGS:
         case WINED3DQUERYTYPE_BANDWIDTHTIMINGS:
         case WINED3DQUERYTYPE_CACHEUTILIZATION:
-        break;
-        case WINED3DQUERYTYPE_OCCLUSION:
-            TRACE("(%p) occlusion query\n", This);
-            if (GL_SUPPORT(ARB_OCCLUSION_QUERY) || GL_SUPPORT(NV_OCCLUSION_QUERY))
-                hr = D3D_OK;
-        break;
         default:
             FIXME("(%p) Unhandled query type %d\n",This , Type);
         }
-------------- 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/20051122/d88d864e/attachment.pgp