[PATCH 2/5] wined3d: Don't update lowest_disabled_stage in wined3d_stateblock_apply().

Henri Verbeet hverbeet at codeweavers.com
Sun Oct 6 10:33:05 CDT 2013


I think the current code is redundant and wrong. If no stage is disabled
lowest_disabled_stage should be MAX_TEXTURES, and applying the texture stage
states a few lines earlier should already correctly update
lowest_disabled_stage.
---
 dlls/wined3d/stateblock.c |   10 ----------
 1 file changed, 10 deletions(-)

diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c
index 24c4362..2a1cb12 100644
--- a/dlls/wined3d/stateblock.c
+++ b/dlls/wined3d/stateblock.c
@@ -1133,16 +1133,6 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock)
         wined3d_device_set_clip_plane(device, i, &stateblock->state.clip_planes[i]);
     }
 
-    stateblock->device->state.lowest_disabled_stage = MAX_TEXTURES - 1;
-    for (i = 0; i < MAX_TEXTURES - 1; ++i)
-    {
-        if (stateblock->device->state.texture_states[i][WINED3D_TSS_COLOR_OP] == WINED3D_TOP_DISABLE)
-        {
-            stateblock->device->state.lowest_disabled_stage = i;
-            break;
-        }
-    }
-
     TRACE("Applied stateblock %p.\n", stateblock);
 }
 
-- 
1.7.10.4




More information about the wine-patches mailing list