Stefan Dösinger : wined3d: Remove some unneeded context cache members from the device.

Alexandre Julliard julliard at wine.codeweavers.com
Mon Jan 8 14:44:25 CST 2007


Module: wine
Branch: master
Commit: 2e55c196ee1b177e11b354273d80af1a8cb9ca38
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=2e55c196ee1b177e11b354273d80af1a8cb9ca38

Author: Stefan Dösinger <stefan at codeweavers.com>
Date:   Sat Jan  6 18:34:59 2007 +0100

wined3d: Remove some unneeded context 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 @@ typedef struct IWineD3DDeviceImpl
 #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;




More information about the wine-cvs mailing list