Stefan Dösinger : wined3d: Remove the unused tween factor stateblock member.
Alexandre Julliard
julliard at wine.codeweavers.com
Mon Dec 11 07:45:04 CST 2006
Module: wine
Branch: master
Commit: 3e05e133f9afec791a0da095f584ce8124131fb9
URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e05e133f9afec791a0da095f584ce8124131fb9
Author: Stefan Dösinger <stefan at codeweavers.com>
Date: Fri Dec 8 19:50:38 2006 +0100
wined3d: Remove the unused tween factor stateblock member.
---
dlls/wined3d/device.c | 9 +--------
dlls/wined3d/stateblock.c | 1 -
dlls/wined3d/wined3d_private.h | 3 ---
3 files changed, 1 insertions(+), 12 deletions(-)
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index e1fbd50..af5e099 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -3382,15 +3382,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl
case WINED3DRS_FOGCOLOR :
case WINED3DRS_FOGDENSITY :
case WINED3DRS_VERTEXBLEND :
- StateTable[STATE_RENDER(State)].apply(STATE_RENDER(State), This->stateBlock);
- break;
-
case WINED3DRS_TWEENFACTOR :
- {
- tmpvalue.d = Value;
- This->updateStateBlock->tween_factor = tmpvalue.f;
- TRACE("Vertex Blending Tween Factor to %f\n", This->updateStateBlock->tween_factor);
- }
+ StateTable[STATE_RENDER(State)].apply(STATE_RENDER(State), This->stateBlock);
break;
case WINED3DRS_INDEXEDVERTEXBLENDENABLE :
diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c
index c0db61f..98904cc 100644
--- a/dlls/wined3d/stateblock.c
+++ b/dlls/wined3d/stateblock.c
@@ -167,7 +167,6 @@ void stateblock_copy(
Dest->viewport = This->viewport;
Dest->material = This->material;
Dest->pixelShader = This->pixelShader;
- Dest->tween_factor = This->tween_factor;
Dest->glsl_program = This->glsl_program;
/* Fixed size arrays */
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index cd49944..aaa7de7 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -1171,9 +1171,6 @@ struct IWineD3DStateBlockImpl
INT pixelShaderConstantI[MAX_CONST_I * 4];
float *pixelShaderConstantF;
- /* Indexed Vertex Blending */
- FLOAT tween_factor;
-
/* RenderState */
DWORD renderState[WINEHIGHEST_RENDER_STATE + 1];
More information about the wine-cvs
mailing list