Skip to content

W
wine-winehq
Commit 663e5a6a authored by Henri Verbeet's avatar Henri Verbeet Committed by Alexandre Julliard
Browse files
Options

wined3d: Simplify the "transformed" check in state_lighting().

It doesn't really matter if lighting is enabled or not if we don't have position data.
parent a7d61285
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 7 deletions
dlls/wined3d/state.c
View file @ 663e5a6a
...@@ -81,8 +81,6 @@ static void state_fillmode(DWORD state, IWineD3DStateBlockImpl *stateblock, Wine ...@@ -81,8 +81,6 @@ static void state_fillmode(DWORD state, IWineD3DStateBlockImpl *stateblock, Wine
} }
static void state_lighting(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { static void state_lighting(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) {
BOOL transformed;
/* Lighting is not enabled if transformed vertices are drawn /* 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. * but lighting does not affect the stream sources, so it is not grouped for performance reasons.
* This state reads the decoded vertex declaration, so if it is dirty don't do anything. The * This state reads the decoded vertex declaration, so if it is dirty don't do anything. The
...@@ -93,11 +91,9 @@ static void state_lighting(DWORD state, IWineD3DStateBlockImpl *stateblock, Wine ...@@ -93,11 +91,9 @@ static void state_lighting(DWORD state, IWineD3DStateBlockImpl *stateblock, Wine
return; return;
} }
transformed = ((stateblock->wineD3DDevice->strided_streams.u.s.position.lpData != NULL || if (stateblock->renderState[WINED3DRS_LIGHTING]
stateblock->wineD3DDevice->strided_streams.u.s.position.VBO != 0) && && !stateblock->wineD3DDevice->strided_streams.position_transformed)
stateblock->wineD3DDevice->strided_streams.position_transformed) ? TRUE : FALSE; {
if (stateblock->renderState[WINED3DRS_LIGHTING] && !transformed) {
glEnable(GL_LIGHTING); glEnable(GL_LIGHTING);
checkGLcall("glEnable GL_LIGHTING"); checkGLcall("glEnable GL_LIGHTING");
} else { } else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment