system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-11-05 18:01:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

ddraw: Remove a useless material callback.

Browse source
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->ref = 1;
object->ddraw = ddraw_from_d3d3(iface);
object->activate = material_activate;
TRACE("Created material %p.\n", object);
*material = (IDirect3DMaterial3 *)object;

2
dlls/ddraw/ddraw_private.h
View file

@ -550,8 +550,6 @@ struct IDirect3DMaterialImpl
D3DMATERIAL mat;
DWORD Handle;
void (*activate)(IDirect3DMaterialImpl* this);
};
/* 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);
m->activate(m);
material_activate(m);
This->material = Value;
}

2
dlls/ddraw/executebuffer.c
View file

@ -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 */)
{