Module: wine Branch: master Commit: 8c758a62e85c68e71d7aa939833bc49d221bacf2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c758a62e85c68e71d7aa93983...
Author: Stefan Dösinger stefan@codeweavers.com Date: Fri Feb 15 20:02:07 2008 +0100
wined3d: Remove VBFLAG_LOAD.
---
dlls/wined3d/vertexbuffer.c | 4 ---- dlls/wined3d/wined3d_private.h | 9 ++++----- 2 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/dlls/wined3d/vertexbuffer.c b/dlls/wined3d/vertexbuffer.c index 93d3c55..b99fc43 100644 --- a/dlls/wined3d/vertexbuffer.c +++ b/dlls/wined3d/vertexbuffer.c @@ -499,10 +499,6 @@ static void WINAPI IWineD3DVertexBufferImpl_PreLoad(IWineD3DVertexBuffer *if int i, j; TRACE("(%p)->()\n", This);
- if(This->Flags & VBFLAG_LOAD) { - return; /* Already doing that stuff */ - } - if(!This->vbo) { /* TODO: Make converting independent from VBOs */ if(This->Flags & VBFLAG_CREATEVBO) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 96a80fa..1071871 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -951,11 +951,10 @@ typedef struct IWineD3DVertexBufferImpl
extern const IWineD3DVertexBufferVtbl IWineD3DVertexBuffer_Vtbl;
-#define VBFLAG_LOAD 0x01 /* Data is written from allocatedMemory to the VBO */ -#define VBFLAG_OPTIMIZED 0x02 /* Optimize has been called for the VB */ -#define VBFLAG_DIRTY 0x04 /* Buffer data has been modified */ -#define VBFLAG_HASDESC 0x08 /* A vertex description has been found */ -#define VBFLAG_CREATEVBO 0x10 /* Attempt to create a VBO next PreLoad */ +#define VBFLAG_OPTIMIZED 0x01 /* Optimize has been called for the VB */ +#define VBFLAG_DIRTY 0x02 /* Buffer data has been modified */ +#define VBFLAG_HASDESC 0x04 /* A vertex description has been found */ +#define VBFLAG_CREATEVBO 0x08 /* Attempt to create a VBO next PreLoad */
/***************************************************************************** * IWineD3DIndexBuffer implementation structure (extends IWineD3DResourceImpl)