Henri Verbeet : wined3d: Only store a different screen format if it' s explicitly changed through wined3d.

[Alexandre Julliard]

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

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Fri Jun 22 15:57:30 2012 +0200

wined3d: Only store a different screen format if it's explicitly changed through wined3d.

---

 dlls/wined3d/device.c |   11 -----------
 1 files changed, 0 insertions(+), 11 deletions(-)

diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 49b1efb..4c3282c 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -5678,7 +5678,6 @@ HRESULT device_init(struct wined3d_device *device, struct wined3d *wined3d,
 {
     struct wined3d_adapter *adapter = &wined3d->adapters[adapter_idx];
     const struct fragment_pipeline *fragment_pipeline;
-    struct wined3d_display_mode mode;
     struct shader_caps shader_caps;
     struct fragment_caps ffp_caps;
     unsigned int i;
@@ -5693,16 +5692,6 @@ HRESULT device_init(struct wined3d_device *device, struct wined3d *wined3d,
     list_init(&device->shaders);
     device->surface_alignment = surface_alignment;
 
-    /* Get the initial screen setup for ddraw. */
-    hr = wined3d_get_adapter_display_mode(wined3d, adapter_idx, &mode);
-    if (FAILED(hr))
-    {
-        ERR("Failed to get the adapter's display mode, hr %#x.\n", hr);
-        wined3d_decref(device->wined3d);
-        return hr;
-    }
-    adapter->screen_format = mode.format_id;
-
     /* Save the creation parameters. */
     device->create_parms.adapter_idx = adapter_idx;
     device->create_parms.device_type = device_type;