Stefan Dösinger : wined3d: Use unload instead of duplicating buffer remove code.

[Alexandre Julliard]

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

Author: Stefan Dösinger 
Date:   Thu Dec 17 18:32:41 2009 +0100

wined3d: Use unload instead of duplicating buffer remove code.

---

dlls/wined3d/buffer.c |    8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c
index e24546c..b26f37d 100644
--- a/dlls/wined3d/buffer.c
+++ b/dlls/wined3d/buffer.c
@@ -742,12 +742,8 @@ static void STDMETHODCALLTYPE buffer_PreLoad(IWineD3DBuffer *iface)
         {
             FIXME("Too many declaration changes, stopping converting\n");

-            ENTER_GL();
-            GL_EXTCALL(glDeleteBuffersARB(1, &This->buffer_object));
-            checkGLcall("glDeleteBuffersARB");
-            LEAVE_GL();
-            This->buffer_object = 0;
-            HeapFree(GetProcessHeap(), 0, This->conversion_shift);
+            IWineD3DBuffer_UnLoad(iface);
+            This->flags &= ~WINED3D_BUFFER_CREATEBO;

/* The stream source state handler might have read the memory of the vertex buffer already
              * and got the memory in the vbo which is not valid any longer. Dirtify the stream source