From 84a7eee8fb6743dfe1533c0c7109ba8a8f5f8b65 Mon Sep 17 00:00:00 2001
From: Tobin Ehlis <tobin@lunarg.com>
Date: Mon, 2 Mar 2015 16:09:15 -0700
Subject: [PATCH] layers: Update last global DS in DrawState when
 UpdateDescriptors is called

---
 layers/draw_state.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/layers/draw_state.c b/layers/draw_state.c
index 87c2b14..8ddacd1 100644
--- a/layers/draw_state.c
+++ b/layers/draw_state.c
@@ -920,6 +920,7 @@ static void dsUpdate(XGL_DESCRIPTOR_SET ds, GENERIC_HEADER* pUpdateChain)
 {
     SET_NODE* pSet = getSetNode(ds);
     loader_platform_thread_lock_mutex(&globalLock);
+    g_lastBoundDescriptorSet = pSet->set;
     LAYOUT_NODE* pLayout = NULL;
     XGL_DESCRIPTOR_SET_LAYOUT_CREATE_INFO* pLayoutCI = NULL;
     // TODO : If pCIList is NULL, flag error
@@ -1337,11 +1338,11 @@ static void dsCoreDumpDot(const XGL_DESCRIPTOR_SET ds, FILE* pOutFile)
         }
         if (pSet->ppDescriptors) {
             //void* pDesc = NULL;
-            fprintf(pOutFile, "\"DESCRIPTORS\" [\nlabel=<<TABLE BORDER=\"0\" CELLBORDER=\"1\" CELLSPACING=\"0\"> <TR><TD PORT=\"desc\">DESCRIPTORS</TD></TR>");
+            fprintf(pOutFile, "\"DESCRIPTORS\" [\nlabel=<<TABLE BORDER=\"0\" CELLBORDER=\"1\" CELLSPACING=\"0\"> <TR><TD COLSPAN=\"2\" PORT=\"desc\">DESCRIPTORS</TD></TR>");
             uint32_t i = 0;
             for (i=0; i < pSet->descriptorCount; i++) {
                 if (pSet->ppDescriptors[i]) {
-                    fprintf(pOutFile, "<TR><TD PORT=\"slot%u\">slot%u</TD></TR>", i, i);
+                    fprintf(pOutFile, "<TR><TD PORT=\"slot%u\">slot%u</TD><TD>%s</TD></TR>", i, i, string_XGL_STRUCTURE_TYPE(pSet->ppDescriptors[i]->sType));
                 }
             }
 #define NUM_COLORS 7
-- 
2.7.4