Module: wine Branch: master Commit: 6f0bb0f6fc92e4831f20bed241e6f3fd693063ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f0bb0f6fc92e4831f20bed241...
Author: Ivan Gyurdiev ivg231@gmail.com Date: Thu Oct 12 23:33:44 2006 -0400
wined3d: Add D3DVERTEXBLENDFLAGS to the WINED3D namespace.
---
dlls/wined3d/device.c | 2 +- dlls/wined3d/stateblock.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- include/wine/wined3d_types.h | 8 ++++++++ 4 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 83e9a83..ee966b0 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4029,7 +4029,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl
case WINED3DRS_VERTEXBLEND : { - This->updateStateBlock->vertex_blend = (D3DVERTEXBLENDFLAGS) Value; + This->updateStateBlock->vertex_blend = (WINED3DVERTEXBLENDFLAGS) Value; TRACE("Vertex Blending state to %d\n", Value); } break; diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 18a2ea7..8cc99ed 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -908,7 +908,7 @@ static HRESULT WINAPI IWineD3DStateBloc IWineD3DDevice_SetRenderState(device, WINED3DRS_SPECULARMATERIALSOURCE, D3DMCS_COLOR2); IWineD3DDevice_SetRenderState(device, WINED3DRS_AMBIENTMATERIALSOURCE, D3DMCS_MATERIAL); IWineD3DDevice_SetRenderState(device, WINED3DRS_EMISSIVEMATERIALSOURCE, D3DMCS_MATERIAL); - IWineD3DDevice_SetRenderState(device, WINED3DRS_VERTEXBLEND, D3DVBF_DISABLE); + IWineD3DDevice_SetRenderState(device, WINED3DRS_VERTEXBLEND, WINED3DVBF_DISABLE); IWineD3DDevice_SetRenderState(device, WINED3DRS_CLIPPLANEENABLE, 0); IWineD3DDevice_SetRenderState(device, WINED3DRS_SOFTWAREVERTEXPROCESSING, FALSE); tmpfloat.f = 1.0f; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index dfdc21a..c3512f2 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1135,7 +1135,7 @@ struct IWineD3DStateBlockImpl float *pixelShaderConstantF;
/* Indexed Vertex Blending */ - D3DVERTEXBLENDFLAGS vertex_blend; + WINED3DVERTEXBLENDFLAGS vertex_blend; FLOAT tween_factor;
/* RenderState */ diff --git a/include/wine/wined3d_types.h b/include/wine/wined3d_types.h index c8cf672..baa0c52 100644 --- a/include/wine/wined3d_types.h +++ b/include/wine/wined3d_types.h @@ -442,6 +442,14 @@ typedef enum _WINED3DRENDERSTATETYPE { #define WINEHIGHEST_RENDER_STATE WINED3DRS_BLENDOPALPHA /* Highest WINED3DRS_ value */
+typedef enum _WINED3DVERTEXBLENDFLAGS { + WINED3DVBF_DISABLE = 0, + WINED3DVBF_1WEIGHTS = 1, + WINED3DVBF_2WEIGHTS = 2, + WINED3DVBF_3WEIGHTS = 3, + WINED3DVBF_TWEENING = 255, + WINED3DVBF_0WEIGHTS = 256 +} WINED3DVERTEXBLENDFLAGS;
typedef struct _WINED3DDISPLAYMODE { UINT Width;