Józef Kucia : wined3d: Avoid calling wined3d_rendertarget_view_create() with WINED3DFMT_UNKNOWN.

[Alexandre Julliard]

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

Author: Józef Kucia <jkucia(a)codeweavers.com>
Date:   Fri Jun 17 10:41:42 2016 +0200

wined3d: Avoid calling wined3d_rendertarget_view_create() with WINED3DFMT_UNKNOWN.

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/wined3d/device.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index e515916..5ba128d 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -1041,13 +1041,14 @@ HRESULT CDECL wined3d_device_init_3d(struct wined3d_device *device,
 
     if (swapchain_desc->backbuffer_count)
     {
+        struct wined3d_resource *back_buffer = &swapchain->back_buffers[0]->resource;
         struct wined3d_rendertarget_view_desc view_desc;
 
-        view_desc.format_id = swapchain_desc->backbuffer_format;
+        view_desc.format_id = back_buffer->format->id;
         view_desc.u.texture.level_idx = 0;
         view_desc.u.texture.layer_idx = 0;
         view_desc.u.texture.layer_count = 1;
-        if (FAILED(hr = wined3d_rendertarget_view_create(&view_desc, &swapchain->back_buffers[0]->resource,
+        if (FAILED(hr = wined3d_rendertarget_view_create(&view_desc, back_buffer,
                 NULL, &wined3d_null_parent_ops, &device->back_buffer_view)))
         {
             ERR("Failed to create rendertarget view, hr %#x.\n", hr);
@@ -4865,11 +4866,13 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device,
     }
     if (swapchain->desc.backbuffer_count)
     {
-        view_desc.format_id = swapchain_desc->backbuffer_format;
+        struct wined3d_resource *back_buffer = &swapchain->back_buffers[0]->resource;
+
+        view_desc.format_id = back_buffer->format->id;
         view_desc.u.texture.level_idx = 0;
         view_desc.u.texture.layer_idx = 0;
         view_desc.u.texture.layer_count = 1;
-        if (FAILED(hr = wined3d_rendertarget_view_create(&view_desc, &swapchain->back_buffers[0]->resource,
+        if (FAILED(hr = wined3d_rendertarget_view_create(&view_desc, back_buffer,
                 NULL, &wined3d_null_parent_ops, &device->back_buffer_view)))
         {
             ERR("Failed to create rendertarget view, hr %#x.\n", hr);