Henri Verbeet : wined3d: Print a FIXME for any flags passed to wined3d_surface_flip().

[Alexandre Julliard]

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

Author: Henri Verbeet <hverbeet(a)codeweavers.com>
Date:   Thu Sep  1 20:20:53 2011 +0200

wined3d: Print a FIXME for any flags passed to wined3d_surface_flip().

---

 dlls/wined3d/surface.c |   23 +++++++++--------------
 1 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index 4d7e35e..a06030b 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -3748,6 +3748,15 @@ HRESULT CDECL wined3d_surface_flip(struct wined3d_surface *surface, struct wined
 
     TRACE("surface %p, override %p, flags %#x.\n", surface, override, flags);
 
+    if (flags)
+    {
+        static UINT once;
+        if (!once++)
+            FIXME("Ignoring flags %#x.\n", flags);
+        else
+            WARN("Ignoring flags %#x.\n", flags);
+    }
+
     /* FIXME: This will also prevent overlay flips, since overlays aren't on
      * a swapchain either. */
     if (surface->container.type != WINED3D_CONTAINER_SWAPCHAIN)
@@ -3775,20 +3784,6 @@ HRESULT CDECL wined3d_surface_flip(struct wined3d_surface *surface, struct wined
             return WINED3D_OK;
     }
 
-    /* Just overwrite the swapchain presentation interval. This is ok because
-     * only ddraw apps can call Flip, and only d3d8 and d3d9 applications
-     * specify the presentation interval. */
-    if (!(flags & (WINEDDFLIP_NOVSYNC | WINEDDFLIP_INTERVAL2 | WINEDDFLIP_INTERVAL3 | WINEDDFLIP_INTERVAL4)))
-        swapchain->presentParms.PresentationInterval = WINED3DPRESENT_INTERVAL_ONE;
-    else if (flags & WINEDDFLIP_NOVSYNC)
-        swapchain->presentParms.PresentationInterval = WINED3DPRESENT_INTERVAL_IMMEDIATE;
-    else if (flags & WINEDDFLIP_INTERVAL2)
-        swapchain->presentParms.PresentationInterval = WINED3DPRESENT_INTERVAL_TWO;
-    else if (flags & WINEDDFLIP_INTERVAL3)
-        swapchain->presentParms.PresentationInterval = WINED3DPRESENT_INTERVAL_THREE;
-    else
-        swapchain->presentParms.PresentationInterval = WINED3DPRESENT_INTERVAL_FOUR;
-
     return wined3d_swapchain_present(swapchain, NULL, NULL, swapchain->win_handle, NULL, 0);
 }