=?UTF-8?Q?J=C3=B3zef=20Kucia=20?=: d3d11: Implement d3d11_immediate_context_DSSetShader().
Alexandre Julliard
julliard at winehq.org
Thu Apr 20 16:41:33 CDT 2017
Module: wine
Branch: master
Commit: cefc48e8823c126e02050ac88cd09e71d67acfb3
URL: http://source.winehq.org/git/wine.git/?a=commit;h=cefc48e8823c126e02050ac88cd09e71d67acfb3
Author: Józef Kucia <jkucia at codeweavers.com>
Date: Thu Apr 20 11:04:16 2017 +0200
d3d11: Implement d3d11_immediate_context_DSSetShader().
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 | 1 +
dlls/d3d11/device.c | 12 +++++++++++-
dlls/d3d11/shader.c | 9 +++++++++
3 files changed, 21 insertions(+), 1 deletion(-)
diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h
index b5b2678..193a07f 100644
--- a/dlls/d3d11/d3d11_private.h
+++ b/dlls/d3d11/d3d11_private.h
@@ -308,6 +308,7 @@ struct d3d11_domain_shader
HRESULT d3d11_domain_shader_create(struct d3d_device *device, const void *byte_code, SIZE_T byte_code_length,
struct d3d11_domain_shader **shader) DECLSPEC_HIDDEN;
+struct d3d11_domain_shader *unsafe_impl_from_ID3D11DomainShader(ID3D11DomainShader *iface) DECLSPEC_HIDDEN;
/* ID3D11GeometryShader, ID3D10GeometryShader */
struct d3d_geometry_shader
diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c
index 6f71d4d..d2eaec8 100644
--- a/dlls/d3d11/device.c
+++ b/dlls/d3d11/device.c
@@ -1173,8 +1173,18 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_DSSetShaderResources(ID3D1
static void STDMETHODCALLTYPE d3d11_immediate_context_DSSetShader(ID3D11DeviceContext *iface,
ID3D11DomainShader *shader, ID3D11ClassInstance *const *class_instances, UINT class_instance_count)
{
- FIXME("iface %p, shader %p, class_instances %p, class_instance_count %u stub!\n",
+ struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface);
+ struct d3d11_domain_shader *ds = unsafe_impl_from_ID3D11DomainShader(shader);
+
+ TRACE("iface %p, shader %p, class_instances %p, class_instance_count %u.\n",
iface, shader, class_instances, class_instance_count);
+
+ if (class_instances)
+ FIXME("Dynamic linking is not implemented yet.\n");
+
+ wined3d_mutex_lock();
+ wined3d_device_set_domain_shader(device->wined3d_device, ds ? ds->wined3d_shader : NULL);
+ wined3d_mutex_unlock();
}
static void STDMETHODCALLTYPE d3d11_immediate_context_DSSetSamplers(ID3D11DeviceContext *iface,
diff --git a/dlls/d3d11/shader.c b/dlls/d3d11/shader.c
index 7531586..6266a34 100644
--- a/dlls/d3d11/shader.c
+++ b/dlls/d3d11/shader.c
@@ -984,6 +984,15 @@ HRESULT d3d11_domain_shader_create(struct d3d_device *device, const void *byte_c
return S_OK;
}
+struct d3d11_domain_shader *unsafe_impl_from_ID3D11DomainShader(ID3D11DomainShader *iface)
+{
+ if (!iface)
+ return NULL;
+ assert(iface->lpVtbl == &d3d11_domain_shader_vtbl);
+
+ return impl_from_ID3D11DomainShader(iface);
+}
+
/* ID3D11GeometryShader methods */
static inline struct d3d_geometry_shader *impl_from_ID3D11GeometryShader(ID3D11GeometryShader *iface)
More information about the wine-cvs
mailing list