[PATCH] ddraw: Fix diffuse and specular color types
Rico Schüller
kgbricola at web.de
Wed Mar 5 15:23:13 CST 2008
---
dlls/ddraw/device.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c
index b60b6f3..4d2d23b 100644
--- a/dlls/ddraw/device.c
+++ b/dlls/ddraw/device.c
@@ -3701,14 +3701,14 @@ IDirect3DDeviceImpl_7_DrawPrimitiveStrided(IDirect3DDevice7 *iface,
{
WineD3DStrided.u.s.diffuse.lpData = D3DDrawPrimStrideData->diffuse.lpvData;
WineD3DStrided.u.s.diffuse.dwStride = D3DDrawPrimStrideData->diffuse.dwStride;
- WineD3DStrided.u.s.diffuse.dwType = WINED3DDECLTYPE_SHORT4;
+ WineD3DStrided.u.s.diffuse.dwType = WINED3DDECLTYPE_D3DCOLOR;
}
if(VertexType & D3DFVF_SPECULAR)
{
WineD3DStrided.u.s.specular.lpData = D3DDrawPrimStrideData->specular.lpvData;
WineD3DStrided.u.s.specular.dwStride = D3DDrawPrimStrideData->specular.dwStride;
- WineD3DStrided.u.s.specular.dwType = WINED3DDECLTYPE_SHORT4;
+ WineD3DStrided.u.s.specular.dwType = WINED3DDECLTYPE_D3DCOLOR;
}
for( i = 0; i < GET_TEXCOUNT_FROM_FVF(VertexType); i++)
@@ -3850,14 +3850,14 @@ IDirect3DDeviceImpl_7_DrawIndexedPrimitiveStrided(IDirect3DDevice7 *iface,
{
WineD3DStrided.u.s.diffuse.lpData = D3DDrawPrimStrideData->diffuse.lpvData;
WineD3DStrided.u.s.diffuse.dwStride = D3DDrawPrimStrideData->diffuse.dwStride;
- WineD3DStrided.u.s.diffuse.dwType = WINED3DDECLTYPE_SHORT4;
+ WineD3DStrided.u.s.diffuse.dwType = WINED3DDECLTYPE_D3DCOLOR;
}
if(VertexType & D3DFVF_SPECULAR)
{
WineD3DStrided.u.s.specular.lpData = D3DDrawPrimStrideData->specular.lpvData;
WineD3DStrided.u.s.specular.dwStride = D3DDrawPrimStrideData->specular.dwStride;
- WineD3DStrided.u.s.specular.dwType = WINED3DDECLTYPE_SHORT4;
+ WineD3DStrided.u.s.specular.dwType = WINED3DDECLTYPE_D3DCOLOR;
}
for( i = 0; i < GET_TEXCOUNT_FROM_FVF(VertexType); i++)
--
1.5.3.3
--------------070600020007070100090805--
More information about the wine-patches
mailing list