From b62720feb69063ffa36ef8c3de1aa8a23c28c375 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B3zef=20Kucia?= Date: Fri, 6 Nov 2015 18:38:11 +0100 Subject: [PATCH] d3d11: Implement d3d11_immediate_context_PSSetShaderResources(). MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Józef Kucia Signed-off-by: Henri Verbeet Signed-off-by: Alexandre Julliard --- 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 c6802491d9d..474943b2178 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 c44ec4a3f2f..fcbb8a89fb1 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 33c7a0781f7..1d9b76627ec 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)