Module: wine Branch: master Commit: 908853f63d9e301653e306080bef839b1ea4d857 URL: http://source.winehq.org/git/wine.git/?a=commit;h=908853f63d9e301653e306080b...
Author: Ivan Gyurdiev ivg231@gmail.com Date: Sun Oct 29 21:45:23 2006 -0500
wined3d: Add D3DMATERIALCOLORSOURCE to the WINED3D namespace.
---
dlls/wined3d/device.c | 10 +++++----- dlls/wined3d/stateblock.c | 8 ++++---- include/wine/wined3d_types.h | 8 ++++++++ 3 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a0c5c95..7e2d859 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4067,17 +4067,17 @@ static HRESULT WINAPI IWineD3DDeviceImpl This->stateBlock->renderState[WINED3DRS_EMISSIVEMATERIALSOURCE], This->stateBlock->renderState[WINED3DRS_SPECULARMATERIALSOURCE]);
- if (This->stateBlock->renderState[WINED3DRS_DIFFUSEMATERIALSOURCE] == D3DMCS_COLOR1) { - if (This->stateBlock->renderState[WINED3DRS_AMBIENTMATERIALSOURCE] == D3DMCS_COLOR1) { + if (This->stateBlock->renderState[WINED3DRS_DIFFUSEMATERIALSOURCE] == WINED3DMCS_COLOR1) { + if (This->stateBlock->renderState[WINED3DRS_AMBIENTMATERIALSOURCE] == WINED3DMCS_COLOR1) { Parm = GL_AMBIENT_AND_DIFFUSE; } else { Parm = GL_DIFFUSE; } - } else if (This->stateBlock->renderState[WINED3DRS_AMBIENTMATERIALSOURCE] == D3DMCS_COLOR1) { + } else if (This->stateBlock->renderState[WINED3DRS_AMBIENTMATERIALSOURCE] == WINED3DMCS_COLOR1) { Parm = GL_AMBIENT; - } else if (This->stateBlock->renderState[WINED3DRS_EMISSIVEMATERIALSOURCE] == D3DMCS_COLOR1) { + } else if (This->stateBlock->renderState[WINED3DRS_EMISSIVEMATERIALSOURCE] == WINED3DMCS_COLOR1) { Parm = GL_EMISSION; - } else if (This->stateBlock->renderState[WINED3DRS_SPECULARMATERIALSOURCE] == D3DMCS_COLOR1) { + } else if (This->stateBlock->renderState[WINED3DRS_SPECULARMATERIALSOURCE] == WINED3DMCS_COLOR1) { Parm = GL_SPECULAR; } else { Parm = -1; diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 3038905..0a850e5 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -904,10 +904,10 @@ static HRESULT WINAPI IWineD3DStateBloc IWineD3DDevice_SetRenderState(device, WINED3DRS_COLORVERTEX, TRUE); IWineD3DDevice_SetRenderState(device, WINED3DRS_LOCALVIEWER, TRUE); IWineD3DDevice_SetRenderState(device, WINED3DRS_NORMALIZENORMALS, FALSE); - IWineD3DDevice_SetRenderState(device, WINED3DRS_DIFFUSEMATERIALSOURCE, D3DMCS_COLOR1); - 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_DIFFUSEMATERIALSOURCE, WINED3DMCS_COLOR1); + IWineD3DDevice_SetRenderState(device, WINED3DRS_SPECULARMATERIALSOURCE, WINED3DMCS_COLOR2); + IWineD3DDevice_SetRenderState(device, WINED3DRS_AMBIENTMATERIALSOURCE, WINED3DMCS_MATERIAL); + IWineD3DDevice_SetRenderState(device, WINED3DRS_EMISSIVEMATERIALSOURCE, WINED3DMCS_MATERIAL); IWineD3DDevice_SetRenderState(device, WINED3DRS_VERTEXBLEND, WINED3DVBF_DISABLE); IWineD3DDevice_SetRenderState(device, WINED3DRS_CLIPPLANEENABLE, 0); IWineD3DDevice_SetRenderState(device, WINED3DRS_SOFTWAREVERTEXPROCESSING, FALSE); diff --git a/include/wine/wined3d_types.h b/include/wine/wined3d_types.h index 8b72a7b..50189a7 100644 --- a/include/wine/wined3d_types.h +++ b/include/wine/wined3d_types.h @@ -547,6 +547,14 @@ typedef enum _WINED3DSTENCILOP { WINED3DSTENCILOP_FORCE_DWORD = 0x7fffffff } WINED3DSTENCILOP;
+typedef enum _WINED3DMATERIALCOLORSOURCE { + WINED3DMCS_MATERIAL = 0, + WINED3DMCS_COLOR1 = 1, + WINED3DMCS_COLOR2 = 2, + + WINED3DMCS_FORCE_DWORD = 0x7fffffff +} WINED3DMATERIALCOLORSOURCE; + typedef struct _WINED3DDISPLAYMODE { UINT Width; UINT Height;
-
Alexandre Julliard