Rico Schüller : ddraw: Fix diffuse and specular color types.

Alexandre Julliard julliard at winehq.org
Thu Mar 6 11:08:35 CST 2008


Module: wine
Branch: master
Commit: 4188af790ab718c4b224163780cd917d13f9d6b5
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=4188af790ab718c4b224163780cd917d13f9d6b5

Author: Rico Schüller <kgbricola at web.de>
Date:   Wed Mar  5 22:23:13 2008 +0100

ddraw: Fix diffuse and specular color types.

---

 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 eed378b..62aa9ba 100644
--- a/dlls/ddraw/device.c
+++ b/dlls/ddraw/device.c
@@ -3708,14 +3708,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++)
@@ -3857,14 +3857,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++)




More information about the wine-cvs mailing list