ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ddraw: Remove a useless material callback.

This commit is contained in:
Henri Verbeet 2010-08-17 19:03:24 +02:00 committed by Alexandre Julliard
parent 06a44abc19
commit 14399f6130
4 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dlls/ddraw/ddraw.c
View File

@ -4457,7 +4457,6 @@ static HRESULT WINAPI d3d3_CreateMaterial(IDirect3D3 *iface, IDirect3DMaterial3
object->IDirect3DMaterial_vtbl = &IDirect3DMaterial_Vtbl; object->IDirect3DMaterial_vtbl = &IDirect3DMaterial_Vtbl;
object->ref = 1; object->ref = 1;
object->ddraw = ddraw_from_d3d3(iface); object->ddraw = ddraw_from_d3d3(iface);
object->activate = material_activate;
TRACE("Created material %p.\n", object); TRACE("Created material %p.\n", object);
*material = (IDirect3DMaterial3 *)object; *material = (IDirect3DMaterial3 *)object;

2
dlls/ddraw/ddraw_private.h
View File

@ -550,8 +550,6 @@ struct IDirect3DMaterialImpl
D3DMATERIAL mat; D3DMATERIAL mat;
DWORD Handle; DWORD Handle;
void (*activate)(IDirect3DMaterialImpl* this);
}; };
/* VTables in various versions */ /* VTables in various versions */

2
dlls/ddraw/device.c
View File

@ -3044,7 +3044,7 @@ IDirect3DDeviceImpl_3_SetLightState(IDirect3DDevice3 *iface,
} }
TRACE(" activating material %p.\n", m); TRACE(" activating material %p.\n", m);
m->activate(m); material_activate(m);
This->material = Value; This->material = Value;
} }

2
dlls/ddraw/executebuffer.c
View File

@ -261,7 +261,7 @@ IDirect3DExecuteBufferImpl_Execute(IDirect3DExecuteBufferImpl *This,
if (!m) if (!m)
ERR("Invalid material handle %#x.\n", ci->u2.dwArg[0]); ERR("Invalid material handle %#x.\n", ci->u2.dwArg[0]);
else else
m->activate(m); material_activate(m);
} }
else if (ci->u1.dlstLightStateType == D3DLIGHTSTATE_COLORMODEL /* 3 */) else if (ci->u1.dlstLightStateType == D3DLIGHTSTATE_COLORMODEL /* 3 */)
{ {