[18/20] WineD3D: Remove some unneeded context cache members from the device

Stefan Dösinger stefan at codeweavers.com
Sat Jan 6 11:34:59 CST 2007


These flags are not needed any longer, their functionality is now in the dirty 
state list
-------------- next part --------------
From b21fca5cadda3567997b1de2e6a7a5e630a5de40 Mon Sep 17 00:00:00 2001
From: Stefan Doesinger <stefan at codeweavers.com>
Date: Fri, 5 Jan 2007 23:46:20 +0100
Subject: [PATCH] WineD3D: Remove some unneeded state cache members from the device

---
 dlls/wined3d/state.c           |    5 -----
 dlls/wined3d/wined3d_private.h |    3 ---
 2 files changed, 0 insertions(+), 8 deletions(-)

diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c
index 0e36a08..e2ed6ce 100644
--- a/dlls/wined3d/state.c
+++ b/dlls/wined3d/state.c
@@ -307,10 +307,6 @@ static void state_blend(DWORD state, IWi
     TRACE("glBlendFunc src=%x, dst=%x\n", srcBlend, dstBlend);
     glBlendFunc(srcBlend, dstBlend);
     checkGLcall("glBlendFunc");
-
-    /* TODO: Remove when state management done */
-    stateblock->wineD3DDevice->dstBlend = dstBlend;
-    stateblock->wineD3DDevice->srcBlend = srcBlend;
 }
 
 static void state_blendfactor(DWORD state, IWineD3DStateBlockImpl *stateblock) {
@@ -361,7 +357,6 @@ static void state_alpha(DWORD state, IWi
         glParm = CompareFunc(stateblock->renderState[WINED3DRS_ALPHAFUNC]);
     }
     if(glParm) {
-        stateblock->wineD3DDevice->alphafunc = glParm; /* Remove when state management done */
         glAlphaFunc(glParm, ref);
         checkGLcall("glAlphaFunc");
     }
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 83a8f17..e8b60de 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -576,9 +576,6 @@ #define                         DISABLED
 #define                         IS_TRACKING        1  /* tracking_parm is tracking diffuse color  */
 #define                         NEEDS_TRACKING     2  /* Tracking needs to be enabled when needed */
 #define                         NEEDS_DISABLE      3  /* Tracking needs to be disabled when needed*/
-    UINT                    srcBlend;
-    UINT                    dstBlend;
-    UINT                    alphafunc;
     BOOL                    texture_shader_active;  /* TODO: Confirm use is correct */
     BOOL                    last_was_notclipped;
     BOOL                    untransformed;
-- 
1.4.2.4



More information about the wine-patches mailing list