From 287c1851731070b5b6b2e2fe6f0ae9e48db7aff8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B3zef=20Kucia?= Date: Tue, 7 Mar 2017 09:50:22 +0100 Subject: [PATCH] wined3d: Introduce wined3d_device_get_sampler() helper function. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Józef Kucia Signed-off-by: Henri Verbeet Signed-off-by: Alexandre Julliard --- dlls/wined3d/device.c | 38 +++++++++++++------------------------- 1 file changed, 13 insertions(+), 25 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d88a2ee38f5..cb68f3c41f3 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2258,17 +2258,23 @@ void CDECL wined3d_device_set_vs_sampler(struct wined3d_device *device, UINT idx wined3d_device_set_sampler(device, WINED3D_SHADER_TYPE_VERTEX, idx, sampler); } -struct wined3d_sampler * CDECL wined3d_device_get_vs_sampler(const struct wined3d_device *device, UINT idx) +static struct wined3d_sampler *wined3d_device_get_sampler(const struct wined3d_device *device, + enum wined3d_shader_type shader_type, unsigned int 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->state.sampler[WINED3D_SHADER_TYPE_VERTEX][idx]; + return device->state.sampler[shader_type][idx]; +} + +struct wined3d_sampler * CDECL wined3d_device_get_vs_sampler(const struct wined3d_device *device, UINT idx) +{ + TRACE("device %p, idx %u.\n", device, idx); + + return wined3d_device_get_sampler(device, WINED3D_SHADER_TYPE_VERTEX, idx); } HRESULT CDECL wined3d_device_set_vs_consts_b(struct wined3d_device *device, @@ -2483,13 +2489,7 @@ struct wined3d_sampler * CDECL wined3d_device_get_ps_sampler(const struct wined3 { TRACE("device %p, idx %u.\n", device, idx); - if (idx >= MAX_SAMPLER_OBJECTS) - { - WARN("Invalid sampler index %u.\n", idx); - return NULL; - } - - return device->state.sampler[WINED3D_SHADER_TYPE_PIXEL][idx]; + return wined3d_device_get_sampler(device, WINED3D_SHADER_TYPE_PIXEL, idx); } HRESULT CDECL wined3d_device_set_ps_consts_b(struct wined3d_device *device, @@ -2700,13 +2700,7 @@ struct wined3d_sampler * CDECL wined3d_device_get_gs_sampler(const struct wined3 { TRACE("device %p, idx %u.\n", device, idx); - if (idx >= MAX_SAMPLER_OBJECTS) - { - WARN("Invalid sampler index %u.\n", idx); - return NULL; - } - - return device->state.sampler[WINED3D_SHADER_TYPE_GEOMETRY][idx]; + return wined3d_device_get_sampler(device, WINED3D_SHADER_TYPE_GEOMETRY, idx); } void CDECL wined3d_device_set_compute_shader(struct wined3d_device *device, struct wined3d_shader *shader) @@ -2775,13 +2769,7 @@ struct wined3d_sampler * CDECL wined3d_device_get_cs_sampler(const struct wined3 { TRACE("device %p, idx %u.\n", device, idx); - if (idx >= MAX_SAMPLER_OBJECTS) - { - WARN("Invalid sampler index %u.\n", idx); - return NULL; - } - - return device->state.sampler[WINED3D_SHADER_TYPE_COMPUTE][idx]; + return wined3d_device_get_sampler(device, WINED3D_SHADER_TYPE_COMPUTE, idx); } static void wined3d_device_set_pipeline_unordered_access_view(struct wined3d_device *device,