Christoph Frick : wined3d: Better warn/fixme for query handling.

[Alexandre Julliard]

Module: wine
Branch: refs/heads/master
Commit: 61f8ef7936533ffb05e34311e6981b214f07d81d
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=61f8ef7936533ffb05e34311...

Author: Christoph Frick 
Date:   Thu Feb  9 12:07:30 2006 +0100

wined3d: Better warn/fixme for query handling.

---

dlls/wined3d/device.c |   17 ++++++++---------
 1 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index aff60cf..a642f79 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -1095,8 +1095,14 @@ HRESULT WINAPI IWineD3DDeviceImpl_Create
     if (NULL == ppQuery) {
         /* Just a check to see if we support this type of query */
         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("Unsupported in local OpenGL implementation: ARB_OCCLUSION_QUERY/NV_OCCLUSION_QUERY\n");
+            break;
         case WINED3DQUERYTYPE_VCACHE:
         case WINED3DQUERYTYPE_RESOURCEMANAGER:
         case WINED3DQUERYTYPE_VERTEXSTATS:
@@ -1110,16 +1116,9 @@ HRESULT WINAPI IWineD3DDeviceImpl_Create
         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);
+            FIXME("(%p) Unhandled query type %d\n", This, Type);
         }
-        FIXME("(%p) : Stub request for query type %d returned %ld\n", This, Type, hr);
         return hr;
     }