[PATCH v2] ddraw: Track the viewport and scissor rect in the primary stateblock.

20 Nov 2019

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com>
---
 dlls/ddraw/device.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c
index 4ad1fdb7f57..ffa029321c1 100644
--- a/dlls/ddraw/device.c
+++ b/dlls/ddraw/device.c
@@ -6961,6 +6961,17 @@ enum wined3d_depth_buffer_type d3d_device_update_depth_stencil(struct d3d_device
     return WINED3D_ZB_TRUE;
 }
 
+static void ddraw_reset_viewport_state(struct ddraw *ddraw)
+{
+    struct wined3d_viewport vp;
+    RECT rect;
+
+    wined3d_device_get_viewports(ddraw->wined3d_device, NULL, &vp);
+    wined3d_stateblock_set_viewport(ddraw->state, &vp);
+    wined3d_device_get_scissor_rects(ddraw->wined3d_device, NULL, &rect);
+    wined3d_stateblock_set_scissor_rect(ddraw->state, &rect);
+}
+
 static HRESULT d3d_device_init(struct d3d_device *device, struct ddraw *ddraw,
         struct ddraw_surface *target, IUnknown *rt_iface, UINT version, IUnknown *outer_unknown)
 {
@@ -7039,6 +7050,7 @@ static HRESULT d3d_device_init(struct d3d_device *device, struct ddraw *ddraw,
         IDirect3DDevice3_SetRenderState(&device->IDirect3DDevice3_iface,
                 D3DRENDERSTATE_TEXTUREMAPBLEND, D3DTBLEND_MODULATE);
     }
+    ddraw_reset_viewport_state(ddraw);
     return D3D_OK;
 }
 
-- 
2.23.0

    

Zebediah Figura