Henri Verbeet : wined3d: Remove surface_draw_overlay from wined3d_surface_ops.

[Alexandre Julliard]

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

Author: Henri Verbeet 
Date:   Sun Nov  6 22:05:56 2011 +0100

wined3d: Remove surface_draw_overlay from wined3d_surface_ops.

---

dlls/wined3d/surface.c         |   18 +++++-------------
 dlls/wined3d/wined3d_private.h |    1 -
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index a123016..d70e22d 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -1019,7 +1019,7 @@ static void surface_unmap(struct wined3d_surface *surface)
 done:
     /* Overlays have to be redrawn manually after changes with the GL implementation */
     if (surface->overlay_dest)
-        surface->surface_ops->surface_draw_overlay(surface);
+        surface_draw_overlay(surface);
 }

static BOOL surface_is_full_rect(const struct wined3d_surface *surface, const RECT *r)
@@ -1908,7 +1908,6 @@ static const struct wined3d_surface_ops surface_ops =
 {
     surface_private_setup,
     surface_realize_palette,
-    surface_draw_overlay,
     surface_map,
     surface_unmap,
 };
@@ -1995,12 +1994,6 @@ static void gdi_surface_realize_palette(struct wined3d_surface *surface)
     }
 }

-static HRESULT gdi_surface_draw_overlay(struct wined3d_surface *surface)
-{
-    FIXME("GDI surfaces can't draw overlays yet.\n");
-    return E_FAIL;
-}
-
 static void gdi_surface_map(struct wined3d_surface *surface, const RECT *rect, DWORD flags)
 {
     TRACE("surface %p, rect %s, flags %#x.\n",
@@ -2036,7 +2029,6 @@ static const struct wined3d_surface_ops gdi_surface_ops =
 {
     gdi_surface_private_setup,
     gdi_surface_realize_palette,
-    gdi_surface_draw_overlay,
     gdi_surface_map,
     gdi_surface_unmap,
 };
@@ -3216,7 +3208,7 @@ HRESULT CDECL wined3d_surface_set_overlay_position(struct wined3d_surface *surfa
     surface->overlay_destrect.right = x + w;
     surface->overlay_destrect.bottom = y + h;

-    surface->surface_ops->surface_draw_overlay(surface);
+    surface_draw_overlay(surface);

return WINED3D_OK;
 }
@@ -3326,7 +3318,7 @@ HRESULT CDECL wined3d_surface_update_overlay(struct wined3d_surface *surface, co
         surface->overlay_dest = NULL;
     }

-    surface->surface_ops->surface_draw_overlay(surface);
+    surface_draw_overlay(surface);

return WINED3D_OK;
 }
@@ -3941,7 +3933,7 @@ HRESULT CDECL wined3d_surface_flip(struct wined3d_surface *surface, struct wined

/* Update overlays if they're visible. */
     if ((surface->resource.usage & WINED3DUSAGE_OVERLAY) && surface->overlay_dest)
-        return surface->surface_ops->surface_draw_overlay(surface);
+        return surface_draw_overlay(surface);

return WINED3D_OK;
 }
@@ -5794,7 +5786,7 @@ void surface_modify_location(struct wined3d_surface *surface, DWORD location, BO
         {
             LIST_FOR_EACH_ENTRY(overlay, &surface->overlays, struct wined3d_surface, overlay_entry)
             {
-                overlay->surface_ops->surface_draw_overlay(overlay);
+                surface_draw_overlay(overlay);
             }
         }
     }
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index ba78162..8b560f5 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -2001,7 +2001,6 @@ struct wined3d_surface_ops
 {
     HRESULT (*surface_private_setup)(struct wined3d_surface *surface);
     void (*surface_realize_palette)(struct wined3d_surface *surface);
-    HRESULT (*surface_draw_overlay)(struct wined3d_surface *surface);
     void (*surface_map)(struct wined3d_surface *surface, const RECT *rect, DWORD flags);
     void (*surface_unmap)(struct wined3d_surface *surface);
 };