xgl: Impossible to expose multi-function queues

Bug: 13363
header version: r29597 (0.51.0)
included review feedback.
diff --git a/layers/draw_state.cpp b/layers/draw_state.cpp
index 9dbabae9..97e31fe 100644
--- a/layers/draw_state.cpp
+++ b/layers/draw_state.cpp
@@ -1032,11 +1032,11 @@
         }
         // Reset CB state
         XGL_FLAGS saveFlags = pCB->flags;
-        XGL_QUEUE_TYPE saveQT = pCB->queueType;
+        uint32_t saveQueueNodeIndex = pCB->queueNodeIndex;
         memset(pCB, 0, sizeof(GLOBAL_CB_NODE));
         pCB->cmdBuffer = cb;
         pCB->flags = saveFlags;
-        pCB->queueType = saveQT;
+        pCB->queueNodeIndex = saveQueueNodeIndex;
         pCB->lastVtxBinding = MAX_BINDING;
     }
 }
@@ -1873,7 +1873,7 @@
         memset(pCB, 0, sizeof(GLOBAL_CB_NODE));
         pCB->cmdBuffer = *pCmdBuffer;
         pCB->flags = pCreateInfo->flags;
-        pCB->queueType = pCreateInfo->queueType;
+        pCB->queueNodeIndex = pCreateInfo->queueNodeIndex;
         pCB->lastVtxBinding = MAX_BINDING;
         cmdBufferMap[*pCmdBuffer] = pCB;
         loader_platform_thread_unlock_mutex(&globalLock);