Zebediah Figura : wined3d: Introduce wined3d_device_context_set_viewports().
Alexandre Julliard
julliard at winehq.org
Tue Mar 16 16:39:03 CDT 2021
Module: wine
Branch: master
Commit: da7a9bd8115cf16dc4757285a3043c399acd3e01
URL: https://source.winehq.org/git/wine.git/?a=commit;h=da7a9bd8115cf16dc4757285a3043c399acd3e01
Author: Zebediah Figura <z.figura12 at gmail.com>
Date: Tue Mar 16 00:42:19 2021 -0500
wined3d: Introduce wined3d_device_context_set_viewports().
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 | 32 ++++++++++++++++++++++++--------
dlls/wined3d/wined3d.spec | 1 +
include/wine/wined3d.h | 2 ++
3 files changed, 27 insertions(+), 8 deletions(-)
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 62a3e990cf1..6e9afb8468d 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -1681,7 +1681,6 @@ void CDECL wined3d_device_set_base_vertex_index(struct wined3d_device *device, I
void CDECL wined3d_device_set_viewports(struct wined3d_device *device, unsigned int viewport_count,
const struct wined3d_viewport *viewports)
{
- struct wined3d_state *state = device->cs->c.state;
unsigned int i;
TRACE("device %p, viewport_count %u, viewports %p.\n", device, viewport_count, viewports);
@@ -1692,13 +1691,7 @@ void CDECL wined3d_device_set_viewports(struct wined3d_device *device, unsigned
viewports[i].width, viewports[i].height, viewports[i].min_z, viewports[i].max_z);
}
- if (viewport_count)
- memcpy(state->viewports, viewports, viewport_count * sizeof(*viewports));
- else
- memset(state->viewports, 0, sizeof(state->viewports));
- state->viewport_count = viewport_count;
-
- wined3d_device_context_emit_set_viewports(&device->cs->c, viewport_count, viewports);
+ wined3d_device_context_set_viewports(&device->cs->c, viewport_count, viewports);
}
void CDECL wined3d_device_get_viewports(const struct wined3d_device *device, unsigned int *viewport_count,
@@ -2157,6 +2150,29 @@ void CDECL wined3d_device_context_set_rasterizer_state(struct wined3d_device_con
wined3d_rasterizer_state_decref(prev);
}
+void CDECL wined3d_device_context_set_viewports(struct wined3d_device_context *context, unsigned int viewport_count,
+ const struct wined3d_viewport *viewports)
+{
+ struct wined3d_state *state = context->state;
+ unsigned int i;
+
+ TRACE("context %p, viewport_count %u, viewports %p.\n", context, viewport_count, viewports);
+
+ for (i = 0; i < viewport_count; ++i)
+ {
+ TRACE("%u: x %.8e, y %.8e, w %.8e, h %.8e, min_z %.8e, max_z %.8e.\n", i, viewports[i].x, viewports[i].y,
+ viewports[i].width, viewports[i].height, viewports[i].min_z, viewports[i].max_z);
+ }
+
+ if (viewport_count)
+ memcpy(state->viewports, viewports, viewport_count * sizeof(*viewports));
+ else
+ memset(state->viewports, 0, sizeof(state->viewports));
+ state->viewport_count = viewport_count;
+
+ wined3d_device_context_emit_set_viewports(context, viewport_count, viewports);
+}
+
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 3fe3e0cfd89..8fc190b73ba 100644
--- a/dlls/wined3d/wined3d.spec
+++ b/dlls/wined3d/wined3d.spec
@@ -171,6 +171,7 @@
@ 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_device_context_set_viewports(ptr long ptr)
@ cdecl wined3d_output_find_closest_matching_mode(ptr ptr)
@ cdecl wined3d_output_get_adapter(ptr)
diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h
index 3c091263742..f3de0098ef3 100644
--- a/include/wine/wined3d.h
+++ b/include/wine/wined3d.h
@@ -2558,6 +2558,8 @@ void __cdecl wined3d_device_context_set_rasterizer_state(struct wined3d_device_c
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);
+void __cdecl wined3d_device_context_set_viewports(struct wined3d_device_context *context, unsigned int viewport_count,
+ const struct wined3d_viewport *viewports);
HRESULT __cdecl wined3d_output_find_closest_matching_mode(const struct wined3d_output *output,
struct wined3d_display_mode *mode);
More information about the wine-cvs
mailing list