[PATCH 4/8] ddraw: Remove a useless material callback.
Henri Verbeet
hverbeet at codeweavers.com
Tue Aug 17 12:03:24 CDT 2010
---
dlls/ddraw/ddraw.c | 1 -
dlls/ddraw/ddraw_private.h | 2 --
dlls/ddraw/device.c | 2 +-
dlls/ddraw/executebuffer.c | 2 +-
4 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c
index ff44960..670129d 100644
--- a/dlls/ddraw/ddraw.c
+++ b/dlls/ddraw/ddraw.c
@@ -4457,7 +4457,6 @@ static HRESULT WINAPI d3d3_CreateMaterial(IDirect3D3 *iface, IDirect3DMaterial3
object->IDirect3DMaterial_vtbl = &IDirect3DMaterial_Vtbl;
object->ref = 1;
object->ddraw = ddraw_from_d3d3(iface);
- object->activate = material_activate;
TRACE("Created material %p.\n", object);
*material = (IDirect3DMaterial3 *)object;
diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h
index 220d1bb..bb95767 100644
--- a/dlls/ddraw/ddraw_private.h
+++ b/dlls/ddraw/ddraw_private.h
@@ -550,8 +550,6 @@ struct IDirect3DMaterialImpl
D3DMATERIAL mat;
DWORD Handle;
-
- void (*activate)(IDirect3DMaterialImpl* this);
};
/* VTables in various versions */
diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c
index 6cd0f80..a17627b 100644
--- a/dlls/ddraw/device.c
+++ b/dlls/ddraw/device.c
@@ -3044,7 +3044,7 @@ IDirect3DDeviceImpl_3_SetLightState(IDirect3DDevice3 *iface,
}
TRACE(" activating material %p.\n", m);
- m->activate(m);
+ material_activate(m);
This->material = Value;
}
diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c
index 59481b1..9ae24a1 100644
--- a/dlls/ddraw/executebuffer.c
+++ b/dlls/ddraw/executebuffer.c
@@ -261,7 +261,7 @@ IDirect3DExecuteBufferImpl_Execute(IDirect3DExecuteBufferImpl *This,
if (!m)
ERR("Invalid material handle %#x.\n", ci->u2.dwArg[0]);
else
- m->activate(m);
+ material_activate(m);
}
else if (ci->u1.dlstLightStateType == D3DLIGHTSTATE_COLORMODEL /* 3 */)
{
--
1.7.1
More information about the wine-patches
mailing list