Zebediah Figura : wined3d: Introduce wined3d_device_context_set_rasterizer_state().

Alexandre Julliard julliard at winehq.org
Thu Mar 11 15:59:35 CST 2021


Module: wine
Branch: master
Commit: 7494294d6f8b83d4127fefb9f6aff6bc184d43ca
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=7494294d6f8b83d4127fefb9f6aff6bc184d43ca

Author: Zebediah Figura <z.figura12 at gmail.com>
Date:   Wed Mar 10 19:25:19 2021 -0600

wined3d: Introduce wined3d_device_context_set_rasterizer_state().

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     | 34 +++++++++++++++++++++-------------
 dlls/wined3d/wined3d.spec |  1 +
 include/wine/wined3d.h    |  2 ++
 3 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index e0b26270ada..ad24805b5ef 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -1780,21 +1780,9 @@ struct wined3d_depth_stencil_state * CDECL wined3d_device_get_depth_stencil_stat
 void CDECL wined3d_device_set_rasterizer_state(struct wined3d_device *device,
         struct wined3d_rasterizer_state *rasterizer_state)
 {
-    struct wined3d_state *state = device->cs->c.state;
-    struct wined3d_rasterizer_state *prev;
-
     TRACE("device %p, rasterizer_state %p.\n", device, rasterizer_state);
 
-    prev = state->rasterizer_state;
-    if (prev == rasterizer_state)
-        return;
-
-    if (rasterizer_state)
-        wined3d_rasterizer_state_incref(rasterizer_state);
-    state->rasterizer_state = rasterizer_state;
-    wined3d_device_context_emit_set_rasterizer_state(&device->cs->c, rasterizer_state);
-    if (prev)
-        wined3d_rasterizer_state_decref(prev);
+    wined3d_device_context_set_rasterizer_state(&device->cs->c, rasterizer_state);
 }
 
 struct wined3d_rasterizer_state * CDECL wined3d_device_get_rasterizer_state(struct wined3d_device *device)
@@ -2150,6 +2138,26 @@ void CDECL wined3d_device_context_set_depth_stencil_state(struct wined3d_device_
         wined3d_depth_stencil_state_decref(prev);
 }
 
+void CDECL wined3d_device_context_set_rasterizer_state(struct wined3d_device_context *context,
+        struct wined3d_rasterizer_state *rasterizer_state)
+{
+    struct wined3d_state *state = context->state;
+    struct wined3d_rasterizer_state *prev;
+
+    TRACE("context %p, rasterizer_state %p.\n", context, rasterizer_state);
+
+    prev = state->rasterizer_state;
+    if (prev == rasterizer_state)
+        return;
+
+    if (rasterizer_state)
+        wined3d_rasterizer_state_incref(rasterizer_state);
+    state->rasterizer_state = rasterizer_state;
+    wined3d_device_context_emit_set_rasterizer_state(context, rasterizer_state);
+    if (prev)
+        wined3d_rasterizer_state_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);
diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec
index 04bb975da73..afa945eeb92 100644
--- a/dlls/wined3d/wined3d.spec
+++ b/dlls/wined3d/wined3d.spec
@@ -170,6 +170,7 @@
 @ cdecl wined3d_device_context_set_blend_state(ptr ptr ptr long)
 @ 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_shader(ptr long ptr)
 
 @ cdecl wined3d_output_find_closest_matching_mode(ptr ptr)
diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h
index c52f328c277..87ffe04f40f 100644
--- a/include/wine/wined3d.h
+++ b/include/wine/wined3d.h
@@ -2555,6 +2555,8 @@ void __cdecl wined3d_device_context_set_constant_buffer(struct wined3d_device_co
         enum wined3d_shader_type type, unsigned int idx, struct wined3d_buffer *buffer);
 void __cdecl wined3d_device_context_set_depth_stencil_state(struct wined3d_device_context *context,
         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_shader(struct wined3d_device_context *context,
         enum wined3d_shader_type type, struct wined3d_shader *shader);
 




More information about the wine-cvs mailing list