[PATCH 3/7] wined3d: Introduce minimal shader resource view desc.

[Józef Kucia]

Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
---
 dlls/d3d11/view.c         | 17 +++++++++++++----
 dlls/wined3d/view.c       |  8 +++++---
 dlls/wined3d/wined3d.spec |  2 +-
 include/wine/wined3d.h    | 10 ++++++++--
 4 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c
index 1d9b766..4f94637 100644
--- a/dlls/d3d11/view.c
+++ b/dlls/d3d11/view.c
@@ -1121,8 +1121,8 @@ static HRESULT d3d_rendertarget_view_init(struct d3d_rendertarget_view *view, st
 
     if (!desc)
     {
-        HRESULT hr = set_rtdesc_from_resource(&view->desc, resource);
-        if (FAILED(hr)) return hr;
+        if (FAILED(hr = set_rtdesc_from_resource(&view->desc, resource)))
+            return hr;
     }
     else
     {
@@ -1480,9 +1480,17 @@ static const struct ID3D10ShaderResourceView1Vtbl d3d10_shader_resource_view_vtb
     d3d10_shader_resource_view_GetDesc1,
 };
 
+static void wined3d_shader_resource_view_desc_from_d3d11(struct wined3d_shader_resource_view_desc *wined3d_desc,
+        const D3D11_SHADER_RESOURCE_VIEW_DESC *desc)
+{
+    wined3d_desc->format_id = wined3dformat_from_dxgi_format(desc->Format);
+    FIXME("Ignoring shader resource view desc.\n");
+}
+
 static HRESULT d3d_shader_resource_view_init(struct d3d_shader_resource_view *view, struct d3d_device *device,
         ID3D11Resource *resource, const D3D11_SHADER_RESOURCE_VIEW_DESC *desc)
 {
+    struct wined3d_shader_resource_view_desc wined3d_desc;
     struct wined3d_resource *wined3d_resource;
     HRESULT hr;
 
@@ -1503,11 +1511,12 @@ static HRESULT d3d_shader_resource_view_init(struct d3d_shader_resource_view *vi
     wined3d_mutex_lock();
     if (!(wined3d_resource = wined3d_resource_from_d3d11_resource(resource)))
     {
-        ERR("Failed to get wined3d resource for d3d10 resource %p.\n", resource);
+        ERR("Failed to get wined3d resource for d3d11 resource %p.\n", resource);
         return E_FAIL;
     }
 
-    if (FAILED(hr = wined3d_shader_resource_view_create(wined3d_resource,
+    wined3d_shader_resource_view_desc_from_d3d11(&wined3d_desc, &view->desc);
+    if (FAILED(hr = wined3d_shader_resource_view_create(&wined3d_desc, wined3d_resource,
             view, &d3d_null_wined3d_parent_ops, &view->wined3d_view)))
     {
         WARN("Failed to create wined3d shader resource view, hr %#x.\n", hr);
diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c
index 8d4f7fd..246d8cd 100644
--- a/dlls/wined3d/view.c
+++ b/dlls/wined3d/view.c
@@ -196,12 +196,14 @@ void * CDECL wined3d_shader_resource_view_get_parent(const struct wined3d_shader
     return view->parent;
 }
 
-HRESULT CDECL wined3d_shader_resource_view_create(struct wined3d_resource *resource, void *parent,
-        const struct wined3d_parent_ops *parent_ops, struct wined3d_shader_resource_view **view)
+HRESULT CDECL wined3d_shader_resource_view_create(const struct wined3d_shader_resource_view_desc *desc,
+        struct wined3d_resource *resource, void *parent, const struct wined3d_parent_ops *parent_ops,
+        struct wined3d_shader_resource_view **view)
 {
     struct wined3d_shader_resource_view *object;
 
-    TRACE("resource %p, parent %p, parent_ops %p, view %p.\n", resource, parent, parent_ops, view);
+    TRACE("desc %p, resource %p, parent %p, parent_ops %p, view %p.\n",
+            desc, resource, parent, parent_ops, view);
 
     if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object))))
         return E_OUTOFMEMORY;
diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec
index 7c90d60..74c159f 100644
--- a/dlls/wined3d/wined3d.spec
+++ b/dlls/wined3d/wined3d.spec
@@ -209,7 +209,7 @@
 @ cdecl wined3d_shader_incref(ptr)
 @ cdecl wined3d_shader_set_local_constants_float(ptr long ptr long)
 
-@ cdecl wined3d_shader_resource_view_create(ptr ptr ptr ptr)
+@ cdecl wined3d_shader_resource_view_create(ptr ptr ptr ptr ptr)
 @ cdecl wined3d_shader_resource_view_decref(ptr)
 @ cdecl wined3d_shader_resource_view_get_parent(ptr)
 @ cdecl wined3d_shader_resource_view_incref(ptr)
diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h
index c681c78..c17e367 100644
--- a/include/wine/wined3d.h
+++ b/include/wine/wined3d.h
@@ -1916,6 +1916,11 @@ struct wined3d_shader_desc
     unsigned int max_version;
 };
 
+struct wined3d_shader_resource_view_desc
+{
+    enum wined3d_format_id format_id;
+};
+
 struct wined3d_output_desc
 {
     WCHAR device_name[CCHDEVICENAME];
@@ -2387,8 +2392,9 @@ ULONG __cdecl wined3d_shader_incref(struct wined3d_shader *shader);
 HRESULT __cdecl wined3d_shader_set_local_constants_float(struct wined3d_shader *shader,
         UINT start_idx, const float *src_data, UINT vector4f_count);
 
-HRESULT __cdecl wined3d_shader_resource_view_create(struct wined3d_resource *resource, void *parent,
-        const struct wined3d_parent_ops *parent_ops, struct wined3d_shader_resource_view **view);
+HRESULT __cdecl wined3d_shader_resource_view_create(const struct wined3d_shader_resource_view_desc *desc,
+        struct wined3d_resource *resource, void *parent, const struct wined3d_parent_ops *parent_ops,
+        struct wined3d_shader_resource_view **view);
 ULONG __cdecl wined3d_shader_resource_view_decref(struct wined3d_shader_resource_view *view);
 void * __cdecl wined3d_shader_resource_view_get_parent(const struct wined3d_shader_resource_view *view);
 ULONG __cdecl wined3d_shader_resource_view_incref(struct wined3d_shader_resource_view *view);
-- 
2.4.10