[PATCH 1/5] wined3d: Move the MAXLOCKCOUNT constant to surface.c.

Henri Verbeet hverbeet at codeweavers.com
Mon Sep 2 02:45:40 CDT 2013


---
 dlls/wined3d/surface.c         | 2 ++
 dlls/wined3d/wined3d_private.h | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index 66f15fb..970985d 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -34,6 +34,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_surface);
 WINE_DECLARE_DEBUG_CHANNEL(d3d_perf);
 WINE_DECLARE_DEBUG_CHANNEL(d3d);
 
+#define MAXLOCKCOUNT 50 /* After this amount of locks do not free the sysmem copy. */
+
 static HRESULT surface_cpu_blt(struct wined3d_surface *dst_surface, const RECT *dst_rect,
         struct wined3d_surface *src_surface, const RECT *src_rect, DWORD flags,
         const WINEDDBLTFX *fx, enum wined3d_texture_filter_type filter);
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 2f8c6b2..688671d 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -2207,7 +2207,6 @@ struct wined3d_surface
     RECT                      lockedRect;
     RECT                      dirtyRect;
     int                       lockCount;
-#define MAXLOCKCOUNT          50 /* After this amount of locks do not free the sysmem copy */
 
     /* For GetDC */
     struct wined3d_surface_dib dib;
-- 
1.8.1.5




More information about the wine-patches mailing list