wined3d: Index buffer creation adjustments.

Index buffer creation changes the bound gl buffer, thus the state has to be dirtified, similar to locking. In an error case the function returned without calling LEAVE_GL().

wined3d: Index buffer creation adjustments.
74d26327 · Stefan Dösinger · Alexandre Julliard · 76ed11e1 · 74d26327
Commit 74d26327 authored Feb 26, 2007 by Stefan Dösinger Committed by Alexandre Julliard Feb 27, 2007
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

device.c dlls/wined3d/device.c +6 -2

No files found.
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -447,6 +447,11 @@ static void CreateIndexBufferVBO(IWineD3DDeviceImpl *This, IWineD3DIndexBufferIm
    GLenum error, glUsage;
    TRACE("Creating VBO for Index Buffer %p\n", object);

+    /* The following code will modify the ELEMENT_ARRAY_BUFFER binding, make sure it is
+     * restored on the next draw
+     */
+    IWineD3DDeviceImpl_MarkStateDirty(This, STATE_INDEXBUFFER);
+
    ENTER_GL();
    while(glGetError());

@@ -454,8 +459,7 @@ static void CreateIndexBufferVBO(IWineD3DDeviceImpl *This, IWineD3DIndexBufferIm
    error = glGetError();
    if(error != GL_NO_ERROR || object->vbo == 0) {
        ERR("Creating a vbo failed, continueing without vbo for this buffer\n");
-        object->vbo = 0;
-        return;
+        goto out;
    }

    GL_EXTCALL(glBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, object->vbo));