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

wined3d: Store the device type only once.

This commit is contained in:
Henri Verbeet 2011-11-27 21:34:49 +01:00 committed by Alexandre Julliard
parent d1327bbefe
commit f5a2670689
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/wined3d/device.c
View File

@ -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);

1
dlls/wined3d/wined3d_private.h
View File

@ -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;