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

[Alexandre Julliard]

Module: wine
Branch: master
Commit: a02f93defb7f0326767b7c47fa33ba1850d2ccd1
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=a02f93defb7f0326767b7c47fa...

Author: Henri Verbeet 
Date:   Mon Dec  7 20:20:01 2009 +0100

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

---

dlls/wined3d/device.c          |    3 +--
 dlls/wined3d/wined3d_private.h |    1 -
 2 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index bf81ea9..c8f6ea1 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -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]);

diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 37244f7..c2bedd6 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -1513,7 +1513,6 @@ struct IWineD3DDeviceImpl

/* Internal use fields  */
     WINED3DDEVICE_CREATION_PARAMETERS createParms;
-    UINT                            adapterNo;
     WINED3DDEVTYPE                  devType;

IWineD3DSwapChain     **swapchains;