Zebediah Figura : wined3d: Introduce wined3d_device_context_set_sampler().
Alexandre Julliard
julliard at winehq.org
Wed Mar 17 16:23:15 CDT 2021
Module: wine
Branch: master
Commit: 9a1d82a3c0a8ef662cde713806e9b7310eb41f9f
URL: https://source.winehq.org/git/wine.git/?a=commit;h=9a1d82a3c0a8ef662cde713806e9b7310eb41f9f
Author: Zebediah Figura <z.figura12 at gmail.com>
Date: Tue Mar 16 19:06:09 2021 -0500
wined3d: Introduce wined3d_device_context_set_sampler().
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/wined3d/device.c | 62 ++++++++++++++++++++++++-----------------------
dlls/wined3d/wined3d.spec | 1 +
include/wine/wined3d.h | 2 ++
3 files changed, 35 insertions(+), 30 deletions(-)
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 5612e4bd0ce..c4700d2dc65 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -2230,6 +2230,32 @@ void CDECL wined3d_device_context_set_shader_resource_view(struct wined3d_device
}
}
+void CDECL wined3d_device_context_set_sampler(struct wined3d_device_context *context,
+ enum wined3d_shader_type type, unsigned int idx, struct wined3d_sampler *sampler)
+{
+ struct wined3d_state *state = context->state;
+ struct wined3d_sampler *prev;
+
+ TRACE("context %p, type %#x, idx %u, sampler %p.\n", context, type, idx, sampler);
+
+ if (idx >= MAX_SAMPLER_OBJECTS)
+ {
+ WARN("Invalid sampler index %u.\n", idx);
+ return;
+ }
+
+ prev = state->sampler[type][idx];
+ if (sampler == prev)
+ return;
+
+ if (sampler)
+ wined3d_sampler_incref(sampler);
+ state->sampler[type][idx] = sampler;
+ wined3d_device_context_emit_set_sampler(context, type, idx, sampler);
+ if (prev)
+ wined3d_sampler_decref(prev);
+}
+
void CDECL wined3d_device_set_vertex_shader(struct wined3d_device *device, struct wined3d_shader *shader)
{
TRACE("device %p, shader %p.\n", device, shader);
@@ -2294,35 +2320,11 @@ struct wined3d_shader_resource_view * CDECL wined3d_device_get_vs_resource_view(
return wined3d_device_get_shader_resource_view(device, 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)
-{
- struct wined3d_state *state = device->cs->c.state;
- struct wined3d_sampler *prev;
-
- if (idx >= MAX_SAMPLER_OBJECTS)
- {
- WARN("Invalid sampler index %u.\n", idx);
- return;
- }
-
- prev = state->sampler[type][idx];
- if (sampler == prev)
- return;
-
- if (sampler)
- wined3d_sampler_incref(sampler);
- state->sampler[type][idx] = sampler;
- wined3d_device_context_emit_set_sampler(&device->cs->c, type, idx, sampler);
- if (prev)
- wined3d_sampler_decref(prev);
-}
-
void CDECL wined3d_device_set_vs_sampler(struct wined3d_device *device, UINT idx, struct wined3d_sampler *sampler)
{
TRACE("device %p, idx %u, sampler %p.\n", device, idx, sampler);
- wined3d_device_set_sampler(device, WINED3D_SHADER_TYPE_VERTEX, idx, sampler);
+ wined3d_device_context_set_sampler(&device->cs->c, WINED3D_SHADER_TYPE_VERTEX, idx, sampler);
}
static struct wined3d_sampler *wined3d_device_get_sampler(const struct wined3d_device *device,
@@ -2432,7 +2434,7 @@ void CDECL wined3d_device_set_ps_sampler(struct wined3d_device *device, UINT idx
{
TRACE("device %p, idx %u, sampler %p.\n", device, idx, sampler);
- wined3d_device_set_sampler(device, WINED3D_SHADER_TYPE_PIXEL, idx, sampler);
+ wined3d_device_context_set_sampler(&device->cs->c, WINED3D_SHADER_TYPE_PIXEL, idx, sampler);
}
struct wined3d_sampler * CDECL wined3d_device_get_ps_sampler(const struct wined3d_device *device, UINT idx)
@@ -2531,7 +2533,7 @@ void CDECL wined3d_device_set_hs_sampler(struct wined3d_device *device,
{
TRACE("device %p, idx %u, sampler %p.\n", device, idx, sampler);
- wined3d_device_set_sampler(device, WINED3D_SHADER_TYPE_HULL, idx, sampler);
+ wined3d_device_context_set_sampler(&device->cs->c, WINED3D_SHADER_TYPE_HULL, idx, sampler);
}
struct wined3d_sampler * CDECL wined3d_device_get_hs_sampler(const struct wined3d_device *device, unsigned int idx)
@@ -2576,7 +2578,7 @@ void CDECL wined3d_device_set_ds_sampler(struct wined3d_device *device,
{
TRACE("device %p, idx %u, sampler %p.\n", device, idx, sampler);
- wined3d_device_set_sampler(device, WINED3D_SHADER_TYPE_DOMAIN, idx, sampler);
+ wined3d_device_context_set_sampler(&device->cs->c, WINED3D_SHADER_TYPE_DOMAIN, idx, sampler);
}
struct wined3d_sampler * CDECL wined3d_device_get_ds_sampler(const struct wined3d_device *device, unsigned int idx)
@@ -2620,7 +2622,7 @@ void CDECL wined3d_device_set_gs_sampler(struct wined3d_device *device, UINT idx
{
TRACE("device %p, idx %u, sampler %p.\n", device, idx, sampler);
- wined3d_device_set_sampler(device, WINED3D_SHADER_TYPE_GEOMETRY, idx, sampler);
+ wined3d_device_context_set_sampler(&device->cs->c, WINED3D_SHADER_TYPE_GEOMETRY, idx, sampler);
}
struct wined3d_sampler * CDECL wined3d_device_get_gs_sampler(const struct wined3d_device *device, UINT idx)
@@ -2665,7 +2667,7 @@ void CDECL wined3d_device_set_cs_sampler(struct wined3d_device *device,
{
TRACE("device %p, idx %u, sampler %p.\n", device, idx, sampler);
- wined3d_device_set_sampler(device, WINED3D_SHADER_TYPE_COMPUTE, idx, sampler);
+ wined3d_device_context_set_sampler(&device->cs->c, WINED3D_SHADER_TYPE_COMPUTE, idx, sampler);
}
struct wined3d_sampler * CDECL wined3d_device_get_cs_sampler(const struct wined3d_device *device, unsigned int idx)
diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec
index 20cea2490ae..7c39295c256 100644
--- a/dlls/wined3d/wined3d.spec
+++ b/dlls/wined3d/wined3d.spec
@@ -170,6 +170,7 @@
@ cdecl wined3d_device_context_set_constant_buffer(ptr long long ptr)
@ cdecl wined3d_device_context_set_depth_stencil_state(ptr ptr long)
@ cdecl wined3d_device_context_set_rasterizer_state(ptr ptr)
+@ cdecl wined3d_device_context_set_sampler(ptr long long ptr)
@ cdecl wined3d_device_context_set_scissor_rects(ptr long ptr)
@ cdecl wined3d_device_context_set_shader(ptr long ptr)
@ cdecl wined3d_device_context_set_shader_resource_view(ptr long long ptr)
diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h
index d4c97604e14..760e1ebcc80 100644
--- a/include/wine/wined3d.h
+++ b/include/wine/wined3d.h
@@ -2556,6 +2556,8 @@ void __cdecl wined3d_device_context_set_depth_stencil_state(struct wined3d_devic
struct wined3d_depth_stencil_state *depth_stencil_state, unsigned int stencil_ref);
void __cdecl wined3d_device_context_set_rasterizer_state(struct wined3d_device_context *context,
struct wined3d_rasterizer_state *rasterizer_state);
+void __cdecl wined3d_device_context_set_sampler(struct wined3d_device_context *context,
+ enum wined3d_shader_type type, unsigned int idx, struct wined3d_sampler *sampler);
void __cdecl wined3d_device_context_set_scissor_rects(struct wined3d_device_context *context, unsigned int rect_count,
const RECT *rects);
void __cdecl wined3d_device_context_set_shader(struct wined3d_device_context *context,
More information about the wine-cvs
mailing list