layers: Correctly set last bound PSO in DrawState layer

diff --git a/layers/draw_state.c b/layers/draw_state.c
index 8ddacd1..233c90e 100644 (file)
--- a/layers/draw_state.c
+++ b/layers/draw_state.c
@@ -2525,13 +2525,14 @@ XGL_LAYER_EXPORT void XGLAPI xglCmdBindPipeline(XGL_CMD_BUFFER cmdBuffer, XGL_PI
     GLOBAL_CB_NODE* pCB = getCBNode(cmdBuffer);
     if (pCB) {
         updateCBTracking(cmdBuffer);
-        loader_platform_thread_lock_mutex(&globalLock);
-        g_lastBoundPipeline = cmdBuffer;
-        loader_platform_thread_unlock_mutex(&globalLock);
         drawStateDumpDotFile("pipeline_diagram.dot");
         addCmd(pCB, CMD_BINDPIPELINE);
-        if (getPipeline(pipeline)) {
+        PIPELINE_NODE* pPN = getPipeline(pipeline);
+        if (pPN) {
             pCB->lastBoundPipeline = pipeline;
+            loader_platform_thread_lock_mutex(&globalLock);
+            g_lastBoundPipeline = pPN;
+            loader_platform_thread_unlock_mutex(&globalLock);
         }
         else {
             char str[1024];