Henri Verbeet : wined3d: Get rid of the render target / overlay check in wined3d_surface_flip().

Alexandre Julliard julliard at winehq.org
Wed Sep 11 16:01:45 CDT 2013


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

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Wed Sep 11 08:47:48 2013 +0200

wined3d: Get rid of the render target / overlay check in wined3d_surface_flip().

The surface needs to be part of a swapchain to be flipped, but that doesn't
have much to do with WINED3DUSAGE_RENDERTARGET. We can just remove the check
here, because ddraw_surface7_Flip() already has the correct check.

---

 dlls/wined3d/surface.c |    7 -------
 1 files changed, 0 insertions(+), 7 deletions(-)

diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index dbf6fef..87ae02d 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -3706,13 +3706,6 @@ HRESULT CDECL wined3d_surface_flip(struct wined3d_surface *surface, struct wined
         return WINEDDERR_NOTFLIPPABLE;
     }
 
-    /* Flipping is only supported on render targets and overlays. */
-    if (!(surface->resource.usage & (WINED3DUSAGE_RENDERTARGET | WINED3DUSAGE_OVERLAY)))
-    {
-        WARN("Tried to flip a non-render target, non-overlay surface.\n");
-        return WINEDDERR_NOTFLIPPABLE;
-    }
-
     flip_surface(surface, override);
 
     /* Update overlays if they're visible. */




More information about the wine-cvs mailing list