H. Verbeet : wined3d: Remove some redundant code in IWineD3DVertexBufferImpl_FindDecl().

Alexandre Julliard julliard at wine.codeweavers.com
Tue Mar 13 07:56:03 CDT 2007


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

Author: H. Verbeet <hverbeet at gmail.com>
Date:   Mon Mar 12 23:22:22 2007 +0100

wined3d: Remove some redundant code in IWineD3DVertexBufferImpl_FindDecl().

---

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

diff --git a/dlls/wined3d/vertexbuffer.c b/dlls/wined3d/vertexbuffer.c
index 63b381a..e832439 100644
--- a/dlls/wined3d/vertexbuffer.c
+++ b/dlls/wined3d/vertexbuffer.c
@@ -172,7 +172,6 @@ inline BOOL WINAPI IWineD3DVertexBufferImpl_FindDecl(IWineD3DVertexBufferImpl *T
         return FALSE;
     }
 
-    memset(&strided, 0, sizeof(strided));
     /* There are certain vertex data types that need to be fixed up. The Vertex Buffers FVF doesn't
      * help finding them, only the vertex declaration or the device FVF can determine that at drawPrim
      * time. Rules are as follows:
@@ -211,12 +210,6 @@ inline BOOL WINAPI IWineD3DVertexBufferImpl_FindDecl(IWineD3DVertexBufferImpl *T
         if(strided.u.s.position2.VBO != This->vbo)   memset(&strided.u.s.position2, 0, sizeof(strided.u.s.position2));
     }
 
-    /* Filter out data that does not come from this VBO */
-    if(strided.u.s.position.VBO != This->vbo)    memset(&strided.u.s.position, 0, sizeof(strided.u.s.position));
-    if(strided.u.s.diffuse.VBO != This->vbo)     memset(&strided.u.s.diffuse, 0, sizeof(strided.u.s.diffuse));
-    if(strided.u.s.specular.VBO != This->vbo)    memset(&strided.u.s.specular, 0, sizeof(strided.u.s.specular));
-    if(strided.u.s.position2.VBO != This->vbo)   memset(&strided.u.s.position2, 0, sizeof(strided.u.s.position2));
-
     /* We have a declaration now in the buffer */
     This->Flags |= VBFLAG_HASDESC;
 




More information about the wine-cvs mailing list