From 14399f6130a5594d21312f950de523f3d35f7868 Mon Sep 17 00:00:00 2001
From: Henri Verbeet <hverbeet@codeweavers.com>
Date: Tue, 17 Aug 2010 19:03:24 +0200
Subject: [PATCH] ddraw: Remove a useless material callback.

---
 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 ff449602181..670129d4275 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 220d1bb9a09..bb95767de2c 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 6cd0f8047f2..a17627b240a 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 59481b1a079..9ae24a1cabb 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 */)
                     {
-- 
2.11.4.GIT