marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wined3d: Add D3DVERTEXBLENDFLAGS to the WINED3D namespace.

oldstable
Ivan Gyurdiev 2006-10-12 23:33:44 -04:00 committed by Alexandre Julliard
parent c912032aa5
commit 6f0bb0f6fc
4 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/wined3d/device.c
View File

@ -4029,7 +4029,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetRenderState(IWineD3DDevice *iface, W
case WINED3DRS_VERTEXBLEND :
{
This->updateStateBlock->vertex_blend = (D3DVERTEXBLENDFLAGS) Value;
This->updateStateBlock->vertex_blend = (WINED3DVERTEXBLENDFLAGS) Value;
TRACE("Vertex Blending state to %d\n", Value);
}
break;

2
dlls/wined3d/stateblock.c
View File

@ -908,7 +908,7 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_InitStartupStateBlock(IWineD3DStat
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;

2
dlls/wined3d/wined3d_private.h
View File

@ -1135,7 +1135,7 @@ struct IWineD3DStateBlockImpl
float *pixelShaderConstantF;
/* Indexed Vertex Blending */
D3DVERTEXBLENDFLAGS vertex_blend;
WINED3DVERTEXBLENDFLAGS vertex_blend;
FLOAT tween_factor;
/* RenderState */

8
include/wine/wined3d_types.h
View File

@ -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;