wined3d: Vertex declaration recording state.

Stop SetVertexDeclaration from reference counting if a stateblock is being recorded.

wined3d: Vertex declaration recording state.
74e28a35 · Oliver Stieber · Alexandre Julliard · 13b99231 · 74e28a35
Commit 74e28a35 authored Dec 16, 2005 by Oliver Stieber Committed by Alexandre Julliard Dec 16, 2005
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 4 deletions

device.c dlls/wined3d/device.c +9 -4

No files found.
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -3727,16 +3727,21 @@ HRESULT WINAPI IWineD3DDeviceImpl_SetVertexDeclaration(IWineD3DDevice* iface, IW

    TRACE("(%p) : pDecl=%p\n", This, pDecl);

-    /* TODO: what about recording stateblocks? */
+    This->updateStateBlock->vertexDecl = pDecl;
+    This->updateStateBlock->changed.vertexDecl = TRUE;
+    This->updateStateBlock->set.vertexDecl = TRUE;
+
+    if (This->isRecordingState) {
+        TRACE("Recording... not performing anything\n");
+        return D3D_OK;
+    }
+
    if (NULL != pDecl) {
        IWineD3DVertexDeclaration_AddRef(pDecl);
    }
    if (NULL != This->updateStateBlock->vertexDecl) {
      IWineD3DVertexDeclaration_Release(This->updateStateBlock->vertexDecl);
    }
-    This->updateStateBlock->vertexDecl = pDecl;
-    This->updateStateBlock->changed.vertexDecl = TRUE;
-    This->updateStateBlock->set.vertexDecl = TRUE;
    return D3D_OK;
 }