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

wined3d: Remove the redundant "adapterNo" field from the device.

This commit is contained in:
Henri Verbeet 2009-12-07 20:20:01 +01:00 committed by Alexandre Julliard
parent aed85222b5
commit a02f93defb
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dlls/wined3d/device.c
View File

@ -4419,7 +4419,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_GetBackBuffer(IWineD3DDevice *iface, UI
static HRESULT WINAPI IWineD3DDeviceImpl_GetDeviceCaps(IWineD3DDevice *iface, WINED3DCAPS* pCaps) {
IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface;
WARN("(%p) : stub, calling idirect3d for now\n", This);
return IWineD3D_GetDeviceCaps(This->wineD3D, This->adapterNo, This->devType, pCaps);
return IWineD3D_GetDeviceCaps(This->wineD3D, This->adapter->ordinal, This->devType, pCaps);
}
static HRESULT WINAPI IWineD3DDeviceImpl_GetDisplayMode(IWineD3DDevice *iface, UINT iSwapChain, WINED3DDISPLAYMODE* pMode) {
@ -7332,7 +7332,6 @@ HRESULT device_init(IWineD3DDeviceImpl *device, IWineD3DImpl *wined3d,
device->createParms.hFocusWindow = focus_window;
device->createParms.BehaviorFlags = flags;
device->adapterNo = adapter_idx;
device->devType = device_type;
for (i = 0; i < PATCHMAP_SIZE; ++i) list_init(&device->patches[i]);

1
dlls/wined3d/wined3d_private.h
View File

@ -1513,7 +1513,6 @@ struct IWineD3DDeviceImpl
/* Internal use fields */
WINED3DDEVICE_CREATION_PARAMETERS createParms;
UINT adapterNo;
WINED3DDEVTYPE devType;
IWineD3DSwapChain **swapchains;