commit 266fc77cf0dcad53155b05b551356eef5604111d
author Stefan Dösinger <stefan@codeweavers.com> Fri Feb 16 19:08:34 2007 +0100
committer Alexandre Julliard <julliard@winehq.org> Mon Feb 19 13:08:35 2007 +0100
tree 26254da8095201e8e3c2c102778466f62f98d11a
parent 03bc11fa16a7af2bf461fd33e44cff3fe717ca4c

wined3d: Lighting is calculated for vertices without normals.

It still should be disabled for transformed vertices though.

dlls/wined3d/state.c

diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c
index 84095f6..16fddf7 100644
--- a/dlls/wined3d/state.c
+++ b/dlls/wined3d/state.c
@@ -79,9 +79,9 @@
 }
 
 static void state_lighting(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) {
-    BOOL normals;
+    BOOL transformed;
 
-    /* Lighting is only enabled if Vertex normals are passed by the application,
+    /* Lighting is not enabled if transformed vertices are drawn
      * but lighting does not affect the stream sources, so it is not grouped for performance reasons.
      * This state reads the decoded vertex decl, so if it is dirty don't do anything. The
      * vertex declaration appplying function calls this function for updating
@@ -91,10 +91,11 @@
         return;
     }
 
-    normals = stateblock->wineD3DDevice->strided_streams.u.s.normal.lpData != NULL ||
-              stateblock->wineD3DDevice->strided_streams.u.s.normal.VBO != 0;
+    transformed = ((stateblock->wineD3DDevice->strided_streams.u.s.position.lpData != NULL ||
+                    stateblock->wineD3DDevice->strided_streams.u.s.position.VBO != 0) &&
+                    stateblock->wineD3DDevice->strided_streams.u.s.position_transformed) ? TRUE : FALSE;
 
-    if (stateblock->renderState[WINED3DRS_LIGHTING] && normals) {
+    if (stateblock->renderState[WINED3DRS_LIGHTING] && !transformed) {
         glEnable(GL_LIGHTING);
         checkGLcall("glEnable GL_LIGHTING");
     } else {