wined3d: Restore the index buffer when switching from UP to buffer drawing.

The state handler binds index buffer 0 when a user pointer is used. Likewise the real index buffer has to be restored when switching back to drawing from index buffers.

wined3d: Restore the index buffer when switching from UP to buffer drawing.
850bd7b4 · Stefan Dösinger · Alexandre Julliard · 39fb7839 · 850bd7b4
Commit 850bd7b4 authored Mar 10, 2007 by Stefan Dösinger Committed by Alexandre Julliard Mar 12, 2007
Show whitespace changes
Inline Side-by-side

Showing with 10 additions and 2 deletions

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

No files found.
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -4250,12 +4250,17 @@ static HRESULT WINAPI IWineD3DDeviceImpl_DrawPrimitive(IWineD3DDevice *iface, WI
                                                UINT PrimitiveCount) {
    IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface;
-    This->stateBlock->streamIsUP = FALSE;
    TRACE("(%p) : Type=(%d,%s), Start=%d, Count=%d\n", This, PrimitiveType,
                               debug_d3dprimitivetype(PrimitiveType),
                               StartVertex, PrimitiveCount);
+    /* The index buffer is not needed here, but restore it, otherwise it is hell to keep track of */
+    if(This->stateBlock->streamIsUP) {
+        IWineD3DDeviceImpl_MarkStateDirty(This, STATE_INDEXBUFFER);
+        This->stateBlock->streamIsUP = FALSE;
+    }
    if(This->stateBlock->loadBaseVertexIndex != 0) {
        This->stateBlock->loadBaseVertexIndex = 0;
        IWineD3DDeviceImpl_MarkStateDirty(This, STATE_STREAMSRC);
@@ -4277,8 +4282,11 @@ static HRESULT  WINAPI  IWineD3DDeviceImpl_DrawIndexedPrimitive(IWineD3DDevice *
    WINED3DINDEXBUFFER_DESC  IdxBufDsc;
    GLuint vbo;
-    pIB = This->stateBlock->pIndexData;
+    if(This->stateBlock->streamIsUP) {
+        IWineD3DDeviceImpl_MarkStateDirty(This, STATE_INDEXBUFFER);
        This->stateBlock->streamIsUP = FALSE;
+    }
+    pIB = This->stateBlock->pIndexData;
    vbo = ((IWineD3DIndexBufferImpl *) pIB)->vbo;
    TRACE("(%p) : Type=(%d,%s), min=%d, CountV=%d, startIdx=%d, countP=%d\n", This,