[PATCH 5/5] d3d10core: Implement d3d10_device_PSGetSamplers().
Henri Verbeet
hverbeet at codeweavers.com
Sun Dec 9 14:22:07 CST 2012
---
dlls/d3d10core/device.c | 21 ++++++++++++++++++++-
dlls/wined3d/device.c | 13 +++++++++++++
dlls/wined3d/wined3d.spec | 1 +
include/wine/wined3d.h | 1 +
4 files changed, 35 insertions(+), 1 deletions(-)
diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c
index 8944491..7e909a9 100644
--- a/dlls/d3d10core/device.c
+++ b/dlls/d3d10core/device.c
@@ -607,8 +607,27 @@ static void STDMETHODCALLTYPE d3d10_device_PSGetShader(ID3D10Device *iface, ID3D
static void STDMETHODCALLTYPE d3d10_device_PSGetSamplers(ID3D10Device *iface,
UINT start_slot, UINT sampler_count, ID3D10SamplerState **samplers)
{
- FIXME("iface %p, start_slot %u, sampler_count %u, samplers %p stub!\n",
+ struct d3d10_device *device = impl_from_ID3D10Device(iface);
+ unsigned int i;
+
+ TRACE("iface %p, start_slot %u, sampler_count %u, samplers %p.\n",
iface, start_slot, sampler_count, samplers);
+
+ for (i = 0; i < sampler_count; ++i)
+ {
+ struct d3d10_sampler_state *sampler_impl;
+ struct wined3d_sampler *wined3d_sampler;
+
+ if (!(wined3d_sampler = wined3d_device_get_ps_sampler(device->wined3d_device, start_slot + i)))
+ {
+ samplers[i] = NULL;
+ continue;
+ }
+
+ sampler_impl = wined3d_sampler_get_parent(wined3d_sampler);
+ samplers[i] = &sampler_impl->ID3D10SamplerState_iface;
+ ID3D10SamplerState_AddRef(samplers[i]);
+ }
}
static void STDMETHODCALLTYPE d3d10_device_VSGetShader(ID3D10Device *iface, ID3D10VertexShader **shader)
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index c74498a..0d35b17 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -3073,6 +3073,19 @@ void CDECL wined3d_device_set_ps_sampler(struct wined3d_device *device, UINT idx
wined3d_sampler_decref(prev);
}
+struct wined3d_sampler * CDECL wined3d_device_get_ps_sampler(const struct wined3d_device *device, UINT idx)
+{
+ TRACE("device %p, idx %u.\n", device, idx);
+
+ if (idx >= MAX_SAMPLER_OBJECTS)
+ {
+ WARN("Invalid sampler index %u.\n", idx);
+ return NULL;
+ }
+
+ return device->stateBlock->state.ps_sampler[idx];
+}
+
HRESULT CDECL wined3d_device_set_ps_consts_b(struct wined3d_device *device,
UINT start_register, const BOOL *constants, UINT bool_count)
{
diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec
index 231b958..1d6e2b3 100644
--- a/dlls/wined3d/wined3d.spec
+++ b/dlls/wined3d/wined3d.spec
@@ -79,6 +79,7 @@
@ cdecl wined3d_device_get_ps_consts_b(ptr long ptr long)
@ cdecl wined3d_device_get_ps_consts_f(ptr long ptr long)
@ cdecl wined3d_device_get_ps_consts_i(ptr long ptr long)
+@ cdecl wined3d_device_get_ps_sampler(ptr long)
@ cdecl wined3d_device_get_raster_status(ptr long ptr)
@ cdecl wined3d_device_get_render_state(ptr long)
@ cdecl wined3d_device_get_render_target(ptr long)
diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h
index 2dd9a1a..0b07328 100644
--- a/include/wine/wined3d.h
+++ b/include/wine/wined3d.h
@@ -2147,6 +2147,7 @@ HRESULT __cdecl wined3d_device_get_ps_consts_f(const struct wined3d_device *devi
UINT start_register, float *constants, UINT vector4f_count);
HRESULT __cdecl wined3d_device_get_ps_consts_i(const struct wined3d_device *device,
UINT start_register, int *constants, UINT vector4i_count);
+struct wined3d_sampler * __cdecl wined3d_device_get_ps_sampler(const struct wined3d_device *device, UINT idx);
HRESULT __cdecl wined3d_device_get_raster_status(const struct wined3d_device *device,
UINT swapchain_idx, struct wined3d_raster_status *raster_status);
DWORD __cdecl wined3d_device_get_render_state(const struct wined3d_device *device, enum wined3d_render_state state);
--
1.7.8.6
More information about the wine-patches
mailing list