Commit f5a26706 authored by Henri Verbeet's avatar Henri Verbeet Committed by Alexandre Julliard

wined3d: Store the device type only once.

parent d1327bbe
...@@ -3882,7 +3882,8 @@ HRESULT CDECL wined3d_device_get_device_caps(const struct wined3d_device *device ...@@ -3882,7 +3882,8 @@ HRESULT CDECL wined3d_device_get_device_caps(const struct wined3d_device *device
{ {
TRACE("device %p, caps %p.\n", device, caps); 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, 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, ...@@ -5938,7 +5939,6 @@ HRESULT device_init(struct wined3d_device *device, struct wined3d *wined3d,
device->create_parms.focus_window = focus_window; device->create_parms.focus_window = focus_window;
device->create_parms.flags = flags; device->create_parms.flags = flags;
device->devType = device_type;
for (i = 0; i < PATCHMAP_SIZE; ++i) list_init(&device->patches[i]); 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); select_shader_mode(&adapter->gl_info, &device->ps_selected_mode, &device->vs_selected_mode);
......
...@@ -1705,7 +1705,6 @@ struct wined3d_device ...@@ -1705,7 +1705,6 @@ struct wined3d_device
/* Internal use fields */ /* Internal use fields */
struct wined3d_device_creation_parameters create_parms; struct wined3d_device_creation_parameters create_parms;
WINED3DDEVTYPE devType;
HWND focus_window; HWND focus_window;
struct wined3d_swapchain **swapchains; struct wined3d_swapchain **swapchains;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment