From 0dd13f2cb74a7c965e4865007c1e1126b8a3d42a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Stefan=20D=C3=B6singer?= Date: Wed, 12 Jul 2006 00:04:28 +0200 Subject: [PATCH] wined3d: Check the color data type too when deciding whether to convert data. --- dlls/wined3d/vertexbuffer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/vertexbuffer.c b/dlls/wined3d/vertexbuffer.c index 35a4d9e81fe..9317b4cd473 100644 --- a/dlls/wined3d/vertexbuffer.c +++ b/dlls/wined3d/vertexbuffer.c @@ -198,8 +198,8 @@ static void WINAPI IWineD3DVertexBufferImpl_PreLoad(IWineD3DVertexBuffer *if /* 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; -- 2.11.4.GIT