Stefan Dösinger : wined3d: Check the color data type too when deciding whether to convert data.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 0dd13f2cb74a7c965e4865007c1e1126b8a3d42a
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=0dd13f2cb74a7c965e486500...

Author: Stefan Dösinger <stefan(a)codeweavers.com>
Date:   Wed Jul 12 00:04:28 2006 +0200

wined3d: Check the color data type too when deciding whether to convert data.

---

 dlls/wined3d/vertexbuffer.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/wined3d/vertexbuffer.c b/dlls/wined3d/vertexbuffer.c
index 35a4d9e..9317b4c 100644
--- a/dlls/wined3d/vertexbuffer.c
+++ b/dlls/wined3d/vertexbuffer.c
@@ -198,8 +198,8 @@ static void     WINAPI IWineD3DVertexBuf
             /* If any data that needs conversion has changed we have to reload the whole buffer */
             if( ( (This->strided.u.s.position_transformed || strided.u.s.position_transformed) &&
                   This->strided.u.s.position.lpData != strided.u.s.position.lpData) ||
-                !(This->strided.u.s.diffuse.lpData == strided.u.s.diffuse.lpData || strided.u.s.diffuse.VBO != This->vbo)   ||
-                !(This->strided.u.s.specular.lpData == strided.u.s.specular.lpData || strided.u.s.specular.VBO != This->vbo) ) {
+                !((This->strided.u.s.diffuse.lpData == strided.u.s.diffuse.lpData && This->strided.u.s.diffuse.dwType == strided.u.s.diffuse.dwType) || strided.u.s.diffuse.VBO != This->vbo)   ||
+                !((This->strided.u.s.specular.lpData == strided.u.s.specular.lpData && This->strided.u.s.specular.dwType == strided.u.s.specular.dwType)|| strided.u.s.specular.VBO != This->vbo) ) {
 
                 start = 0;
                 end = This->resource.size;