Paul Gofman : ddraw: Support D3DVOP_LIGHT in d3d_vertex_buffer7_ProcessVertices().

[Alexandre Julliard]

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

Author: Paul Gofman <gofmanp(a)gmail.com>
Date:   Wed May 22 12:39:26 2019 +0300

ddraw: Support D3DVOP_LIGHT in d3d_vertex_buffer7_ProcessVertices().

Signed-off-by: Paul Gofman <gofmanp(a)gmail.com>
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/ddraw/vertexbuffer.c | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/dlls/ddraw/vertexbuffer.c b/dlls/ddraw/vertexbuffer.c
index d2c2f8f..07c0d28 100644
--- a/dlls/ddraw/vertexbuffer.c
+++ b/dlls/ddraw/vertexbuffer.c
@@ -260,7 +260,7 @@ static HRESULT WINAPI d3d_vertex_buffer7_ProcessVertices(IDirect3DVertexBuffer7
     struct d3d_device *device_impl = dst_buffer_impl->version == 7
             ? unsafe_impl_from_IDirect3DDevice7(device)
             : unsafe_impl_from_IDirect3DDevice3((IDirect3DDevice3 *)device);
-    BOOL oldClip, doClip;
+    BOOL old_clip, do_clip, old_lighting, do_lighting;
     HRESULT hr;
 
     TRACE("iface %p, vertex_op %#x, dst_idx %u, count %u, src_buffer %p, src_idx %u, device %p, flags %#x.\n",
@@ -285,10 +285,20 @@ static HRESULT WINAPI d3d_vertex_buffer7_ProcessVertices(IDirect3DVertexBuffer7
      * render states instead. Set the render states according to
      * the vertex ops
      */
-    doClip = !!(vertex_op & D3DVOP_CLIP);
-    oldClip = wined3d_device_get_render_state(device_impl->wined3d_device, WINED3D_RS_CLIPPING);
-    if (doClip != oldClip)
-        wined3d_device_set_render_state(device_impl->wined3d_device, WINED3D_RS_CLIPPING, doClip);
+    do_clip = !!(vertex_op & D3DVOP_CLIP);
+    old_clip = !!wined3d_device_get_render_state(device_impl->wined3d_device, WINED3D_RS_CLIPPING);
+    if (do_clip != old_clip)
+        wined3d_device_set_render_state(device_impl->wined3d_device, WINED3D_RS_CLIPPING, do_clip);
+
+    old_lighting = !!wined3d_device_get_render_state(device_impl->wined3d_device, WINED3D_RS_LIGHTING);
+    if (dst_buffer_impl->version == 3)
+        do_lighting = device_impl->material && (src_buffer_impl->fvf & D3DFVF_NORMAL)
+                && (vertex_op & D3DVOP_LIGHT);
+    else
+        do_lighting = old_lighting && (vertex_op & D3DVOP_LIGHT);
+
+    if (do_lighting != old_lighting)
+        wined3d_device_set_render_state(device_impl->wined3d_device, WINED3D_RS_LIGHTING, do_lighting);
 
     wined3d_device_set_stream_source(device_impl->wined3d_device,
             0, src_buffer_impl->wined3d_buffer, 0, get_flexible_vertex_size(src_buffer_impl->fvf));
@@ -297,8 +307,10 @@ static HRESULT WINAPI d3d_vertex_buffer7_ProcessVertices(IDirect3DVertexBuffer7
             count, dst_buffer_impl->wined3d_buffer, NULL, flags, dst_buffer_impl->fvf);
 
     /* Restore the states if needed */
-    if (doClip != oldClip)
-        wined3d_device_set_render_state(device_impl->wined3d_device, WINED3D_RS_CLIPPING, oldClip);
+    if (do_clip != old_clip)
+        wined3d_device_set_render_state(device_impl->wined3d_device, WINED3D_RS_CLIPPING, old_clip);
+    if (do_lighting != old_lighting)
+        wined3d_device_set_render_state(device_impl->wined3d_device, WINED3D_RS_LIGHTING, old_lighting);
 
     wined3d_mutex_unlock();