ddraw: Factor out d3d_device_apply_state().

CW-Bug-Id: #24604

Author: Paul Gofman

dlls/ddraw/device.c

@@ -3439,6 +3439,12 @@ void d3d_device_sync_surfaces(struct d3d_device *device)
     }
 }
 
+static void d3d_device_apply_state(struct d3d_device *device)
+{
+    wined3d_device_apply_stateblock(device->wined3d_device, device->state);
+    d3d_device_sync_surfaces(device);
+}
+
 static HRESULT d3d_device7_DrawPrimitive(IDirect3DDevice7 *iface,
         D3DPRIMITIVETYPE primitive_type, DWORD fvf, void *vertices,
         DWORD vertex_count, DWORD flags)
@@ -3473,8 +3479,7 @@ static HRESULT d3d_device7_DrawPrimitive(IDirect3DDevice7 *iface,
     wined3d_stateblock_set_vertex_declaration(device->state, ddraw_find_decl(device->ddraw, fvf));
     wined3d_device_context_set_primitive_type(device->immediate_context,
             wined3d_primitive_type_from_ddraw(primitive_type), 0);
-    wined3d_device_apply_stateblock(device->wined3d_device, device->state);
-    d3d_device_sync_surfaces(device);
+    d3d_device_apply_state(device);
     wined3d_device_context_draw(device->immediate_context, vb_pos / stride, vertex_count, 0, 0);
 
 done:
@@ -3616,8 +3621,7 @@ static HRESULT d3d_device7_DrawIndexedPrimitive(IDirect3DDevice7 *iface,
     wined3d_stateblock_set_vertex_declaration(device->state, ddraw_find_decl(device->ddraw, fvf));
     wined3d_device_context_set_primitive_type(device->immediate_context,
             wined3d_primitive_type_from_ddraw(primitive_type), 0);
-    wined3d_device_apply_stateblock(device->wined3d_device, device->state);
-    d3d_device_sync_surfaces(device);
+    d3d_device_apply_state(device);
     wined3d_device_context_draw_indexed(device->immediate_context, vb_pos / stride,
             ib_pos / sizeof(*indices), index_count, 0, 0);
 
@@ -3928,8 +3932,7 @@ static HRESULT d3d_device7_DrawPrimitiveStrided(IDirect3DDevice7 *iface, D3DPRIM
 
     wined3d_device_context_set_primitive_type(device->immediate_context,
             wined3d_primitive_type_from_ddraw(primitive_type), 0);
-    wined3d_device_apply_stateblock(device->wined3d_device, device->state);
-    d3d_device_sync_surfaces(device);
+    d3d_device_apply_state(device);
     wined3d_device_context_draw(device->immediate_context, vb_pos / dst_stride, vertex_count, 0, 0);
 
 done:
@@ -4034,8 +4037,7 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveStrided(IDirect3DDevice7 *iface,
     wined3d_stateblock_set_vertex_declaration(device->state, ddraw_find_decl(device->ddraw, fvf));
     wined3d_device_context_set_primitive_type(device->immediate_context,
             wined3d_primitive_type_from_ddraw(primitive_type), 0);
-    wined3d_device_apply_stateblock(device->wined3d_device, device->state);
-    d3d_device_sync_surfaces(device);
+    d3d_device_apply_state(device);
     wined3d_device_context_draw_indexed(device->immediate_context,
             vb_pos / vtx_dst_stride, ib_pos / sizeof(WORD), index_count, 0, 0);
 
@@ -4161,8 +4163,7 @@ static HRESULT d3d_device7_DrawPrimitiveVB(IDirect3DDevice7 *iface, D3DPRIMITIVE
     /* Now draw the primitives */
     wined3d_device_context_set_primitive_type(device->immediate_context,
             wined3d_primitive_type_from_ddraw(primitive_type), 0);
-    wined3d_device_apply_stateblock(device->wined3d_device, device->state);
-    d3d_device_sync_surfaces(device);
+    d3d_device_apply_state(device);
     wined3d_device_context_draw(device->immediate_context, start_vertex, vertex_count, 0, 0);
 
     wined3d_mutex_unlock();
@@ -4298,8 +4299,7 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface,
 
     wined3d_device_context_set_primitive_type(device->immediate_context,
             wined3d_primitive_type_from_ddraw(primitive_type), 0);
-    wined3d_device_apply_stateblock(device->wined3d_device, device->state);
-    d3d_device_sync_surfaces(device);
+    d3d_device_apply_state(device);
     wined3d_device_context_draw_indexed(device->immediate_context, start_vertex,
             ib_pos / sizeof(WORD), index_count, 0, 0);
 
@@ -5163,8 +5163,7 @@ static HRESULT d3d_device7_Clear(IDirect3DDevice7 *iface, DWORD count,
     }
 
     wined3d_mutex_lock();
-    wined3d_device_apply_stateblock(device->wined3d_device, device->state);
-    d3d_device_sync_rendertarget(device);
+    d3d_device_apply_state(device);
     hr = wined3d_device_clear(device->wined3d_device, count, (RECT *)rects, flags, &c, z, stencil);
     wined3d_mutex_unlock();