system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-15 09:25:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

d3d10core: Add a separate function for device initialization.

Browse source
This commit is contained in:
Henri Verbeet 2009-11-19 11:41:24 +01:00 committed by Alexandre Julliard
parent 893b338268
commit ccbcf8f291
3 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
dlls/d3d10core/d3d10core_main.c
View file

@ -81,13 +81,7 @@ static HRESULT WINAPI layer_create(enum dxgi_device_layer_id id, void **layer_ba
}
object = *layer_base;
object->vtbl = &d3d10_device_vtbl;
object->inner_unknown_vtbl = &d3d10_device_inner_unknown_vtbl;
object->device_parent_vtbl = &d3d10_wined3d_device_parent_vtbl;
object->refcount = 1;
object->outer_unknown = device_object;
d3d10_device_init(object, device_object);
*device_layer = &object->inner_unknown_vtbl;
TRACE("Created d3d10 device at %p\n", object);

5
dlls/d3d10core/d3d10core_private.h
View file

@ -67,9 +67,6 @@ HRESULT parse_dxbc(const char *data, SIZE_T data_size,
HRESULT (*chunk_handler)(const char *data, DWORD data_size, DWORD tag, void *ctx), void *ctx) DECLSPEC_HIDDEN;
/* IDirect3D10Device */
extern const struct ID3D10DeviceVtbl d3d10_device_vtbl DECLSPEC_HIDDEN;
extern const struct IUnknownVtbl d3d10_device_inner_unknown_vtbl DECLSPEC_HIDDEN;
extern const struct IWineD3DDeviceParentVtbl d3d10_wined3d_device_parent_vtbl DECLSPEC_HIDDEN;
struct d3d10_device
{
const struct ID3D10DeviceVtbl *vtbl;
@ -81,6 +78,8 @@ struct d3d10_device
IWineD3DDevice *wined3d_device;
};
void d3d10_device_init(struct d3d10_device *device, void *outer_unknown) DECLSPEC_HIDDEN;
/* ID3D10Texture2D */
struct d3d10_texture2d
{

15
dlls/d3d10core/device.c
View file

@ -1117,7 +1117,7 @@ static void STDMETHODCALLTYPE d3d10_device_GetTextFilterSize(ID3D10Device *iface
FIXME("iface %p, width %p, height %p stub!\n", iface, width, height);
}
const struct ID3D10DeviceVtbl d3d10_device_vtbl =
static const struct ID3D10DeviceVtbl d3d10_device_vtbl =
{
/* IUnknown methods */
d3d10_device_QueryInterface,
@ -1221,7 +1221,7 @@ const struct ID3D10DeviceVtbl d3d10_device_vtbl =
d3d10_device_GetTextFilterSize,
};
const struct IUnknownVtbl d3d10_device_inner_unknown_vtbl =
static const struct IUnknownVtbl d3d10_device_inner_unknown_vtbl =
{
/* IUnknown methods */
d3d10_device_inner_QueryInterface,
@ -1425,7 +1425,7 @@ static HRESULT STDMETHODCALLTYPE device_parent_CreateSwapChain(IWineD3DDevicePar
return S_OK;
}
const struct IWineD3DDeviceParentVtbl d3d10_wined3d_device_parent_vtbl =
static const struct IWineD3DDeviceParentVtbl d3d10_wined3d_device_parent_vtbl =
{
/* IUnknown methods */
device_parent_QueryInterface,
@ -1439,3 +1439,12 @@ const struct IWineD3DDeviceParentVtbl d3d10_wined3d_device_parent_vtbl =
device_parent_CreateVolume,
device_parent_CreateSwapChain,
};
void d3d10_device_init(struct d3d10_device *device, void *outer_unknown)
{
device->vtbl = &d3d10_device_vtbl;
device->inner_unknown_vtbl = &d3d10_device_inner_unknown_vtbl;
device->device_parent_vtbl = &d3d10_wined3d_device_parent_vtbl;
device->refcount = 1;
device->outer_unknown = outer_unknown;
}