[PATCH 3/5] wined3d: Get rid of client_memory from wineD3DSurface_DIB.
Henri Verbeet
hverbeet at codeweavers.com
Mon Nov 7 14:19:59 CST 2011
---
dlls/wined3d/surface.c | 8 --------
dlls/wined3d/swapchain.c | 8 --------
dlls/wined3d/wined3d_private.h | 1 -
3 files changed, 0 insertions(+), 17 deletions(-)
diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index 7af21b4..5d32512 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -4800,14 +4800,6 @@ void flip_surface(struct wined3d_surface *front, struct wined3d_surface *back)
back->pbo = tmp_pbo;
}
- /* client_memory should not be different, but just in case */
- {
- BOOL tmp;
- tmp = front->dib.client_memory;
- front->dib.client_memory = back->dib.client_memory;
- back->dib.client_memory = tmp;
- }
-
/* Flip the opengl texture */
{
GLuint tmp;
diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c
index 7d7be5b..a02a189 100644
--- a/dlls/wined3d/swapchain.c
+++ b/dlls/wined3d/swapchain.c
@@ -787,14 +787,6 @@ static HRESULT swapchain_gdi_present(struct wined3d_swapchain *swapchain, const
ERR("GDI Surface %p has heap memory allocated.\n", back);
}
- /* Client_memory should not be different, but just in case. */
- {
- BOOL tmp;
- tmp = front->dib.client_memory;
- front->dib.client_memory = back->dib.client_memory;
- back->dib.client_memory = tmp;
- }
-
/* FPS support */
if (TRACE_ON(fps))
{
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index e81ff88..d573d9f 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -1949,7 +1949,6 @@ typedef struct wineD3DSurface_DIB {
HBITMAP DIBsection;
void* bitmap_data;
UINT bitmap_size;
- BOOL client_memory;
} wineD3DSurface_DIB;
struct wined3d_renderbuffer_entry
--
1.7.3.4
More information about the wine-patches
mailing list