Henri Verbeet : wined3d: Store the device type only once.

[Alexandre Julliard]

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

Author: Henri Verbeet 
Date:   Sun Nov 27 21:34:49 2011 +0100

wined3d: Store the device type only once.

---

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

diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 018f57d..0c71232 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -3882,7 +3882,8 @@ HRESULT CDECL wined3d_device_get_device_caps(const struct wined3d_device *device
 {
     TRACE("device %p, caps %p.\n", device, caps);

-    return wined3d_get_device_caps(device->wined3d, device->adapter->ordinal, device->devType, caps);
+    return wined3d_get_device_caps(device->wined3d, device->adapter->ordinal,
+            device->create_parms.device_type, caps);
 }

HRESULT CDECL wined3d_device_get_display_mode(const struct wined3d_device *device,
@@ -5938,7 +5939,6 @@ HRESULT device_init(struct wined3d_device *device, struct wined3d *wined3d,
     device->create_parms.focus_window = focus_window;
     device->create_parms.flags = flags;

-    device->devType = device_type;
     for (i = 0; i < PATCHMAP_SIZE; ++i) list_init(&device->patches[i]);

select_shader_mode(&adapter->gl_info, &device->ps_selected_mode, &device->vs_selected_mode);
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index b32c97d..e524c3d 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -1705,7 +1705,6 @@ struct wined3d_device

/* Internal use fields  */
     struct wined3d_device_creation_parameters create_parms;
-    WINED3DDEVTYPE                  devType;
     HWND focus_window;

struct wined3d_swapchain **swapchains;