[PATCH 1/5] d3d10core: Implement d3d10_device_VSGetShaderResources().
Henri Verbeet
hverbeet at codeweavers.com
Wed Sep 17 03:40:27 CDT 2014
---
dlls/d3d10core/device.c | 21 ++++++++++++++++++++-
dlls/wined3d/device.c | 14 ++++++++++++++
dlls/wined3d/view.c | 7 +++++++
dlls/wined3d/wined3d.spec | 2 ++
include/wine/wined3d.h | 3 +++
5 files changed, 46 insertions(+), 1 deletion(-)
diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c
index 89c0bba..201dca3 100644
--- a/dlls/d3d10core/device.c
+++ b/dlls/d3d10core/device.c
@@ -881,8 +881,27 @@ static void STDMETHODCALLTYPE d3d10_device_IAGetPrimitiveTopology(ID3D10Device1
static void STDMETHODCALLTYPE d3d10_device_VSGetShaderResources(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_vs_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_VSGetSamplers(ID3D10Device1 *iface,
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index be5c461..aaded97 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -2172,6 +2172,20 @@ void CDECL wined3d_device_set_vs_resource_view(struct wined3d_device *device,
wined3d_device_set_shader_resource_view(device, WINED3D_SHADER_TYPE_VERTEX, idx, view);
}
+struct wined3d_shader_resource_view * CDECL wined3d_device_get_vs_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_VERTEX][idx];
+}
+
static void wined3d_device_set_sampler(struct wined3d_device *device,
enum wined3d_shader_type type, UINT idx, struct wined3d_sampler *sampler)
{
diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c
index 26575e2..1f8db54 100644
--- a/dlls/wined3d/view.c
+++ b/dlls/wined3d/view.c
@@ -183,6 +183,13 @@ ULONG CDECL wined3d_shader_resource_view_decref(struct wined3d_shader_resource_v
return refcount;
}
+void * CDECL wined3d_shader_resource_view_get_parent(const struct wined3d_shader_resource_view *view)
+{
+ TRACE("view %p.\n", view);
+
+ return view->parent;
+}
+
HRESULT CDECL wined3d_shader_resource_view_create(void *parent, const struct wined3d_parent_ops *parent_ops,
struct wined3d_shader_resource_view **view)
{
diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec
index 2437aac..7edc82c 100644
--- a/dlls/wined3d/wined3d.spec
+++ b/dlls/wined3d/wined3d.spec
@@ -94,6 +94,7 @@
@ cdecl wined3d_device_get_vs_consts_b(ptr long ptr long)
@ cdecl wined3d_device_get_vs_consts_f(ptr long ptr long)
@ cdecl wined3d_device_get_vs_consts_i(ptr long ptr long)
+@ cdecl wined3d_device_get_vs_resource_view(ptr long)
@ cdecl wined3d_device_get_vs_sampler(ptr long)
@ cdecl wined3d_device_incref(ptr)
@ cdecl wined3d_device_init_3d(ptr ptr)
@@ -202,6 +203,7 @@
@ cdecl wined3d_shader_resource_view_create(ptr ptr ptr)
@ cdecl wined3d_shader_resource_view_decref(ptr)
+@ cdecl wined3d_shader_resource_view_get_parent(ptr)
@ cdecl wined3d_shader_resource_view_incref(ptr)
@ cdecl wined3d_stateblock_apply(ptr)
diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h
index e66faef..907ead3 100644
--- a/include/wine/wined3d.h
+++ b/include/wine/wined3d.h
@@ -2184,6 +2184,8 @@ HRESULT __cdecl wined3d_device_get_vs_consts_f(const struct wined3d_device *devi
UINT start_register, float *constants, UINT vector4f_count);
HRESULT __cdecl wined3d_device_get_vs_consts_i(const struct wined3d_device *device,
UINT start_register, int *constants, UINT vector4i_count);
+struct wined3d_shader_resource_view * __cdecl wined3d_device_get_vs_resource_view(const struct wined3d_device *device,
+ UINT idx);
struct wined3d_sampler * __cdecl wined3d_device_get_vs_sampler(const struct wined3d_device *device, UINT idx);
ULONG __cdecl wined3d_device_incref(struct wined3d_device *device);
HRESULT __cdecl wined3d_device_init_3d(struct wined3d_device *device, struct wined3d_swapchain_desc *swapchain_desc);
@@ -2415,6 +2417,7 @@ HRESULT __cdecl wined3d_shader_set_local_constants_float(struct wined3d_shader *
HRESULT __cdecl wined3d_shader_resource_view_create(void *parent, const struct wined3d_parent_ops *parent_ops,
struct wined3d_shader_resource_view **view);
ULONG __cdecl wined3d_shader_resource_view_decref(struct wined3d_shader_resource_view *view);
+void * __cdecl wined3d_shader_resource_view_get_parent(const struct wined3d_shader_resource_view *view);
ULONG __cdecl wined3d_shader_resource_view_incref(struct wined3d_shader_resource_view *view);
void __cdecl wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock);
--
1.7.10.4
More information about the wine-patches
mailing list