=?UTF-8?Q?J=C3=B3zef=20Kucia=20?=: d3d11: Implement d3d11_immediate_context_PSSetShaderResources().

Alexandre Julliard julliard at wine.codeweavers.com
Mon Nov 9 08:34:18 CST 2015


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

Author: Józef Kucia <jkucia at codeweavers.com>
Date:   Fri Nov  6 18:38:11 2015 +0100

d3d11: Implement d3d11_immediate_context_PSSetShaderResources().

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

---

 dlls/d3d11/d3d11_private.h |  2 ++
 dlls/d3d11/device.c        | 15 ++++++++++++++-
 dlls/d3d11/view.c          |  8 ++++++++
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h
index c680249..474943b 100644
--- a/dlls/d3d11/d3d11_private.h
+++ b/dlls/d3d11/d3d11_private.h
@@ -207,6 +207,8 @@ struct d3d_shader_resource_view
 
 HRESULT d3d_shader_resource_view_create(struct d3d_device *device, ID3D11Resource *resource,
         const D3D11_SHADER_RESOURCE_VIEW_DESC *desc, struct d3d_shader_resource_view **view) DECLSPEC_HIDDEN;
+struct d3d_shader_resource_view *unsafe_impl_from_ID3D11ShaderResourceView(
+        ID3D11ShaderResourceView *iface) DECLSPEC_HIDDEN;
 struct d3d_shader_resource_view *unsafe_impl_from_ID3D10ShaderResourceView(
         ID3D10ShaderResourceView *iface) DECLSPEC_HIDDEN;
 
diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c
index c44ec4a..fcbb8a8 100644
--- a/dlls/d3d11/device.c
+++ b/dlls/d3d11/device.c
@@ -140,8 +140,21 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_VSSetConstantBuffers(ID3D1
 static void STDMETHODCALLTYPE d3d11_immediate_context_PSSetShaderResources(ID3D11DeviceContext *iface,
         UINT start_slot, UINT view_count, ID3D11ShaderResourceView *const *views)
 {
-    FIXME("iface %p, start_slot %u, view_count %u, views %p stub!\n",
+    struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface);
+    unsigned int i;
+
+    TRACE("iface %p, start_slot %u, view_count %u, views %p.\n",
             iface, start_slot, view_count, views);
+
+    wined3d_mutex_lock();
+    for (i = 0; i < view_count; ++i)
+    {
+        struct d3d_shader_resource_view *view = unsafe_impl_from_ID3D11ShaderResourceView(views[i]);
+
+        wined3d_device_set_ps_resource_view(device->wined3d_device, start_slot + i,
+                view ? view->wined3d_view : NULL);
+    }
+    wined3d_mutex_unlock();
 }
 
 static void STDMETHODCALLTYPE d3d11_immediate_context_PSSetShader(ID3D11DeviceContext *iface,
diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c
index 33c7a07..1d9b766 100644
--- a/dlls/d3d11/view.c
+++ b/dlls/d3d11/view.c
@@ -1546,6 +1546,14 @@ HRESULT d3d_shader_resource_view_create(struct d3d_device *device, ID3D11Resourc
     return S_OK;
 }
 
+struct d3d_shader_resource_view *unsafe_impl_from_ID3D11ShaderResourceView(ID3D11ShaderResourceView *iface)
+{
+    if (!iface)
+        return NULL;
+    assert(iface->lpVtbl == &d3d11_shader_resource_view_vtbl);
+    return impl_from_ID3D11ShaderResourceView(iface);
+}
+
 struct d3d_shader_resource_view *unsafe_impl_from_ID3D10ShaderResourceView(ID3D10ShaderResourceView *iface)
 {
     if (!iface)




More information about the wine-cvs mailing list