From: Henri Verbeet Subject: [PATCH 2/5] d3d10core: Implement d3d10_device_GSSetShaderResources(). Message-Id: <1410943231-17222-2-git-send-email-hverbeet@codeweavers.com> Date: Wed, 17 Sep 2014 10:40:28 +0200 --- dlls/d3d10core/device.c | 13 ++++++++++++- dlls/wined3d/device.c | 8 ++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 4 files changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 201dca3..47f85a7 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -380,8 +380,19 @@ static void STDMETHODCALLTYPE d3d10_device_SetPredication(ID3D10Device1 *iface, static void STDMETHODCALLTYPE d3d10_device_GSSetShaderResources(ID3D10Device1 *iface, UINT start_slot, UINT view_count, ID3D10ShaderResourceView *const *views) { - FIXME("iface %p, start_slot %u, view_count %u, views %p stub!\n", + struct d3d10_device *device = impl_from_ID3D10Device(iface); + unsigned int i; + + TRACE("iface %p, start_slot %u, view_count %u, views %p.\n", iface, start_slot, view_count, views); + + for (i = 0; i < view_count; ++i) + { + struct d3d10_shader_resource_view *view = unsafe_impl_from_ID3D10ShaderResourceView(views[i]); + + wined3d_device_set_gs_resource_view(device->wined3d_device, start_slot + i, + view ? view->wined3d_view : NULL); + } } static void STDMETHODCALLTYPE d3d10_device_GSSetSamplers(ID3D10Device1 *iface, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index aaded97..f6c1462 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2639,6 +2639,14 @@ struct wined3d_buffer * CDECL wined3d_device_get_gs_cb(const struct wined3d_devi return device->state.cb[WINED3D_SHADER_TYPE_GEOMETRY][idx]; } +void CDECL wined3d_device_set_gs_resource_view(struct wined3d_device *device, + UINT idx, struct wined3d_shader_resource_view *view) +{ + TRACE("device %p, idx %u, view %p.\n", device, idx, view); + + wined3d_device_set_shader_resource_view(device, WINED3D_SHADER_TYPE_GEOMETRY, idx, view); +} + void CDECL wined3d_device_set_gs_sampler(struct wined3d_device *device, UINT idx, struct wined3d_sampler *sampler) { TRACE("device %p, idx %u, sampler %p.\n", device, idx, sampler); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 7edc82c..a6c1e70 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -115,6 +115,7 @@ @ cdecl wined3d_device_set_gamma_ramp(ptr long long ptr) @ cdecl wined3d_device_set_geometry_shader(ptr ptr) @ cdecl wined3d_device_set_gs_cb(ptr long ptr) +@ cdecl wined3d_device_set_gs_resource_view(ptr long ptr) @ cdecl wined3d_device_set_gs_sampler(ptr long ptr) @ cdecl wined3d_device_set_index_buffer(ptr ptr long) @ cdecl wined3d_device_set_light(ptr long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 907ead3..b58423d 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2218,6 +2218,8 @@ void __cdecl wined3d_device_set_gamma_ramp(const struct wined3d_device *device, UINT swapchain_idx, DWORD flags, const struct wined3d_gamma_ramp *ramp); void __cdecl wined3d_device_set_geometry_shader(struct wined3d_device *device, struct wined3d_shader *shader); void __cdecl wined3d_device_set_gs_cb(struct wined3d_device *device, UINT idx, struct wined3d_buffer *buffer); +void __cdecl wined3d_device_set_gs_resource_view(struct wined3d_device *device, + UINT idx, struct wined3d_shader_resource_view *view); void __cdecl wined3d_device_set_gs_sampler(struct wined3d_device *device, UINT idx, struct wined3d_sampler *sampler); void __cdecl wined3d_device_set_index_buffer(struct wined3d_device *device, struct wined3d_buffer *index_buffer, enum wined3d_format_id format_id); -- 1.7.10.4