From: Henri Verbeet Subject: [PATCH 3/5] d3d10core: Implement d3d10_device_GSGetShaderResources(). Message-Id: <1410943231-17222-3-git-send-email-hverbeet@codeweavers.com> Date: Wed, 17 Sep 2014 10:40:29 +0200 --- dlls/d3d10core/device.c | 21 ++++++++++++++++++++- dlls/wined3d/device.c | 14 ++++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 4 files changed, 37 insertions(+), 1 deletion(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 47f85a7..639e220 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -950,8 +950,27 @@ static void STDMETHODCALLTYPE d3d10_device_GetPredication(ID3D10Device1 *iface, static void STDMETHODCALLTYPE d3d10_device_GSGetShaderResources(ID3D10Device1 *iface, UINT start_slot, UINT view_count, ID3D10ShaderResourceView **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 wined3d_shader_resource_view *wined3d_view; + struct d3d10_shader_resource_view *view_impl; + + if (!(wined3d_view = wined3d_device_get_gs_resource_view(device->wined3d_device, start_slot + i))) + { + views[i] = NULL; + continue; + } + + view_impl = wined3d_shader_resource_view_get_parent(wined3d_view); + views[i] = &view_impl->ID3D10ShaderResourceView_iface; + ID3D10ShaderResourceView_AddRef(views[i]); + } } static void STDMETHODCALLTYPE d3d10_device_GSGetSamplers(ID3D10Device1 *iface, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index f6c1462..5f9e2fa 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2647,6 +2647,20 @@ void CDECL wined3d_device_set_gs_resource_view(struct wined3d_device *device, wined3d_device_set_shader_resource_view(device, WINED3D_SHADER_TYPE_GEOMETRY, idx, view); } +struct wined3d_shader_resource_view * CDECL wined3d_device_get_gs_resource_view(const struct wined3d_device *device, + UINT idx) +{ + TRACE("device %p, idx %u.\n", device, idx); + + if (idx >= MAX_SHADER_RESOURCE_VIEWS) + { + WARN("Invalid view index %u.\n", idx); + return NULL; + } + + return device->state.shader_resource_view[WINED3D_SHADER_TYPE_GEOMETRY][idx]; +} + 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 a6c1e70..d3ac07a 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -59,6 +59,7 @@ @ cdecl wined3d_device_get_gamma_ramp(ptr long ptr) @ cdecl wined3d_device_get_geometry_shader(ptr) @ cdecl wined3d_device_get_gs_cb(ptr long) +@ cdecl wined3d_device_get_gs_resource_view(ptr long) @ cdecl wined3d_device_get_gs_sampler(ptr long) @ cdecl wined3d_device_get_index_buffer(ptr ptr) @ cdecl wined3d_device_get_light(ptr long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index b58423d..842f6f6 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2131,6 +2131,8 @@ void __cdecl wined3d_device_get_gamma_ramp(const struct wined3d_device *device, UINT swapchain_idx, struct wined3d_gamma_ramp *ramp); struct wined3d_shader * __cdecl wined3d_device_get_geometry_shader(const struct wined3d_device *device); struct wined3d_buffer * __cdecl wined3d_device_get_gs_cb(const struct wined3d_device *device, UINT idx); +struct wined3d_shader_resource_view * __cdecl wined3d_device_get_gs_resource_view(const struct wined3d_device *device, + UINT idx); struct wined3d_sampler * __cdecl wined3d_device_get_gs_sampler(const struct wined3d_device *device, UINT idx); struct wined3d_buffer * __cdecl wined3d_device_get_index_buffer(const struct wined3d_device *device, enum wined3d_format_id *format); -- 1.7.10.4