[14/16] WineD3D: Remove the unused stateblock vertex blend member
Stefan Dösinger
stefan at codeweavers.com
Fri Dec 8 13:02:31 CST 2006
the vertex_blend member is just a copy of the WINED3DRS_VERTEXBLEND render
state. It is only written to the stateblock and copied to new stateblocks,
but never actually read. Remove the redundant value copy and the code setting
it.
WINED3DRS_VERTEXBLEND isn't supported right now, and the fixed function opengl
pipeline can't do it, so its mapped to state_nogl. To implement it a pipeline
replacement shader would be needed.
-------------- next part --------------
From 639a72a4c4dda5a744eb4ebd5b09dde2d97c6e10 Mon Sep 17 00:00:00 2001
From: Stefan Doesinger <stefan at codeweavers.com>
Date: Fri, 8 Dec 2006 17:29:52 +0100
Subject: [PATCH] WineD3D: remove the unused vertex_blend stateblock member
---
dlls/wined3d/device.c | 8 +-------
dlls/wined3d/stateblock.c | 1 -
dlls/wined3d/wined3d_private.h | 1 -
3 files changed, 1 insertions(+), 9 deletions(-)
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 52b1c87..2e98ab6 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -3381,14 +3381,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl
case WINED3DRS_RANGEFOGENABLE :
case WINED3DRS_FOGCOLOR :
case WINED3DRS_FOGDENSITY :
- StateTable[STATE_RENDER(State)].apply(STATE_RENDER(State), This->stateBlock);
- break;
-
case WINED3DRS_VERTEXBLEND :
- {
- This->updateStateBlock->vertex_blend = (WINED3DVERTEXBLENDFLAGS) Value;
- TRACE("Vertex Blending state to %d\n", Value);
- }
+ StateTable[STATE_RENDER(State)].apply(STATE_RENDER(State), This->stateBlock);
break;
case WINED3DRS_TWEENFACTOR :
diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c
index 8974501..c0db61f 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->vertex_blend = This->vertex_blend;
Dest->tween_factor = This->tween_factor;
Dest->glsl_program = This->glsl_program;
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 9d453b2..cd49944 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -1172,7 +1172,6 @@ struct IWineD3DStateBlockImpl
float *pixelShaderConstantF;
/* Indexed Vertex Blending */
- WINED3DVERTEXBLENDFLAGS vertex_blend;
FLOAT tween_factor;
/* RenderState */
--
1.4.2.4
More information about the wine-patches
mailing list