layers: DrawState changes to support resource binding updates
diff --git a/layers/draw_state.c b/layers/draw_state.c
deleted file mode 100644
index 5148be8..0000000
--- a/layers/draw_state.c
+++ /dev/null
@@ -1,2971 +0,0 @@
-/*
- * XGL
- *
- * Copyright (C) 2014 LunarG, Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "loader_platform.h"
-#include "xgl_dispatch_table_helper.h"
-#include "xgl_struct_string_helper.h"
-#include "xgl_struct_graphviz_helper.h"
-#include "xgl_struct_size_helper.h"
-#include "draw_state.h"
-#include "layers_config.h"
-// The following is #included again to catch certain OS-specific functions
-// being used:
-#include "loader_platform.h"
-#include "layers_msg.h"
-
-static XGL_LAYER_DISPATCH_TABLE nextTable;
-static XGL_BASE_LAYER_OBJECT *pCurObj;
-static LOADER_PLATFORM_THREAD_ONCE_DECLARATION(g_initOnce);
-// TODO : This can be much smarter, using separate locks for separate global data
-static int globalLockInitialized = 0;
-static loader_platform_thread_mutex globalLock;
-#define ALLOC_DEBUG 0
-#if ALLOC_DEBUG
-static uint64_t g_alloc_count = 0;
-static uint64_t g_free_count = 0;
-#endif
-#define MAX_TID 513
-static loader_platform_thread_id g_tidMapping[MAX_TID] = {0};
-static uint32_t g_maxTID = 0;
-// Map actual TID to an index value and return that index
-// This keeps TIDs in range from 0-MAX_TID and simplifies compares between runs
-static uint32_t getTIDIndex() {
- loader_platform_thread_id tid = loader_platform_get_thread_id();
- for (uint32_t i = 0; i < g_maxTID; i++) {
- if (tid == g_tidMapping[i])
- return i;
- }
- // Don't yet have mapping, set it and return newly set index
- uint32_t retVal = (uint32_t) g_maxTID;
- g_tidMapping[g_maxTID++] = tid;
- assert(g_maxTID < MAX_TID);
- return retVal;
-}
-// Return a string representation of CMD_TYPE enum
-static char* cmdTypeToString(CMD_TYPE cmd)
-{
- switch (cmd)
- {
- case CMD_BINDPIPELINE:
- return "CMD_BINDPIPELINE";
- case CMD_BINDPIPELINEDELTA:
- return "CMD_BINDPIPELINEDELTA";
- case CMD_BINDDYNAMICSTATEOBJECT:
- return "CMD_BINDDYNAMICSTATEOBJECT";
- case CMD_BINDDESCRIPTORSET:
- return "CMD_BINDDESCRIPTORSET";
- case CMD_BINDINDEXBUFFER:
- return "CMD_BINDINDEXBUFFER";
- case CMD_BINDVERTEXBUFFER:
- return "CMD_BINDVERTEXBUFFER";
- case CMD_DRAW:
- return "CMD_DRAW";
- case CMD_DRAWINDEXED:
- return "CMD_DRAWINDEXED";
- case CMD_DRAWINDIRECT:
- return "CMD_DRAWINDIRECT";
- case CMD_DRAWINDEXEDINDIRECT:
- return "CMD_DRAWINDEXEDINDIRECT";
- case CMD_DISPATCH:
- return "CMD_DISPATCH";
- case CMD_DISPATCHINDIRECT:
- return "CMD_DISPATCHINDIRECT";
- case CMD_COPYBUFFER:
- return "CMD_COPYBUFFER";
- case CMD_COPYIMAGE:
- return "CMD_COPYIMAGE";
- case CMD_COPYBUFFERTOIMAGE:
- return "CMD_COPYBUFFERTOIMAGE";
- case CMD_COPYIMAGETOBUFFER:
- return "CMD_COPYIMAGETOBUFFER";
- case CMD_CLONEIMAGEDATA:
- return "CMD_CLONEIMAGEDATA";
- case CMD_UPDATEBUFFER:
- return "CMD_UPDATEBUFFER";
- case CMD_FILLBUFFER:
- return "CMD_FILLBUFFER";
- case CMD_CLEARCOLORIMAGE:
- return "CMD_CLEARCOLORIMAGE";
- case CMD_CLEARCOLORIMAGERAW:
- return "CMD_CLEARCOLORIMAGERAW";
- case CMD_CLEARDEPTHSTENCIL:
- return "CMD_CLEARDEPTHSTENCIL";
- case CMD_RESOLVEIMAGE:
- return "CMD_RESOLVEIMAGE";
- case CMD_SETEVENT:
- return "CMD_SETEVENT";
- case CMD_RESETEVENT:
- return "CMD_RESETEVENT";
- case CMD_WAITEVENTS:
- return "CMD_WAITEVENTS";
- case CMD_PIPELINEBARRIER:
- return "CMD_PIPELINEBARRIER";
- case CMD_BEGINQUERY:
- return "CMD_BEGINQUERY";
- case CMD_ENDQUERY:
- return "CMD_ENDQUERY";
- case CMD_RESETQUERYPOOL:
- return "CMD_RESETQUERYPOOL";
- case CMD_WRITETIMESTAMP:
- return "CMD_WRITETIMESTAMP";
- case CMD_INITATOMICCOUNTERS:
- return "CMD_INITATOMICCOUNTERS";
- case CMD_LOADATOMICCOUNTERS:
- return "CMD_LOADATOMICCOUNTERS";
- case CMD_SAVEATOMICCOUNTERS:
- return "CMD_SAVEATOMICCOUNTERS";
- case CMD_BEGINRENDERPASS:
- return "CMD_BEGINRENDERPASS";
- case CMD_ENDRENDERPASS:
- return "CMD_ENDRENDERPASS";
- case CMD_DBGMARKERBEGIN:
- return "CMD_DBGMARKERBEGIN";
- case CMD_DBGMARKEREND:
- return "CMD_DBGMARKEREND";
- default:
- return "UNKNOWN";
- }
-}
-// Block of code at start here for managing/tracking Pipeline state that this layer cares about
-// Just track 2 shaders for now
-#define XGL_NUM_GRAPHICS_SHADERS XGL_SHADER_STAGE_COMPUTE
-#define MAX_SLOTS 2048
-#define NUM_COMMAND_BUFFERS_TO_DISPLAY 10
-
-static uint64_t g_drawCount[NUM_DRAW_TYPES] = {0, 0, 0, 0};
-
-// TODO : Should be tracking lastBound per cmdBuffer and when draws occur, report based on that cmd buffer lastBound
-// Then need to synchronize the accesses based on cmd buffer so that if I'm reading state on one cmd buffer, updates
-// to that same cmd buffer by separate thread are not changing state from underneath us
-static PIPELINE_NODE* g_pPipelineHead = NULL;
-static SAMPLER_NODE* g_pSamplerHead = NULL;
-static IMAGE_NODE* g_pImageHead = NULL;
-static BUFFER_NODE* g_pBufferHead = NULL;
-static GLOBAL_CB_NODE* g_pCmdBufferHead = NULL;
-// Track the last cmd buffer touched by this thread
-static XGL_CMD_BUFFER g_lastCmdBuffer[MAX_TID] = {NULL};
-// Track the last group of CBs touched for displaying to dot file
-static GLOBAL_CB_NODE* g_pLastTouchedCB[NUM_COMMAND_BUFFERS_TO_DISPLAY] = {NULL};
-static uint32_t g_lastTouchedCBIndex = 0;
-// Track the last global DrawState of interest touched by any thread
-static GLOBAL_CB_NODE* g_lastGlobalCB = NULL;
-static PIPELINE_NODE* g_lastBoundPipeline = NULL;
-static DYNAMIC_STATE_NODE* g_lastBoundDynamicState[XGL_NUM_STATE_BIND_POINT] = {NULL};
-static XGL_DESCRIPTOR_SET g_lastBoundDescriptorSet = NULL;
-#define MAX_BINDING 0xFFFFFFFF // Default vtxBinding value in CB Node to identify if no vtxBinding set
-
-static DYNAMIC_STATE_NODE* g_pDynamicStateHead[XGL_NUM_STATE_BIND_POINT] = {0};
-
-static void insertDynamicState(const XGL_DYNAMIC_STATE_OBJECT state, const GENERIC_HEADER* pCreateInfo, XGL_STATE_BIND_POINT bindPoint)
-{
- loader_platform_thread_lock_mutex(&globalLock);
- // Insert new node at head of appropriate LL
- DYNAMIC_STATE_NODE* pStateNode = (DYNAMIC_STATE_NODE*)malloc(sizeof(DYNAMIC_STATE_NODE));
-#if ALLOC_DEBUG
- printf("Alloc1 #%lu pStateNode addr(%p)\n", ++g_alloc_count, (void*)pStateNode);
-#endif
- pStateNode->pNext = g_pDynamicStateHead[bindPoint];
- g_pDynamicStateHead[bindPoint] = pStateNode;
- pStateNode->stateObj = state;
- pStateNode->pCreateInfo = (GENERIC_HEADER*)malloc(get_dynamic_struct_size(pCreateInfo));
-#if ALLOC_DEBUG
- printf("Alloc2 #%lu pStateNode->pCreateInfo addr(%p)\n", ++g_alloc_count, (void*)pStateNode->pCreateInfo);
-#endif
- memcpy(pStateNode->pCreateInfo, pCreateInfo, get_dynamic_struct_size(pCreateInfo));
- // VP has embedded ptr so need to handle that as special case
- if (XGL_STRUCTURE_TYPE_DYNAMIC_VP_STATE_CREATE_INFO == pCreateInfo->sType) {
- XGL_DYNAMIC_VP_STATE_CREATE_INFO* pVPCI = (XGL_DYNAMIC_VP_STATE_CREATE_INFO*)pStateNode->pCreateInfo;
- XGL_VIEWPORT** ppViewports = (XGL_VIEWPORT**)&pVPCI->pViewports;
- size_t vpSize = sizeof(XGL_VIEWPORT) * pVPCI->viewportAndScissorCount;
- if (vpSize) {
- *ppViewports = (XGL_VIEWPORT*)malloc(vpSize);
-#if ALLOC_DEBUG
- printf("Alloc3 #%lu *ppViewports addr(%p)\n", ++g_alloc_count, (void*)*ppViewports);
-#endif
- memcpy(*ppViewports, ((XGL_DYNAMIC_VP_STATE_CREATE_INFO*)pCreateInfo)->pViewports, vpSize);
- }
- XGL_RECT** ppScissors = (XGL_RECT**)&pVPCI->pScissors;
- size_t scSize = sizeof(XGL_RECT) * pVPCI->viewportAndScissorCount;
- if (scSize) {
- *ppScissors = (XGL_RECT*)malloc(scSize);
-#if ALLOC_DEBUG
- printf("Alloc4 #%lu *ppScissors addr(%p)\n", ++g_alloc_count, (void*)*ppScissors);
-#endif
- memcpy(*ppScissors, ((XGL_DYNAMIC_VP_STATE_CREATE_INFO*)pCreateInfo)->pScissors, scSize);
- }
- }
- loader_platform_thread_unlock_mutex(&globalLock);
-}
-// Free all allocated nodes for Dynamic State objs
-static void freeDynamicState()
-{
- for (uint32_t i = 0; i < XGL_NUM_STATE_BIND_POINT; i++) {
- DYNAMIC_STATE_NODE* pStateNode = g_pDynamicStateHead[i];
- DYNAMIC_STATE_NODE* pFreeMe = pStateNode;
- while (pStateNode) {
- pFreeMe = pStateNode;
- pStateNode = pStateNode->pNext;
- assert(pFreeMe->pCreateInfo);
- if (XGL_STRUCTURE_TYPE_DYNAMIC_VP_STATE_CREATE_INFO == pFreeMe->pCreateInfo->sType) {
- XGL_DYNAMIC_VP_STATE_CREATE_INFO* pVPCI = (XGL_DYNAMIC_VP_STATE_CREATE_INFO*)pFreeMe->pCreateInfo;
- if (pVPCI->pViewports) {
- void** ppToFree = (void**)&pVPCI->pViewports;
-#if ALLOC_DEBUG
- printf("Free3 #%lu pViewports addr(%p)\n", ++g_free_count, (void*)*ppToFree);
-#endif
- free(*ppToFree);
- }
- if (pVPCI->pScissors) {
- void** ppToFree = (void**)&pVPCI->pScissors;
-#if ALLOC_DEBUG
- printf("Free4 #%lu pScissors addr(%p)\n", ++g_free_count, (void*)*ppToFree);
-#endif
- free(*ppToFree);
- }
- }
-#if ALLOC_DEBUG
- printf("Free2 #%lu pStateNode->CreateInfo addr(%p)\n", ++g_free_count, (void*)pFreeMe->pCreateInfo);
-#endif
- free(pFreeMe->pCreateInfo);
-#if ALLOC_DEBUG
- printf("Free1 #%lu pStateNode addr(%p)\n", ++g_free_count, (void*)pFreeMe);
-#endif
- free(pFreeMe);
- }
- g_pDynamicStateHead[i] = NULL;
- }
-}
-// Free all sampler nodes
-static void freeSamplers()
-{
- SAMPLER_NODE* pSampler = g_pSamplerHead;
- SAMPLER_NODE* pFreeMe = pSampler;
- while (pSampler) {
- pFreeMe = pSampler;
- pSampler = pSampler->pNext;
-#if ALLOC_DEBUG
- printf("Free25 #%lu pSampler addr(%p)\n", ++g_free_count, (void*)pFreeMe);
-#endif
- free(pFreeMe);
- }
- g_pSamplerHead = NULL;
-}
-static XGL_IMAGE_VIEW_CREATE_INFO* getImageViewCreateInfo(XGL_IMAGE_VIEW view)
-{
- loader_platform_thread_lock_mutex(&globalLock);
- IMAGE_NODE* pTrav = g_pImageHead;
- while (pTrav) {
- if (view == pTrav->image) {
- loader_platform_thread_unlock_mutex(&globalLock);
- return &pTrav->createInfo;
- }
- pTrav = pTrav->pNext;
- }
- loader_platform_thread_unlock_mutex(&globalLock);
- return NULL;
-}
-// Free all image nodes
-static void freeImages()
-{
- IMAGE_NODE* pImage = g_pImageHead;
- IMAGE_NODE* pFreeMe = pImage;
- while (pImage) {
- pFreeMe = pImage;
- pImage = pImage->pNext;
-#if ALLOC_DEBUG
- printf("Free22 #%lu pImage addr(%p)\n", ++g_free_count, (void*)pFreeMe);
-#endif
- free(pFreeMe);
- }
- g_pImageHead = NULL;
-}
-static XGL_BUFFER_VIEW_CREATE_INFO* getBufferViewCreateInfo(XGL_BUFFER_VIEW view)
-{
- loader_platform_thread_lock_mutex(&globalLock);
- BUFFER_NODE* pTrav = g_pBufferHead;
- while (pTrav) {
- if (view == pTrav->buffer) {
- loader_platform_thread_unlock_mutex(&globalLock);
- return &pTrav->createInfo;
- }
- pTrav = pTrav->pNext;
- }
- loader_platform_thread_unlock_mutex(&globalLock);
- return NULL;
-}
-// Free all buffer nodes
-static void freeBuffers()
-{
- BUFFER_NODE* pBuffer = g_pBufferHead;
- BUFFER_NODE* pFreeMe = pBuffer;
- while (pBuffer) {
- pFreeMe = pBuffer;
- pBuffer = pBuffer->pNext;
-#if ALLOC_DEBUG
- printf("Free21 #%lu pBuffer addr(%p)\n", ++g_free_count, (void*)pFreeMe);
-#endif
- free(pFreeMe);
- }
- g_pBufferHead = NULL;
-}
-static GLOBAL_CB_NODE* getCBNode(XGL_CMD_BUFFER cb);
-
-static void updateCBTracking(XGL_CMD_BUFFER cb)
-{
- g_lastCmdBuffer[getTIDIndex()] = cb;
- GLOBAL_CB_NODE* pCB = getCBNode(cb);
- loader_platform_thread_lock_mutex(&globalLock);
- g_lastGlobalCB = pCB;
- // TODO : This is a dumb algorithm. Need smart LRU that drops off oldest
- for (uint32_t i = 0; i < NUM_COMMAND_BUFFERS_TO_DISPLAY; i++) {
- if (g_pLastTouchedCB[i] == pCB) {
- loader_platform_thread_unlock_mutex(&globalLock);
- return;
- }
- }
- g_pLastTouchedCB[g_lastTouchedCBIndex++] = pCB;
- g_lastTouchedCBIndex = g_lastTouchedCBIndex % NUM_COMMAND_BUFFERS_TO_DISPLAY;
- loader_platform_thread_unlock_mutex(&globalLock);
-}
-
-// Print the last bound dynamic state
-static void printDynamicState(const XGL_CMD_BUFFER cb)
-{
- GLOBAL_CB_NODE* pCB = getCBNode(cb);
- if (pCB) {
- loader_platform_thread_lock_mutex(&globalLock);
- char str[4*1024];
- for (uint32_t i = 0; i < XGL_NUM_STATE_BIND_POINT; i++) {
- if (pCB->lastBoundDynamicState[i]) {
- sprintf(str, "Reporting CreateInfo for currently bound %s object %p", string_XGL_STATE_BIND_POINT(i), pCB->lastBoundDynamicState[i]->stateObj);
- layerCbMsg(XGL_DBG_MSG_UNKNOWN, XGL_VALIDATION_LEVEL_0, pCB->lastBoundDynamicState[i]->stateObj, 0, DRAWSTATE_NONE, "DS", str);
- layerCbMsg(XGL_DBG_MSG_UNKNOWN, XGL_VALIDATION_LEVEL_0, pCB->lastBoundDynamicState[i]->stateObj, 0, DRAWSTATE_NONE, "DS", dynamic_display(pCB->lastBoundDynamicState[i]->pCreateInfo, " "));
- break;
- }
- else {
- sprintf(str, "No dynamic state of type %s bound", string_XGL_STATE_BIND_POINT(i));
- layerCbMsg(XGL_DBG_MSG_UNKNOWN, XGL_VALIDATION_LEVEL_0, NULL, 0, DRAWSTATE_NONE, "DS", str);
- }
- }
- loader_platform_thread_unlock_mutex(&globalLock);
- }
- else {
- char str[1024];
- sprintf(str, "Attempt to use CmdBuffer %p that doesn't exist!", (void*)cb);
- layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, cb, 0, DRAWSTATE_INVALID_CMD_BUFFER, "DS", str);
- }
-}
-// Retrieve pipeline node ptr for given pipeline object
-static PIPELINE_NODE *getPipeline(XGL_PIPELINE pipeline)
-{
- loader_platform_thread_lock_mutex(&globalLock);
- PIPELINE_NODE *pTrav = g_pPipelineHead;
- while (pTrav) {
- if (pTrav->pipeline == pipeline) {
- loader_platform_thread_unlock_mutex(&globalLock);
- return pTrav;
- }
- pTrav = pTrav->pNext;
- }
- loader_platform_thread_unlock_mutex(&globalLock);
- return NULL;
-}
-
-// For given sampler, return a ptr to its Create Info struct, or NULL if sampler not found
-static XGL_SAMPLER_CREATE_INFO* getSamplerCreateInfo(const XGL_SAMPLER sampler)
-{
- loader_platform_thread_lock_mutex(&globalLock);
- SAMPLER_NODE *pTrav = g_pSamplerHead;
- while (pTrav) {
- if (sampler == pTrav->sampler) {
- loader_platform_thread_unlock_mutex(&globalLock);
- return &pTrav->createInfo;
- }
- pTrav = pTrav->pNext;
- }
- loader_platform_thread_unlock_mutex(&globalLock);
- return NULL;
-}
-
-// Init the pipeline mapping info based on pipeline create info LL tree
-// Threading note : Calls to this function should wrapped in mutex
-static void initPipeline(PIPELINE_NODE *pPipeline, const XGL_GRAPHICS_PIPELINE_CREATE_INFO* pCreateInfo)
-{
- // First init create info, we'll shadow the structs as we go down the tree
- pPipeline->pCreateTree = (XGL_GRAPHICS_PIPELINE_CREATE_INFO*)malloc(sizeof(XGL_GRAPHICS_PIPELINE_CREATE_INFO));
-#if ALLOC_DEBUG
- printf("Alloc5 #%lu pPipeline->pCreateTree addr(%p)\n", ++g_alloc_count, (void*)pPipeline->pCreateTree);
-#endif
- memcpy(pPipeline->pCreateTree, pCreateInfo, sizeof(XGL_GRAPHICS_PIPELINE_CREATE_INFO));
- GENERIC_HEADER *pShadowTrav = (GENERIC_HEADER*)pPipeline->pCreateTree;
- GENERIC_HEADER *pTrav = (GENERIC_HEADER*)pCreateInfo->pNext;
- while (pTrav) {
- // Shadow the struct
- pShadowTrav->pNext = (GENERIC_HEADER*)malloc(get_dynamic_struct_size(pTrav));
-#if ALLOC_DEBUG
- printf("Alloc6 #%lu pShadowTrav->pNext addr(%p)\n", ++g_alloc_count, (void*)pShadowTrav->pNext);
-#endif
- // Typically pNext is const so have to cast to avoid warning when we modify it here
- memcpy((void*)pShadowTrav->pNext, pTrav, get_dynamic_struct_size(pTrav));
- pShadowTrav = (GENERIC_HEADER*)pShadowTrav->pNext;
- // Special copy of Vtx info as it has embedded array
- if (XGL_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_CREATE_INFO == pTrav->sType) {
- XGL_PIPELINE_VERTEX_INPUT_CREATE_INFO *pVICI = (XGL_PIPELINE_VERTEX_INPUT_CREATE_INFO*)pShadowTrav;
- pPipeline->vtxBindingCount = pVICI->bindingCount;
- uint32_t allocSize = pPipeline->vtxBindingCount * sizeof(XGL_VERTEX_INPUT_BINDING_DESCRIPTION);
- if (allocSize) {
- pPipeline->pVertexBindingDescriptions = (XGL_VERTEX_INPUT_BINDING_DESCRIPTION*)malloc(allocSize);
-#if ALLOC_DEBUG
- printf("Alloc7 #%lu pPipeline->pVertexBindingDescriptions addr(%p)\n", ++g_alloc_count, (void*)pPipeline->pVertexBindingDescriptions);
-#endif
- memcpy(pPipeline->pVertexBindingDescriptions, ((XGL_PIPELINE_VERTEX_INPUT_CREATE_INFO*)pTrav)->pVertexAttributeDescriptions, allocSize);
- }
- pPipeline->vtxAttributeCount = pVICI->attributeCount;
- allocSize = pPipeline->vtxAttributeCount * sizeof(XGL_VERTEX_INPUT_ATTRIBUTE_DESCRIPTION);
- if (allocSize) {
- pPipeline->pVertexAttributeDescriptions = (XGL_VERTEX_INPUT_ATTRIBUTE_DESCRIPTION*)malloc(allocSize);
-#if ALLOC_DEBUG
- printf("Alloc8 #%lu pPipeline->pVertexAttributeDescriptions addr(%p)\n", ++g_alloc_count, (void*)pPipeline->pVertexAttributeDescriptions);
-#endif
- memcpy(pPipeline->pVertexAttributeDescriptions, ((XGL_PIPELINE_VERTEX_INPUT_CREATE_INFO*)pTrav)->pVertexAttributeDescriptions, allocSize);
- }
- }
- else if (XGL_STRUCTURE_TYPE_PIPELINE_CB_STATE_CREATE_INFO == pTrav->sType) {
- // Special copy of CB state as it has embedded array
- XGL_PIPELINE_CB_STATE_CREATE_INFO *pCBCI = (XGL_PIPELINE_CB_STATE_CREATE_INFO*)pShadowTrav;
- pPipeline->attachmentCount = pCBCI->attachmentCount;
- uint32_t allocSize = pPipeline->attachmentCount * sizeof(XGL_PIPELINE_CB_ATTACHMENT_STATE);
- if (allocSize) {
- pPipeline->pAttachments = (XGL_PIPELINE_CB_ATTACHMENT_STATE*)malloc(allocSize);
-#if ALLOC_DEBUG
- printf("Alloc9 #%lu pPipeline->pAttachments addr(%p)\n", ++g_alloc_count, (void*)pPipeline->pAttachments);
-#endif
- XGL_PIPELINE_CB_ATTACHMENT_STATE** ppAttachments = (XGL_PIPELINE_CB_ATTACHMENT_STATE**)&pCBCI->pAttachments;
- *ppAttachments = pPipeline->pAttachments;
- memcpy(pPipeline->pAttachments, ((XGL_PIPELINE_CB_STATE_CREATE_INFO*)pTrav)->pAttachments, allocSize);
- }
- }
- pTrav = (GENERIC_HEADER*)pTrav->pNext;
- }
-}
-// Free the Pipeline nodes
-static void freePipelines()
-{
- PIPELINE_NODE* pPipeline = g_pPipelineHead;
- PIPELINE_NODE* pFreeMe = pPipeline;
- while (pPipeline) {
- pFreeMe = pPipeline;
- GENERIC_HEADER* pShadowTrav = (GENERIC_HEADER*)pPipeline->pCreateTree;
- GENERIC_HEADER* pShadowFree = pShadowTrav;
- while (pShadowTrav) {
- pShadowFree = pShadowTrav;
- pShadowTrav = (GENERIC_HEADER*)pShadowTrav->pNext;
- if (XGL_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_CREATE_INFO == pShadowFree->sType) {
- // Free the vtx data shadowed directly into pPipeline node
- if (pFreeMe->pVertexBindingDescriptions) {
-#if ALLOC_DEBUG
- printf("Free7 #%lu pVertexBindingDescriptions addr(%p)\n", ++g_free_count, (void*)pFreeMe->pVertexBindingDescriptions);
-#endif
- free(pFreeMe->pVertexBindingDescriptions);
- }
- if (pFreeMe->pVertexAttributeDescriptions) {
-#if ALLOC_DEBUG
- printf("Free8 #%lu pVertexAttributeDescriptions addr(%p)\n", ++g_free_count, (void*)pFreeMe->pVertexAttributeDescriptions);
-#endif
- free(pFreeMe->pVertexAttributeDescriptions);
- }
- }
- else if (XGL_STRUCTURE_TYPE_PIPELINE_CB_STATE_CREATE_INFO == pShadowFree->sType) {
- // Free attachment data shadowed into pPipeline node
- if (pFreeMe->pAttachments) {
-#if ALLOC_DEBUG
- printf("Free9 #%lu pAttachments addr(%p)\n", ++g_free_count, (void*)pFreeMe->pAttachments);
-#endif
- free(pFreeMe->pAttachments);
- }
- }
-#if ALLOC_DEBUG
- printf("Free5 & Free6 #%lu pShadowNode addr(%p)\n", ++g_free_count, (void*)pShadowFree);
-#endif
- free(pShadowFree);
- }
- pPipeline = pPipeline->pNext;
-#if ALLOC_DEBUG
- printf("Free23 & Free24 #%lu pPipeline addr(%p)\n", ++g_free_count, (void*)pFreeMe);
-#endif
- free(pFreeMe);
- }
- g_pPipelineHead = NULL;
-}
-// Block of code at start here specifically for managing/tracking DSs
-
-// ptr to HEAD of LL of DS Regions
-static REGION_NODE* g_pRegionHead = NULL;
-// ptr to HEAD of LL of top-level Layouts
-static LAYOUT_NODE* g_pLayoutHead = NULL;
-
-// Return Region node ptr for specified region or else NULL
-static REGION_NODE* getRegionNode(XGL_DESCRIPTOR_REGION region)
-{
- loader_platform_thread_lock_mutex(&globalLock);
- REGION_NODE* pTrav = g_pRegionHead;
- while (pTrav) {
- if (pTrav->region == region) {
- loader_platform_thread_unlock_mutex(&globalLock);
- return pTrav;
- }
- pTrav = pTrav->pNext;
- }
- loader_platform_thread_unlock_mutex(&globalLock);
- return NULL;
-}
-// Return Set node ptr for specified set or else NULL
-static SET_NODE* getSetNode(XGL_DESCRIPTOR_SET set)
-{
- loader_platform_thread_lock_mutex(&globalLock);
- REGION_NODE* pTrav = g_pRegionHead;
- while (pTrav) {
- SET_NODE* pSet = pTrav->pSets;
- while (pSet) {
- if (pSet->set == set) {
- loader_platform_thread_unlock_mutex(&globalLock);
- return pSet;
- }
- pSet = pSet->pNext;
- }
- pTrav = pTrav->pNext;
- }
- loader_platform_thread_unlock_mutex(&globalLock);
- return NULL;
-}
-
-// Return XGL_TRUE if DS Exists and is within an xglBeginDescriptorRegionUpdate() call sequence, otherwise XGL_FALSE
-static bool32_t dsUpdateActive(XGL_DESCRIPTOR_SET ds)
-{
- // Note, both "get" functions use global mutex so this guy does not
- SET_NODE* pTrav = getSetNode(ds);
- if (pTrav) {
- REGION_NODE* pRegion = NULL;
- pRegion = getRegionNode(pTrav->region);
- if (pRegion) {
- return pRegion->updateActive;
- }
- }
- return XGL_FALSE;
-}
-
-static LAYOUT_NODE* getLayoutNode(XGL_DESCRIPTOR_SET_LAYOUT layout) {
- loader_platform_thread_lock_mutex(&globalLock);
- LAYOUT_NODE* pTrav = g_pLayoutHead;
- while (pTrav) {
- if (pTrav->layout == layout) {
- loader_platform_thread_unlock_mutex(&globalLock);
- return pTrav;
- }
- pTrav = pTrav->pNext;
- }
- loader_platform_thread_unlock_mutex(&globalLock);
- return NULL;
-}
-
-static uint32_t getUpdateIndex(GENERIC_HEADER* pUpdateStruct)
-{
- switch (pUpdateStruct->sType)
- {
- case XGL_STRUCTURE_TYPE_UPDATE_SAMPLERS:
- return ((XGL_UPDATE_SAMPLERS*)pUpdateStruct)->index;
- case XGL_STRUCTURE_TYPE_UPDATE_SAMPLER_TEXTURES:
- return ((XGL_UPDATE_SAMPLER_TEXTURES*)pUpdateStruct)->index;
- case XGL_STRUCTURE_TYPE_UPDATE_IMAGES:
- return ((XGL_UPDATE_IMAGES*)pUpdateStruct)->index;
- case XGL_STRUCTURE_TYPE_UPDATE_BUFFERS:
- return ((XGL_UPDATE_BUFFERS*)pUpdateStruct)->index;
- case XGL_STRUCTURE_TYPE_UPDATE_AS_COPY:
- return ((XGL_UPDATE_AS_COPY*)pUpdateStruct)->descriptorIndex;
- default:
- // TODO : Flag specific error for this case
- return 0;
- }
-}
-
-static uint32_t getUpdateUpperBound(GENERIC_HEADER* pUpdateStruct)
-{
- switch (pUpdateStruct->sType)
- {
- case XGL_STRUCTURE_TYPE_UPDATE_SAMPLERS:
- return (((XGL_UPDATE_SAMPLERS*)pUpdateStruct)->count + ((XGL_UPDATE_SAMPLERS*)pUpdateStruct)->index);
- case XGL_STRUCTURE_TYPE_UPDATE_SAMPLER_TEXTURES:
- return (((XGL_UPDATE_SAMPLER_TEXTURES*)pUpdateStruct)->count + ((XGL_UPDATE_SAMPLER_TEXTURES*)pUpdateStruct)->index);
- case XGL_STRUCTURE_TYPE_UPDATE_IMAGES:
- return (((XGL_UPDATE_IMAGES*)pUpdateStruct)->count + ((XGL_UPDATE_IMAGES*)pUpdateStruct)->index);
- case XGL_STRUCTURE_TYPE_UPDATE_BUFFERS:
- return (((XGL_UPDATE_BUFFERS*)pUpdateStruct)->count + ((XGL_UPDATE_BUFFERS*)pUpdateStruct)->index);
- case XGL_STRUCTURE_TYPE_UPDATE_AS_COPY:
- // TODO : Need to understand this case better and make sure code is correct
- return (((XGL_UPDATE_AS_COPY*)pUpdateStruct)->count + ((XGL_UPDATE_AS_COPY*)pUpdateStruct)->descriptorIndex);
- default:
- // TODO : Flag specific error for this case
- return 0;
- }
-}
-
-// Verify that the descriptor type in the update struct matches what's expected by the layout
-static bool32_t validateUpdateType(GENERIC_HEADER* pUpdateStruct, const LAYOUT_NODE* pLayout)//XGL_DESCRIPTOR_TYPE type)
-{
- // First get actual type of update
- XGL_DESCRIPTOR_TYPE actualType;
- uint32_t i = 0;
- uint32_t bound = getUpdateUpperBound(pUpdateStruct);
- switch (pUpdateStruct->sType)
- {
- case XGL_STRUCTURE_TYPE_UPDATE_SAMPLERS:
- actualType = XGL_DESCRIPTOR_TYPE_SAMPLER;
- break;
- case XGL_STRUCTURE_TYPE_UPDATE_SAMPLER_TEXTURES:
- actualType = XGL_DESCRIPTOR_TYPE_SAMPLER_TEXTURE;
- break;
- case XGL_STRUCTURE_TYPE_UPDATE_IMAGES:
- actualType = ((XGL_UPDATE_IMAGES*)pUpdateStruct)->descriptorType;
- break;
- case XGL_STRUCTURE_TYPE_UPDATE_BUFFERS:
- actualType = ((XGL_UPDATE_BUFFERS*)pUpdateStruct)->descriptorType;
- break;
- case XGL_STRUCTURE_TYPE_UPDATE_AS_COPY:
- actualType = ((XGL_UPDATE_AS_COPY*)pUpdateStruct)->descriptorType;
- break;
- default:
- // TODO : Flag specific error for this case
- return 0;
- }
- for (i = getUpdateIndex(pUpdateStruct); i < bound; i++) {
- if (pLayout->pTypes[i] != actualType)
- return 0;
- }
- return 1;
-}
-
-// Verify that update region for this update does not exceed max layout index for this type
-static bool32_t validateUpdateSize(GENERIC_HEADER* pUpdateStruct, uint32_t layoutIdx)
-{
- if ((getUpdateUpperBound(pUpdateStruct)-1) > layoutIdx)
- return 0;
- return 1;
-}
-// Determine the update type, allocate a new struct of that type, shadow the given pUpdate
-// struct into the new struct and return ptr to shadow struct cast as GENERIC_HEADER
-// NOTE : Calls to this function should be wrapped in mutex
-static GENERIC_HEADER* shadowUpdateNode(GENERIC_HEADER* pUpdate)
-{
- GENERIC_HEADER* pNewNode = NULL;
- size_t array_size = 0;
- size_t base_array_size = 0;
- size_t total_array_size = 0;
- size_t baseBuffAddr = 0;
- XGL_UPDATE_BUFFERS* pUBCI;
- XGL_UPDATE_IMAGES* pUICI;
- char str[1024];
- switch (pUpdate->sType)
- {
- case XGL_STRUCTURE_TYPE_UPDATE_SAMPLERS:
- pNewNode = (GENERIC_HEADER*)malloc(sizeof(XGL_UPDATE_SAMPLERS));
-#if ALLOC_DEBUG
- printf("Alloc10 #%lu pNewNode addr(%p)\n", ++g_alloc_count, (void*)pNewNode);
-#endif
- memcpy(pNewNode, pUpdate, sizeof(XGL_UPDATE_SAMPLERS));
- array_size = sizeof(XGL_SAMPLER) * ((XGL_UPDATE_SAMPLERS*)pNewNode)->count;
- ((XGL_UPDATE_SAMPLERS*)pNewNode)->pSamplers = (XGL_SAMPLER*)malloc(array_size);
-#if ALLOC_DEBUG
- printf("Alloc11 #%lu pNewNode->pSamplers addr(%p)\n", ++g_alloc_count, (void*)((XGL_UPDATE_SAMPLERS*)pNewNode)->pSamplers);
-#endif
- memcpy((XGL_SAMPLER*)((XGL_UPDATE_SAMPLERS*)pNewNode)->pSamplers, ((XGL_UPDATE_SAMPLERS*)pUpdate)->pSamplers, array_size);
- break;
- case XGL_STRUCTURE_TYPE_UPDATE_SAMPLER_TEXTURES:
- pNewNode = (GENERIC_HEADER*)malloc(sizeof(XGL_UPDATE_SAMPLER_TEXTURES));
-#if ALLOC_DEBUG
- printf("Alloc12 #%lu pNewNode addr(%p)\n", ++g_alloc_count, (void*)pNewNode);
-#endif
- memcpy(pNewNode, pUpdate, sizeof(XGL_UPDATE_SAMPLER_TEXTURES));
- array_size = sizeof(XGL_SAMPLER_IMAGE_VIEW_INFO) * ((XGL_UPDATE_SAMPLER_TEXTURES*)pNewNode)->count;
- ((XGL_UPDATE_SAMPLER_TEXTURES*)pNewNode)->pSamplerImageViews = (XGL_SAMPLER_IMAGE_VIEW_INFO*)malloc(array_size);
-#if ALLOC_DEBUG
- printf("Alloc13 #%lu pNewNode->pSamplerImageViews addr(%p)\n", ++g_alloc_count, (void*)((XGL_UPDATE_SAMPLER_TEXTURES*)pNewNode)->pSamplerImageViews);
-#endif
- for (uint32_t i = 0; i < ((XGL_UPDATE_SAMPLER_TEXTURES*)pNewNode)->count; i++) {
- memcpy((XGL_SAMPLER_IMAGE_VIEW_INFO*)&((XGL_UPDATE_SAMPLER_TEXTURES*)pNewNode)->pSamplerImageViews[i], &((XGL_UPDATE_SAMPLER_TEXTURES*)pUpdate)->pSamplerImageViews[i], sizeof(XGL_SAMPLER_IMAGE_VIEW_INFO));
- ((XGL_SAMPLER_IMAGE_VIEW_INFO*)((XGL_UPDATE_SAMPLER_TEXTURES*)pNewNode)->pSamplerImageViews)[i].pImageView = malloc(sizeof(XGL_IMAGE_VIEW_ATTACH_INFO));
-#if ALLOC_DEBUG
- printf("Alloc14 #%lu pSamplerImageViews)[%u].pImageView addr(%p)\n", ++g_alloc_count, i, (void*)((XGL_SAMPLER_IMAGE_VIEW_INFO*)((XGL_UPDATE_SAMPLER_TEXTURES*)pNewNode)->pSamplerImageViews)[i].pImageView);
-#endif
- memcpy((XGL_IMAGE_VIEW_ATTACH_INFO*)((XGL_UPDATE_SAMPLER_TEXTURES*)pNewNode)->pSamplerImageViews[i].pImageView, ((XGL_UPDATE_SAMPLER_TEXTURES*)pUpdate)->pSamplerImageViews[i].pImageView, sizeof(XGL_IMAGE_VIEW_ATTACH_INFO));
- }
- break;
- case XGL_STRUCTURE_TYPE_UPDATE_IMAGES:
- pUICI = (XGL_UPDATE_IMAGES*)pUpdate;
- pNewNode = (GENERIC_HEADER*)malloc(sizeof(XGL_UPDATE_IMAGES));
-#if ALLOC_DEBUG
- printf("Alloc15 #%lu pNewNode addr(%p)\n", ++g_alloc_count, (void*)pNewNode);
-#endif
- memcpy(pNewNode, pUpdate, sizeof(XGL_UPDATE_IMAGES));
- base_array_size = sizeof(XGL_IMAGE_VIEW_ATTACH_INFO*) * ((XGL_UPDATE_IMAGES*)pNewNode)->count;
- total_array_size = (sizeof(XGL_IMAGE_VIEW_ATTACH_INFO) * ((XGL_UPDATE_IMAGES*)pNewNode)->count) + base_array_size;
- XGL_IMAGE_VIEW_ATTACH_INFO*** pppLocalImageViews = (XGL_IMAGE_VIEW_ATTACH_INFO***)&((XGL_UPDATE_IMAGES*)pNewNode)->pImageViews;
- *pppLocalImageViews = (XGL_IMAGE_VIEW_ATTACH_INFO**)malloc(total_array_size);
-#if ALLOC_DEBUG
- printf("Alloc16 #%lu *pppLocalImageViews addr(%p)\n", ++g_alloc_count, (void*)*pppLocalImageViews);
-#endif
- baseBuffAddr = (size_t)(*pppLocalImageViews) + base_array_size;
- for (uint32_t i = 0; i < pUICI->count; i++) {
- (*pppLocalImageViews)[i] = (XGL_IMAGE_VIEW_ATTACH_INFO*)(baseBuffAddr + (i * sizeof(XGL_IMAGE_VIEW_ATTACH_INFO)));
- memcpy((*pppLocalImageViews)[i], pUICI->pImageViews[i], sizeof(XGL_IMAGE_VIEW_ATTACH_INFO));
- }
- break;
- case XGL_STRUCTURE_TYPE_UPDATE_BUFFERS:
- pUBCI = (XGL_UPDATE_BUFFERS*)pUpdate;
- pNewNode = (GENERIC_HEADER*)malloc(sizeof(XGL_UPDATE_BUFFERS));
-#if ALLOC_DEBUG
- printf("Alloc17 #%lu pNewNode addr(%p)\n", ++g_alloc_count, (void*)pNewNode);
-#endif
- memcpy(pNewNode, pUpdate, sizeof(XGL_UPDATE_BUFFERS));
- base_array_size = sizeof(XGL_BUFFER_VIEW_ATTACH_INFO*) * pUBCI->count;
- total_array_size = (sizeof(XGL_BUFFER_VIEW_ATTACH_INFO) * pUBCI->count) + base_array_size;
- XGL_BUFFER_VIEW_ATTACH_INFO*** pppLocalBufferViews = (XGL_BUFFER_VIEW_ATTACH_INFO***)&((XGL_UPDATE_BUFFERS*)pNewNode)->pBufferViews;
- *pppLocalBufferViews = (XGL_BUFFER_VIEW_ATTACH_INFO**)malloc(total_array_size);
-#if ALLOC_DEBUG
- printf("Alloc18 #%lu *pppLocalBufferViews addr(%p)\n", ++g_alloc_count, (void*)*pppLocalBufferViews);
-#endif
- baseBuffAddr = (size_t)(*pppLocalBufferViews) + base_array_size;
- for (uint32_t i = 0; i < pUBCI->count; i++) {
- // Set ptr and then copy data into that ptr
- (*pppLocalBufferViews)[i] = (XGL_BUFFER_VIEW_ATTACH_INFO*)(baseBuffAddr + (i * sizeof(XGL_BUFFER_VIEW_ATTACH_INFO)));
- memcpy((*pppLocalBufferViews)[i], pUBCI->pBufferViews[i], sizeof(XGL_BUFFER_VIEW_ATTACH_INFO));
- }
- break;
- case XGL_STRUCTURE_TYPE_UPDATE_AS_COPY:
- pNewNode = (GENERIC_HEADER*)malloc(sizeof(XGL_UPDATE_AS_COPY));
-#if ALLOC_DEBUG
- printf("Alloc19 #%lu pNewNode addr(%p)\n", ++g_alloc_count, (void*)pNewNode);
-#endif
- memcpy(pNewNode, pUpdate, sizeof(XGL_UPDATE_AS_COPY));
- break;
- default:
- sprintf(str, "Unexpected UPDATE struct of type %s (value %u) in xglUpdateDescriptors() struct tree", string_XGL_STRUCTURE_TYPE(pUpdate->sType), pUpdate->sType);
- layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, NULL, 0, DRAWSTATE_INVALID_UPDATE_STRUCT, "DS", str);
- return NULL;
- }
- // Make sure that pNext for the end of shadow copy is NULL
- pNewNode->pNext = NULL;
- return pNewNode;
-}
-// For given ds, update its mapping based on pUpdateChain linked-list
-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
- GENERIC_HEADER* pUpdates = pUpdateChain;
- // Perform all updates
- while (pUpdates) {
- pLayout = pSet->pLayouts;
- // For each update first find the layout section that it overlaps
- while (pLayout && (pLayout->startIndex > getUpdateIndex(pUpdates))) {
- pLayout = pLayout->pPriorSetLayout;
- }
- if (!pLayout) {
- char str[1024];
- sprintf(str, "Descriptor Set %p does not have index to match update index %u for update type %s!", ds, getUpdateIndex(pUpdates), string_XGL_STRUCTURE_TYPE(pUpdates->sType));
- layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, ds, 0, DRAWSTATE_INVALID_UPDATE_INDEX, "DS", str);
- }
- else {
- // Next verify that update is correct size
- if (!validateUpdateSize(pUpdates, pLayout->endIndex)) {
- char str[48*1024]; // TODO : Keep count of layout CI structs and size this string dynamically based on that count
- pLayoutCI = (XGL_DESCRIPTOR_SET_LAYOUT_CREATE_INFO*)pLayout->pCreateInfoList;
- char* pDSstr = xgl_print_xgl_descriptor_set_layout_create_info(pLayoutCI, "{DS} ");
- sprintf(str, "Descriptor update type of %s is out of bounds for matching layout w/ CI:\n%s!", string_XGL_STRUCTURE_TYPE(pUpdates->sType), pDSstr);
- layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, ds, 0, DRAWSTATE_DESCRIPTOR_UPDATE_OUT_OF_BOUNDS, "DS", str);
- free(pDSstr);
- }
- else { // TODO : should we skip update on a type mismatch or force it?
- // We have the right layout section, now verify that update is of the right type
- if (!validateUpdateType(pUpdates, pLayout)) {
- char str[1024];
- sprintf(str, "Descriptor update type of %s does not match overlapping layout type!", string_XGL_STRUCTURE_TYPE(pUpdates->sType));
- layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, ds, 0, DRAWSTATE_DESCRIPTOR_TYPE_MISMATCH, "DS", str);
- }
- else {
- // Save the update info
- // TODO : Info message that update successful
- // Create new update struct for this set's shadow copy
- GENERIC_HEADER* pNewNode = shadowUpdateNode(pUpdates);
- if (NULL == pNewNode) {
- char str[1024];
- sprintf(str, "Out of memory while attempting to allocate UPDATE struct in xglUpdateDescriptors()");
- layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, ds, 0, DRAWSTATE_OUT_OF_MEMORY, "DS", str);
- }
- else {
- // Insert shadow node into LL of updates for this set
- pNewNode->pNext = pSet->pUpdateStructs;
- pSet->pUpdateStructs = pNewNode;
- // Now update appropriate descriptor(s) to point to new Update node
- for (uint32_t i = getUpdateIndex(pUpdates); i < getUpdateUpperBound(pUpdates); i++) {
- assert(i<pSet->descriptorCount);
- pSet->ppDescriptors[i] = pNewNode;
- }
- }
- }
- }
- }
- pUpdates = (GENERIC_HEADER*)pUpdates->pNext;
- }
- loader_platform_thread_unlock_mutex(&globalLock);
-}
-// Free the shadowed update node for this Set
-// NOTE : Calls to this function should be wrapped in mutex
-static void freeShadowUpdateTree(SET_NODE* pSet)
-{
- GENERIC_HEADER* pShadowUpdate = pSet->pUpdateStructs;
- pSet->pUpdateStructs = NULL;
- GENERIC_HEADER* pFreeUpdate = pShadowUpdate;
- // Clear the descriptor mappings as they will now be invalid
- memset(pSet->ppDescriptors, 0, pSet->descriptorCount*sizeof(GENERIC_HEADER*));
- while(pShadowUpdate) {
- pFreeUpdate = pShadowUpdate;
- pShadowUpdate = (GENERIC_HEADER*)pShadowUpdate->pNext;
- uint32_t index = 0;
- XGL_UPDATE_SAMPLERS* pUS = NULL;
- XGL_UPDATE_SAMPLER_TEXTURES* pUST = NULL;
- XGL_UPDATE_IMAGES* pUI = NULL;
- XGL_UPDATE_BUFFERS* pUB = NULL;
- void** ppToFree = NULL;
- switch (pFreeUpdate->sType)
- {
- case XGL_STRUCTURE_TYPE_UPDATE_SAMPLERS:
- pUS = (XGL_UPDATE_SAMPLERS*)pFreeUpdate;
- if (pUS->pSamplers) {
- ppToFree = (void**)&pUS->pSamplers;
-#if ALLOC_DEBUG
- printf("Free11 #%lu pSamplers addr(%p)\n", ++g_free_count, (void*)*ppToFree);
-#endif
- free(*ppToFree);
- }
- break;
- case XGL_STRUCTURE_TYPE_UPDATE_SAMPLER_TEXTURES:
- pUST = (XGL_UPDATE_SAMPLER_TEXTURES*)pFreeUpdate;
- for (index = 0; index < pUST->count; index++) {
- if (pUST->pSamplerImageViews[index].pImageView) {
- ppToFree = (void**)&pUST->pSamplerImageViews[index].pImageView;
-#if ALLOC_DEBUG
- printf("Free14 #%lu pImageView addr(%p)\n", ++g_free_count, (void*)*ppToFree);
-#endif
- free(*ppToFree);
- }
- }
- ppToFree = (void**)&pUST->pSamplerImageViews;
-#if ALLOC_DEBUG
- printf("Free13 #%lu pSamplerImageViews addr(%p)\n", ++g_free_count, (void*)*ppToFree);
-#endif
- free(*ppToFree);
- break;
- case XGL_STRUCTURE_TYPE_UPDATE_IMAGES:
- pUI = (XGL_UPDATE_IMAGES*)pFreeUpdate;
- if (pUI->pImageViews) {
- ppToFree = (void**)&pUI->pImageViews;
-#if ALLOC_DEBUG
- printf("Free16 #%lu pImageViews addr(%p)\n", ++g_free_count, (void*)*ppToFree);
-#endif
- free(*ppToFree);
- }
- break;
- case XGL_STRUCTURE_TYPE_UPDATE_BUFFERS:
- pUB = (XGL_UPDATE_BUFFERS*)pFreeUpdate;
- if (pUB->pBufferViews) {
- ppToFree = (void**)&pUB->pBufferViews;
-#if ALLOC_DEBUG
- printf("Free18 #%lu pBufferViews addr(%p)\n", ++g_free_count, (void*)*ppToFree);
-#endif
- free(*ppToFree);
- }
- break;
- case XGL_STRUCTURE_TYPE_UPDATE_AS_COPY:
- break;
- default:
- assert(0);
- break;
- }
-#if ALLOC_DEBUG
- printf("Free10, Free12, Free15, Free17, Free19 #%lu pUpdateNode addr(%p)\n", ++g_free_count, (void*)pFreeUpdate);
-#endif
- free(pFreeUpdate);
- }
-}
-// Free all DS Regions including their Sets & related sub-structs
-// NOTE : Calls to this function should be wrapped in mutex
-static void freeRegions()
-{
- REGION_NODE* pRegion = g_pRegionHead;
- REGION_NODE* pFreeMe = pRegion;
- while (pRegion) {
- pFreeMe = pRegion;
- SET_NODE* pSet = pRegion->pSets;
- SET_NODE* pFreeSet = pSet;
- while (pSet) {
- pFreeSet = pSet;
- pSet = pSet->pNext;
- // Freeing layouts handled in freeLayouts() function
- // Free Update shadow struct tree
- freeShadowUpdateTree(pFreeSet);
- if (pFreeSet->ppDescriptors) {
-#if ALLOC_DEBUG
- printf("Free35 #%lu pSet->ppDescriptors addr(%p)\n", ++g_free_count, (void*)pFreeSet->ppDescriptors);
-#endif
- free(pFreeSet->ppDescriptors);
- }
-#if ALLOC_DEBUG
- printf("Free32 #%lu pSet addr(%p)\n", ++g_free_count, (void*)pFreeSet);
-#endif
- free(pFreeSet);
- }
- pRegion = pRegion->pNext;
- if (pFreeMe->createInfo.pTypeCount) {
- void** ppToFree = (void**)&pFreeMe->createInfo.pTypeCount;
-#if ALLOC_DEBUG
- printf("Free31 #%lu pTypeCount addr(%p)\n", ++g_free_count, (void*)*ppToFree);
-#endif
- free(*ppToFree);
- }
-#if ALLOC_DEBUG
- printf("Free30 #%lu pRegion addr(%p)\n", ++g_free_count, (void*)pFreeMe);
-#endif
- free(pFreeMe);
- }
- g_pRegionHead = NULL;
-}
-// WARN : Once freeLayouts() called, any layout ptrs in Region/Set data structure will be invalid
-// NOTE : Calls to this function should be wrapped in mutex
-static void freeLayouts()
-{
- LAYOUT_NODE* pLayout = g_pLayoutHead;
- LAYOUT_NODE* pFreeLayout = pLayout;
- while (pLayout) {
- pFreeLayout = pLayout;
- GENERIC_HEADER* pTrav = (GENERIC_HEADER*)pLayout->pCreateInfoList;
- while (pTrav) {
- void* pToFree = (void*)pTrav;
- pTrav = (GENERIC_HEADER*)pTrav->pNext;
-#if ALLOC_DEBUG
- printf("Free27 & Free28 #%lu pLayoutCITree addr(%p)\n", ++g_free_count, (void*)pToFree);
-#endif
- free(pToFree);
- }
- if (pLayout->pTypes) {
-#if ALLOC_DEBUG
- printf("Free29 #%lu pLayout->pTypes addr(%p)\n", ++g_free_count, (void*)pLayout->pTypes);
-#endif
- free(pLayout->pTypes);
- }
- pLayout = pLayout->pNext;
-#if ALLOC_DEBUG
- printf("Free26 #%lu pLayout addr(%p)\n", ++g_free_count, (void*)pFreeLayout);
-#endif
- free(pFreeLayout);
- }
- g_pLayoutHead = NULL;
-}
-// Currently clearing a set is removing all previous updates to that set
-// TODO : Validate if this is correct clearing behavior
-static void clearDescriptorSet(XGL_DESCRIPTOR_SET set)
-{
- SET_NODE* pSet = getSetNode(set);
- if (!pSet) {
- // TODO : Return error
- }
- else {
- loader_platform_thread_lock_mutex(&globalLock);
- freeShadowUpdateTree(pSet);
- loader_platform_thread_unlock_mutex(&globalLock);
- }
-}
-
-static void clearDescriptorRegion(XGL_DESCRIPTOR_REGION region)
-{
- REGION_NODE* pRegion = getRegionNode(region);
- if (!pRegion) {
- char str[1024];
- sprintf(str, "Unable to find region node for region %p specified in xglClearDescriptorRegion() call", (void*)region);
- layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, region, 0, DRAWSTATE_INVALID_REGION, "DS", str);
- }
- else
- {
- // For every set off of this region, clear it
- SET_NODE* pSet = pRegion->pSets;
- while (pSet) {
- clearDescriptorSet(pSet->set);
- }
- }
-}
-
-// Code here to manage the Cmd buffer LL
-static GLOBAL_CB_NODE* getCBNode(XGL_CMD_BUFFER cb)
-{
- loader_platform_thread_lock_mutex(&globalLock);
- GLOBAL_CB_NODE* pCB = g_pCmdBufferHead;
- while (pCB) {
- if (cb == pCB->cmdBuffer) {
- loader_platform_thread_unlock_mutex(&globalLock);
- return pCB;
- }
- pCB = pCB->pNextGlobalCBNode;
- }
- loader_platform_thread_unlock_mutex(&globalLock);
- return NULL;
-}
-// Free all CB Nodes
-// NOTE : Calls to this function should be wrapped in mutex
-static void freeCmdBuffers()
-{
- GLOBAL_CB_NODE* pCB = g_pCmdBufferHead;
- GLOBAL_CB_NODE* pFreeMe = pCB;
- while (pCB) {
- pFreeMe = pCB;
- CMD_NODE* pCmd = pCB->pCmds;
- CMD_NODE* pFreeCmd = pCmd;
- while (pCmd) {
- pFreeCmd = pCmd;
- pCmd = pCmd->pNext;
-#if ALLOC_DEBUG
- printf("Free20 #%lu pCmd addr(%p)\n", ++g_free_count, (void*)pFreeCmd);
-#endif
- free(pFreeCmd);
- }
- pCB = pCB->pNextGlobalCBNode;
-#if ALLOC_DEBUG
- printf("Free33 #%lu pCB addr(%p)\n", ++g_free_count, (void*)pFreeMe);
-#endif
- free(pFreeMe);
- }
- g_pCmdBufferHead = NULL;
-}
-static void addCmd(GLOBAL_CB_NODE* pCB, const CMD_TYPE cmd)
-{
- CMD_NODE* pCmd = (CMD_NODE*)malloc(sizeof(CMD_NODE));
-#if ALLOC_DEBUG
- printf("Alloc20 #%lu pCmd addr(%p)\n", ++g_alloc_count, (void*)pCmd);
-#endif
- if (pCmd) {
- // init cmd node and append to end of cmd LL
- memset(pCmd, 0, sizeof(CMD_NODE));
- pCB->numCmds++;
- pCmd->cmdNumber = pCB->numCmds;
- pCmd->type = cmd;
- if (!pCB->pCmds) {
- pCB->pCmds = pCmd;
- }
- else {
- assert(pCB->pLastCmd);
- pCB->pLastCmd->pNext = pCmd;
- }
- pCB->pLastCmd = pCmd;
- }
- else {
- char str[1024];
- sprintf(str, "Out of memory while attempting to allocate new CMD_NODE for cmdBuffer %p", (void*)pCB->cmdBuffer);
- layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, pCB->cmdBuffer, 0, DRAWSTATE_OUT_OF_MEMORY, "DS", str);
- }
-}
-static void resetCB(const XGL_CMD_BUFFER cb)
-{
- GLOBAL_CB_NODE* pCB = getCBNode(cb);
- if (pCB) {
- CMD_NODE* pCur = pCB->pCmds;
- CMD_NODE* pFreeMe = pCur;
- while (pCur) {
- pFreeMe = pCur;
- pCur = pCur->pNext;
-#if ALLOC_DEBUG
- printf("Free20 #%lu pCmd addr(%p)\n", ++g_free_count, (void*)pFreeMe);
-#endif
- free(pFreeMe);
- }
- // Reset CB state
- GLOBAL_CB_NODE* pSaveNext = pCB->pNextGlobalCBNode;
- XGL_FLAGS saveFlags = pCB->flags;
- uint32_t saveQueueNodeIndex = pCB->queueNodeIndex;
- memset(pCB, 0, sizeof(GLOBAL_CB_NODE));
- pCB->cmdBuffer = cb;
- pCB->flags = saveFlags;
- pCB->queueNodeIndex = saveQueueNodeIndex;
- pCB->pNextGlobalCBNode = pSaveNext;
- pCB->lastVtxBinding = MAX_BINDING;
- }
-}
-// Set the last bound dynamic state of given type
-// TODO : Need to track this per cmdBuffer and correlate cmdBuffer for Draw w/ last bound for that cmdBuffer?
-static void setLastBoundDynamicState(const XGL_CMD_BUFFER cmdBuffer, const XGL_DYNAMIC_STATE_OBJECT state, const XGL_STATE_BIND_POINT sType)
-{
- GLOBAL_CB_NODE* pCB = getCBNode(cmdBuffer);
- if (pCB) {
- updateCBTracking(cmdBuffer);
- loader_platform_thread_lock_mutex(&globalLock);
- addCmd(pCB, CMD_BINDDYNAMICSTATEOBJECT);
- DYNAMIC_STATE_NODE* pTrav = g_pDynamicStateHead[sType];
- while (pTrav && (state != pTrav->stateObj)) {
- pTrav = pTrav->pNext;
- }
- if (!pTrav) {
- char str[1024];
- sprintf(str, "Unable to find dynamic state object %p, was it ever created?", (void*)state);
- layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, state, 0, DRAWSTATE_INVALID_DYNAMIC_STATE_OBJECT, "DS", str);
- }
- pCB->lastBoundDynamicState[sType] = pTrav;
- g_lastBoundDynamicState[sType] = pTrav;
- loader_platform_thread_unlock_mutex(&globalLock);
- }
- else {
- char str[1024];
- sprintf(str, "Attempt to use CmdBuffer %p that doesn't exist!", (void*)cmdBuffer);
- layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, cmdBuffer, 0, DRAWSTATE_INVALID_CMD_BUFFER, "DS", str);
- }
-}
-// Print the last bound Gfx Pipeline
-static void printPipeline(const XGL_CMD_BUFFER cb)
-{
- GLOBAL_CB_NODE* pCB = getCBNode(cb);
- if (pCB) {
- PIPELINE_NODE *pPipeTrav = getPipeline(pCB->lastBoundPipeline);
- if (!pPipeTrav) {
- // nothing to print
- }
- else {
- char* pipeStr = xgl_print_xgl_graphics_pipeline_create_info(pPipeTrav->pCreateTree, "{DS}");
- layerCbMsg(XGL_DBG_MSG_UNKNOWN, XGL_VALIDATION_LEVEL_0, NULL, 0, DRAWSTATE_NONE, "DS", pipeStr);
- free(pipeStr);
- }
- }
-}
-// Common Dot dumping code
-static void dsCoreDumpDot(const XGL_DESCRIPTOR_SET ds, FILE* pOutFile)
-{
- SET_NODE* pSet = getSetNode(ds);
- if (pSet) {
- REGION_NODE* pRegion = getRegionNode(pSet->region);
- char tmp_str[4*1024];
- fprintf(pOutFile, "subgraph cluster_DescriptorRegion\n{\nlabel=\"Descriptor Region\"\n");
- sprintf(tmp_str, "Region (%p)", pRegion->region);
- char* pGVstr = xgl_gv_print_xgl_descriptor_region_create_info(&pRegion->createInfo, tmp_str);
- fprintf(pOutFile, "%s", pGVstr);
- free(pGVstr);
- fprintf(pOutFile, "subgraph cluster_DescriptorSet\n{\nlabel=\"Descriptor Set (%p)\"\n", pSet->set);
- sprintf(tmp_str, "Descriptor Set (%p)", pSet->set);
- LAYOUT_NODE* pLayout = pSet->pLayouts;
- uint32_t layout_index = 0;
- while (pLayout) {
- ++layout_index;
- sprintf(tmp_str, "LAYOUT%u", layout_index);
- pGVstr = xgl_gv_print_xgl_descriptor_set_layout_create_info(pLayout->pCreateInfoList, tmp_str);
- fprintf(pOutFile, "%s", pGVstr);
- free(pGVstr);
- pLayout = pLayout->pNext;
- if (pLayout) {
- fprintf(pOutFile, "\"%s\" -> \"LAYOUT%u\" [];\n", tmp_str, layout_index+1);
- }
- }
- if (pSet->pUpdateStructs) {
- pGVstr = dynamic_gv_display(pSet->pUpdateStructs, "Descriptor Updates");
- fprintf(pOutFile, "%s", pGVstr);
- free(pGVstr);
- }
- if (pSet->ppDescriptors) {
- //void* pDesc = NULL;
- 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><TD>%s</TD></TR>", i, i, string_XGL_STRUCTURE_TYPE(pSet->ppDescriptors[i]->sType));
- }
- }
-#define NUM_COLORS 7
- char* edgeColors[NUM_COLORS];
- edgeColors[0] = "0000ff";
- edgeColors[1] = "ff00ff";
- edgeColors[2] = "ffff00";
- edgeColors[3] = "00ff00";
- edgeColors[4] = "000000";
- edgeColors[5] = "00ffff";
- edgeColors[6] = "ff0000";
- uint32_t colorIdx = 0;
- fprintf(pOutFile, "</TABLE>>\n];\n");
- // Now add the views that are mapped to active descriptors
- XGL_UPDATE_SAMPLERS* pUS = NULL;
- XGL_UPDATE_SAMPLER_TEXTURES* pUST = NULL;
- XGL_UPDATE_IMAGES* pUI = NULL;
- XGL_UPDATE_BUFFERS* pUB = NULL;
- XGL_UPDATE_AS_COPY* pUAC = NULL;
- XGL_SAMPLER_CREATE_INFO* pSCI = NULL;
- XGL_IMAGE_VIEW_CREATE_INFO* pIVCI = NULL;
- XGL_BUFFER_VIEW_CREATE_INFO* pBVCI = NULL;
- for (i=0; i < pSet->descriptorCount; i++) {
- if (pSet->ppDescriptors[i]) {
- switch (pSet->ppDescriptors[i]->sType)
- {
- case XGL_STRUCTURE_TYPE_UPDATE_SAMPLERS:
- pUS = (XGL_UPDATE_SAMPLERS*)pSet->ppDescriptors[i];
- pSCI = getSamplerCreateInfo(pUS->pSamplers[i-pUS->index]);
- if (pSCI) {
- sprintf(tmp_str, "SAMPLER%u", i);
- fprintf(pOutFile, "%s", xgl_gv_print_xgl_sampler_create_info(pSCI, tmp_str));
- fprintf(pOutFile, "\"DESCRIPTORS\":slot%u -> \"%s\" [color=\"#%s\"];\n", i, tmp_str, edgeColors[colorIdx]);
- }
- break;
- case XGL_STRUCTURE_TYPE_UPDATE_SAMPLER_TEXTURES:
- pUST = (XGL_UPDATE_SAMPLER_TEXTURES*)pSet->ppDescriptors[i];
- pSCI = getSamplerCreateInfo(pUST->pSamplerImageViews[i-pUST->index].pSampler);
- if (pSCI) {
- sprintf(tmp_str, "SAMPLER%u", i);
- fprintf(pOutFile, "%s", xgl_gv_print_xgl_sampler_create_info(pSCI, tmp_str));
- fprintf(pOutFile, "\"DESCRIPTORS\":slot%u -> \"%s\" [color=\"#%s\"];\n", i, tmp_str, edgeColors[colorIdx]);
- }
- pIVCI = getImageViewCreateInfo(pUST->pSamplerImageViews[i-pUST->index].pImageView->view);
- if (pIVCI) {
- sprintf(tmp_str, "IMAGE_VIEW%u", i);
- fprintf(pOutFile, "%s", xgl_gv_print_xgl_image_view_create_info(pIVCI, tmp_str));
- fprintf(pOutFile, "\"DESCRIPTORS\":slot%u -> \"%s\" [color=\"#%s\"];\n", i, tmp_str, edgeColors[colorIdx]);
- }
- break;
- case XGL_STRUCTURE_TYPE_UPDATE_IMAGES:
- pUI = (XGL_UPDATE_IMAGES*)pSet->ppDescriptors[i];
- pIVCI = getImageViewCreateInfo(pUI->pImageViews[i-pUI->index]->view);
- if (pIVCI) {
- sprintf(tmp_str, "IMAGE_VIEW%u", i);
- fprintf(pOutFile, "%s", xgl_gv_print_xgl_image_view_create_info(pIVCI, tmp_str));
- fprintf(pOutFile, "\"DESCRIPTORS\":slot%u -> \"%s\" [color=\"#%s\"];\n", i, tmp_str, edgeColors[colorIdx]);
- }
- break;
- case XGL_STRUCTURE_TYPE_UPDATE_BUFFERS:
- pUB = (XGL_UPDATE_BUFFERS*)pSet->ppDescriptors[i];
- pBVCI = getBufferViewCreateInfo(pUB->pBufferViews[i-pUB->index]->view);
- if (pBVCI) {
- sprintf(tmp_str, "BUFFER_VIEW%u", i);
- fprintf(pOutFile, "%s", xgl_gv_print_xgl_buffer_view_create_info(pBVCI, tmp_str));
- fprintf(pOutFile, "\"DESCRIPTORS\":slot%u -> \"%s\" [color=\"#%s\"];\n", i, tmp_str, edgeColors[colorIdx]);
- }
- break;
- case XGL_STRUCTURE_TYPE_UPDATE_AS_COPY:
- pUAC = (XGL_UPDATE_AS_COPY*)pSet->ppDescriptors[i];
- // TODO : Need to validate this code
- // Save off pNext and set to NULL while printing this struct, then restore it
- void** ppNextPtr = (void*)&pUAC->pNext;
- void* pSaveNext = *ppNextPtr;
- *ppNextPtr = NULL;
- sprintf(tmp_str, "UPDATE_AS_COPY%u", i);
- fprintf(pOutFile, "%s", xgl_gv_print_xgl_update_as_copy(pUAC, tmp_str));
- fprintf(pOutFile, "\"DESCRIPTORS\":slot%u -> \"%s\" [color=\"#%s\"];\n", i, tmp_str, edgeColors[colorIdx]);
- // Restore next ptr
- *ppNextPtr = pSaveNext;
- break;
- default:
- break;
- }
- colorIdx = (colorIdx+1) % NUM_COLORS;
- }
- }
- }
- fprintf(pOutFile, "}\n");
- fprintf(pOutFile, "}\n");
- pRegion = pRegion->pNext;
- }
-}
-// Dump subgraph w/ DS info
-static void dsDumpDot(const XGL_CMD_BUFFER cb, FILE* pOutFile)
-{
- GLOBAL_CB_NODE* pCB = getCBNode(cb);
- if (pCB && pCB->lastBoundDescriptorSet) {
- dsCoreDumpDot(pCB->lastBoundDescriptorSet, pOutFile);
- }
-}
-// Dump a GraphViz dot file showing the Cmd Buffers
-static void cbDumpDotFile(char *outFileName)
-{
- // Print CB Chain for each CB
- FILE* pOutFile;
- pOutFile = fopen(outFileName, "w");
- fprintf(pOutFile, "digraph g {\ngraph [\nrankdir = \"TB\"\n];\nnode [\nfontsize = \"16\"\nshape = \"plaintext\"\n];\nedge [\n];\n");
- fprintf(pOutFile, "subgraph cluster_cmdBuffers\n{\nlabel=\"Command Buffers\"\n");
- GLOBAL_CB_NODE* pCB = g_pCmdBufferHead;
- for (uint32_t i = 0; i < NUM_COMMAND_BUFFERS_TO_DISPLAY; i++) {
- pCB = g_pLastTouchedCB[i];
- if (pCB) {
- fprintf(pOutFile, "subgraph cluster_cmdBuffer%u\n{\nlabel=\"Command Buffer #%u\"\n", i, i);
- CMD_NODE* pCmd = pCB->pCmds;
- uint32_t instNum = 0;
- while (pCmd) {
- if (instNum) {
- fprintf(pOutFile, "\"CB%pCMD%u\" -> \"CB%pCMD%u\" [];\n", (void*)pCB->cmdBuffer, instNum-1, (void*)pCB->cmdBuffer, instNum);
- }
- if (pCB == g_lastGlobalCB) {
- fprintf(pOutFile, "\"CB%pCMD%u\" [\nlabel=<<TABLE BGCOLOR=\"#00FF00\" BORDER=\"0\" CELLBORDER=\"1\" CELLSPACING=\"0\"> <TR><TD>CMD#</TD><TD>%u</TD></TR><TR><TD>CMD Type</TD><TD>%s</TD></TR></TABLE>>\n];\n", (void*)pCB->cmdBuffer, instNum, instNum, cmdTypeToString(pCmd->type));
- }
- else {
- fprintf(pOutFile, "\"CB%pCMD%u\" [\nlabel=<<TABLE BORDER=\"0\" CELLBORDER=\"1\" CELLSPACING=\"0\"> <TR><TD>CMD#</TD><TD>%u</TD></TR><TR><TD>CMD Type</TD><TD>%s</TD></TR></TABLE>>\n];\n", (void*)pCB->cmdBuffer, instNum, instNum, cmdTypeToString(pCmd->type));
- }
- ++instNum;
- pCmd = pCmd->pNext;
- }
- fprintf(pOutFile, "}\n");
- }
- }
- fprintf(pOutFile, "}\n");
- fprintf(pOutFile, "}\n"); // close main graph "g"
- fclose(pOutFile);
-}
-// Dump a GraphViz dot file showing the pipeline for last bound global state
-static void dumpGlobalDotFile(char *outFileName)
-{
- PIPELINE_NODE *pPipeTrav = g_lastBoundPipeline;
- if (pPipeTrav) {
- FILE* pOutFile;
- pOutFile = fopen(outFileName, "w");
- fprintf(pOutFile, "digraph g {\ngraph [\nrankdir = \"TB\"\n];\nnode [\nfontsize = \"16\"\nshape = \"plaintext\"\n];\nedge [\n];\n");
- fprintf(pOutFile, "subgraph cluster_dynamicState\n{\nlabel=\"Dynamic State\"\n");
- char* pGVstr = NULL;
- for (uint32_t i = 0; i < XGL_NUM_STATE_BIND_POINT; i++) {
- if (g_lastBoundDynamicState[i] && g_lastBoundDynamicState[i]->pCreateInfo) {
- pGVstr = dynamic_gv_display(g_lastBoundDynamicState[i]->pCreateInfo, string_XGL_STATE_BIND_POINT(i));
- fprintf(pOutFile, "%s", pGVstr);
- free(pGVstr);
- }
- }
- fprintf(pOutFile, "}\n"); // close dynamicState subgraph
- fprintf(pOutFile, "subgraph cluster_PipelineStateObject\n{\nlabel=\"Pipeline State Object\"\n");
- pGVstr = xgl_gv_print_xgl_graphics_pipeline_create_info(pPipeTrav->pCreateTree, "PSO HEAD");
- fprintf(pOutFile, "%s", pGVstr);
- free(pGVstr);
- fprintf(pOutFile, "}\n");
- dsCoreDumpDot(g_lastBoundDescriptorSet, pOutFile);
- fprintf(pOutFile, "}\n"); // close main graph "g"
- fclose(pOutFile);
- }
-}
-// Dump a GraphViz dot file showing the pipeline for a given CB
-static void dumpDotFile(const XGL_CMD_BUFFER cb, char *outFileName)
-{
- GLOBAL_CB_NODE* pCB = getCBNode(cb);
- if (pCB) {
- PIPELINE_NODE *pPipeTrav = getPipeline(pCB->lastBoundPipeline);
- if (pPipeTrav) {
- FILE* pOutFile;
- pOutFile = fopen(outFileName, "w");
- fprintf(pOutFile, "digraph g {\ngraph [\nrankdir = \"TB\"\n];\nnode [\nfontsize = \"16\"\nshape = \"plaintext\"\n];\nedge [\n];\n");
- fprintf(pOutFile, "subgraph cluster_dynamicState\n{\nlabel=\"Dynamic State\"\n");
- char* pGVstr = NULL;
- for (uint32_t i = 0; i < XGL_NUM_STATE_BIND_POINT; i++) {
- if (pCB->lastBoundDynamicState[i] && pCB->lastBoundDynamicState[i]->pCreateInfo) {
- pGVstr = dynamic_gv_display(pCB->lastBoundDynamicState[i]->pCreateInfo, string_XGL_STATE_BIND_POINT(i));
- fprintf(pOutFile, "%s", pGVstr);
- free(pGVstr);
- }
- }
- fprintf(pOutFile, "}\n"); // close dynamicState subgraph
- fprintf(pOutFile, "subgraph cluster_PipelineStateObject\n{\nlabel=\"Pipeline State Object\"\n");
- pGVstr = xgl_gv_print_xgl_graphics_pipeline_create_info(pPipeTrav->pCreateTree, "PSO HEAD");
- fprintf(pOutFile, "%s", pGVstr);
- free(pGVstr);
- fprintf(pOutFile, "}\n");
- dsDumpDot(cb, pOutFile);
- fprintf(pOutFile, "}\n"); // close main graph "g"
- fclose(pOutFile);
- }
- }
-}
-// Verify VB Buffer binding
-static void validateVBBinding(const XGL_CMD_BUFFER cb)
-{
- GLOBAL_CB_NODE* pCB = getCBNode(cb);
- if (pCB && pCB->lastBoundPipeline) {
- // First verify that we have a Node for bound pipeline
- PIPELINE_NODE *pPipeTrav = getPipeline(pCB->lastBoundPipeline);
- char str[1024];
- if (!pPipeTrav) {
- sprintf(str, "Can't find last bound Pipeline %p!", (void*)pCB->lastBoundPipeline);
- layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, NULL, 0, DRAWSTATE_NO_PIPELINE_BOUND, "DS", str);
- }
- else {
- // Verify Vtx binding
- if (MAX_BINDING != pCB->lastVtxBinding) {
- if (pCB->lastVtxBinding >= pPipeTrav->vtxBindingCount) {
- if (0 == pPipeTrav->vtxBindingCount) {
- sprintf(str, "Vtx Buffer Index %u was bound, but no vtx buffers are attached to PSO.", pCB->lastVtxBinding);
- layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, NULL, 0, DRAWSTATE_VTX_INDEX_OUT_OF_BOUNDS, "DS", str);
- }
- else {
- sprintf(str, "Vtx binding Index of %u exceeds PSO pVertexBindingDescriptions max array index of %u.", pCB->lastVtxBinding, (pPipeTrav->vtxBindingCount - 1));
- layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, NULL, 0, DRAWSTATE_VTX_INDEX_OUT_OF_BOUNDS, "DS", str);
- }
- }
- else {
- char *tmpStr = xgl_print_xgl_vertex_input_binding_description(&pPipeTrav->pVertexBindingDescriptions[pCB->lastVtxBinding], "{DS}INFO : ");
- layerCbMsg(XGL_DBG_MSG_UNKNOWN, XGL_VALIDATION_LEVEL_0, NULL, 0, DRAWSTATE_NONE, "DS", tmpStr);
- free(tmpStr);
- }
- }
- }
- }
-}
-// Print details of DS config to stdout
-static void printDSConfig(const XGL_CMD_BUFFER cb)
-{
- char tmp_str[1024];
- char ds_config_str[1024*256] = {0}; // TODO : Currently making this buffer HUGE w/o overrun protection. Need to be smarter, start smaller, and grow as needed.
- GLOBAL_CB_NODE* pCB = getCBNode(cb);
- if (pCB) {
- SET_NODE* pSet = getSetNode(pCB->lastBoundDescriptorSet);
- REGION_NODE* pRegion = getRegionNode(pSet->region);
- // Print out region details
- sprintf(tmp_str, "Details for region %p.", (void*)pRegion->region);
- layerCbMsg(XGL_DBG_MSG_UNKNOWN, XGL_VALIDATION_LEVEL_0, NULL, 0, DRAWSTATE_NONE, "DS", tmp_str);
- char* pRegionStr = xgl_print_xgl_descriptor_region_create_info(&pRegion->createInfo, " ");
- sprintf(ds_config_str, "%s", pRegionStr);
- layerCbMsg(XGL_DBG_MSG_UNKNOWN, XGL_VALIDATION_LEVEL_0, NULL, 0, DRAWSTATE_NONE, "DS", ds_config_str);
- free(pRegionStr);
- // Print out set details
- char prefix[10];
- uint32_t index = 0;
- sprintf(tmp_str, "Details for descriptor set %p.", (void*)pSet->set);
- layerCbMsg(XGL_DBG_MSG_UNKNOWN, XGL_VALIDATION_LEVEL_0, NULL, 0, DRAWSTATE_NONE, "DS", tmp_str);
- LAYOUT_NODE* pLayout = pSet->pLayouts;
- while (pLayout) {
- // Print layout details
- sprintf(tmp_str, "Layout #%u, (object %p) for DS %p.", index+1, (void*)pLayout->layout, (void*)pSet->set);
- layerCbMsg(XGL_DBG_MSG_UNKNOWN, XGL_VALIDATION_LEVEL_0, NULL, 0, DRAWSTATE_NONE, "DS", tmp_str);
- sprintf(prefix, " [L%u] ", index);
- char* pDSLstr = xgl_print_xgl_descriptor_set_layout_create_info(&pLayout->pCreateInfoList[0], prefix);
- sprintf(ds_config_str, "%s", pDSLstr);
- layerCbMsg(XGL_DBG_MSG_UNKNOWN, XGL_VALIDATION_LEVEL_0, NULL, 0, DRAWSTATE_NONE, "DS", ds_config_str);
- free(pDSLstr);
- pLayout = pLayout->pPriorSetLayout;
- index++;
- }
- GENERIC_HEADER* pUpdate = pSet->pUpdateStructs;
- if (pUpdate) {
- sprintf(tmp_str, "Update Chain [UC] for descriptor set %p:", (void*)pSet->set);
- layerCbMsg(XGL_DBG_MSG_UNKNOWN, XGL_VALIDATION_LEVEL_0, NULL, 0, DRAWSTATE_NONE, "DS", tmp_str);
- sprintf(prefix, " [UC] ");
- sprintf(ds_config_str, "%s", dynamic_display(pUpdate, prefix));
- layerCbMsg(XGL_DBG_MSG_UNKNOWN, XGL_VALIDATION_LEVEL_0, NULL, 0, DRAWSTATE_NONE, "DS", ds_config_str);
- // TODO : If there is a "view" associated with this update, print CI for that view
- }
- else {
- sprintf(tmp_str, "No Update Chain for descriptor set %p (xglUpdateDescriptors has not been called)", (void*)pSet->set);
- layerCbMsg(XGL_DBG_MSG_UNKNOWN, XGL_VALIDATION_LEVEL_0, NULL, 0, DRAWSTATE_NONE, "DS", tmp_str);
- }
- }
-}
-
-static void printCB(const XGL_CMD_BUFFER cb)
-{
- GLOBAL_CB_NODE* pCB = getCBNode(cb);
- if (pCB) {
- char str[1024];
- CMD_NODE* pCmd = pCB->pCmds;
- sprintf(str, "Cmds in CB %p", (void*)cb);
- layerCbMsg(XGL_DBG_MSG_UNKNOWN, XGL_VALIDATION_LEVEL_0, NULL, 0, DRAWSTATE_NONE, "DS", str);
- while (pCmd) {
- sprintf(str, " CMD#%lu: %s", pCmd->cmdNumber, cmdTypeToString(pCmd->type));
- layerCbMsg(XGL_DBG_MSG_UNKNOWN, XGL_VALIDATION_LEVEL_0, cb, 0, DRAWSTATE_NONE, "DS", str);
- pCmd = pCmd->pNext;
- }
- }
- else {
- // Nothing to print
- }
-}
-
-
-static void synchAndPrintDSConfig(const XGL_CMD_BUFFER cb)
-{
- printDSConfig(cb);
- printPipeline(cb);
- printDynamicState(cb);
- static int autoDumpOnce = 0;
- if (autoDumpOnce) {
- autoDumpOnce = 0;
- dumpDotFile(cb, "pipeline_dump.dot");
- cbDumpDotFile("cb_dump.dot");
-#if defined(_WIN32)
-// FIXME: NEED WINDOWS EQUIVALENT
-#else // WIN32
- // Convert dot to svg if dot available
- if(access( "/usr/bin/dot", X_OK) != -1) {
- system("/usr/bin/dot pipeline_dump.dot -Tsvg -o pipeline_dump.svg");
- }
-#endif // WIN32
- }
-}
-
-static void initDrawState(void)
-{
- const char *strOpt;
- // initialize DrawState options
- getLayerOptionEnum("DrawStateReportLevel", (uint32_t *) &g_reportingLevel);
- g_actionIsDefault = getLayerOptionEnum("DrawStateDebugAction", (uint32_t *) &g_debugAction);
-
- if (g_debugAction & XGL_DBG_LAYER_ACTION_LOG_MSG)
- {
- strOpt = getLayerOption("DrawStateLogFilename");
- if (strOpt)
- {
- g_logFile = fopen(strOpt, "w");
- }
- if (g_logFile == NULL)
- g_logFile = stdout;
- }
- // initialize Layer dispatch table
- // TODO handle multiple GPUs
- xglGetProcAddrType fpNextGPA;
- fpNextGPA = pCurObj->pGPA;
- assert(fpNextGPA);
-
- layer_initialize_dispatch_table(&nextTable, fpNextGPA, (XGL_PHYSICAL_GPU) pCurObj->nextObject);
-
- xglGetProcAddrType fpGetProcAddr = fpNextGPA((XGL_PHYSICAL_GPU) pCurObj->nextObject, (char *) "xglGetProcAddr");
- nextTable.GetProcAddr = fpGetProcAddr;
-
- if (!globalLockInitialized)
- {
- // TODO/TBD: Need to delete this mutex sometime. How??? One
- // suggestion is to call this during xglCreateInstance(), and then we
- // can clean it up during xglDestroyInstance(). However, that requires
- // that the layer have per-instance locks. We need to come back and
- // address this soon.
- loader_platform_thread_create_mutex(&globalLock);
- globalLockInitialized = 1;
- }
-}
-
-XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglCreateDevice(XGL_PHYSICAL_GPU gpu, const XGL_DEVICE_CREATE_INFO* pCreateInfo, XGL_DEVICE* pDevice)
-{
- XGL_BASE_LAYER_OBJECT* gpuw = (XGL_BASE_LAYER_OBJECT *) gpu;
- pCurObj = gpuw;
- loader_platform_thread_once(&g_initOnce, initDrawState);
- XGL_RESULT result = nextTable.CreateDevice((XGL_PHYSICAL_GPU)gpuw->nextObject, pCreateInfo, pDevice);
- return result;
-}
-
-XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglDestroyDevice(XGL_DEVICE device)
-{
- // Free all the memory
- loader_platform_thread_lock_mutex(&globalLock);
- freePipelines();
- freeSamplers();
- freeImages();
- freeBuffers();
- freeCmdBuffers();
- freeDynamicState();
- freeRegions();
- freeLayouts();
- loader_platform_thread_unlock_mutex(&globalLock);
- XGL_RESULT result = nextTable.DestroyDevice(device);
- return result;
-}
-
-XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglEnumerateLayers(XGL_PHYSICAL_GPU gpu, size_t maxLayerCount, size_t maxStringSize, size_t* pOutLayerCount, char* const* pOutLayers, void* pReserved)
-{
- if (gpu != NULL)
- {
- XGL_BASE_LAYER_OBJECT* gpuw = (XGL_BASE_LAYER_OBJECT *) gpu;
- pCurObj = gpuw;
- loader_platform_thread_once(&g_initOnce, initDrawState);
- XGL_RESULT result = nextTable.EnumerateLayers((XGL_PHYSICAL_GPU)gpuw->nextObject, maxLayerCount, maxStringSize, pOutLayerCount, pOutLayers, pReserved);
- return result;
- } else
- {
- if (pOutLayerCount == NULL || pOutLayers == NULL || pOutLayers[0] == NULL)
- return XGL_ERROR_INVALID_POINTER;
- // This layer compatible with all GPUs
- *pOutLayerCount = 1;
- strncpy((char *) pOutLayers[0], "DrawState", maxStringSize);
- return XGL_SUCCESS;
- }
-}
-
-XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglQueueSubmit(XGL_QUEUE queue, uint32_t cmdBufferCount, const XGL_CMD_BUFFER* pCmdBuffers, uint32_t memRefCount, const XGL_MEMORY_REF* pMemRefs, XGL_FENCE fence)
-{
- for (uint32_t i=0; i < cmdBufferCount; i++) {
- // Validate that cmd buffers have been updated
- }
- XGL_RESULT result = nextTable.QueueSubmit(queue, cmdBufferCount, pCmdBuffers, memRefCount, pMemRefs, fence);
- return result;
-}
-
-XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglDestroyObject(XGL_OBJECT object)
-{
- // TODO : When wrapped objects (such as dynamic state) are destroyed, need to clean up memory
- XGL_RESULT result = nextTable.DestroyObject(object);
- return result;
-}
-
-XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglCreateBufferView(XGL_DEVICE device, const XGL_BUFFER_VIEW_CREATE_INFO* pCreateInfo, XGL_BUFFER_VIEW* pView)
-{
- XGL_RESULT result = nextTable.CreateBufferView(device, pCreateInfo, pView);
- if (XGL_SUCCESS == result) {
- loader_platform_thread_lock_mutex(&globalLock);
- BUFFER_NODE *pNewNode = (BUFFER_NODE*)malloc(sizeof(BUFFER_NODE));
-#if ALLOC_DEBUG
- printf("Alloc21 #%lu pNewNode addr(%p)\n", ++g_alloc_count, (void*)pNewNode);
-#endif
- pNewNode->buffer = *pView;
- memcpy(&pNewNode->createInfo, pCreateInfo, sizeof(XGL_BUFFER_VIEW_CREATE_INFO));
- pNewNode->pNext = g_pBufferHead;
- g_pBufferHead = pNewNode;
- loader_platform_thread_unlock_mutex(&globalLock);
- }
- return result;
-}
-
-XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglCreateImageView(XGL_DEVICE device, const XGL_IMAGE_VIEW_CREATE_INFO* pCreateInfo, XGL_IMAGE_VIEW* pView)
-{
- XGL_RESULT result = nextTable.CreateImageView(device, pCreateInfo, pView);
- if (XGL_SUCCESS == result) {
- loader_platform_thread_lock_mutex(&globalLock);
- IMAGE_NODE *pNewNode = (IMAGE_NODE*)malloc(sizeof(IMAGE_NODE));
-#if ALLOC_DEBUG
- printf("Alloc22 #%lu pNewNode addr(%p)\n", ++g_alloc_count, (void*)pNewNode);
-#endif
- pNewNode->image = *pView;
- memcpy(&pNewNode->createInfo, pCreateInfo, sizeof(XGL_IMAGE_VIEW_CREATE_INFO));
- pNewNode->pNext = g_pImageHead;
- g_pImageHead = pNewNode;
- loader_platform_thread_unlock_mutex(&globalLock);
- }
- return result;
-}
-
-static void track_pipeline(const XGL_GRAPHICS_PIPELINE_CREATE_INFO* pCreateInfo, XGL_PIPELINE* pPipeline)
-{
- loader_platform_thread_lock_mutex(&globalLock);
- PIPELINE_NODE *pTrav = g_pPipelineHead;
- if (pTrav) {
- while (pTrav->pNext)
- pTrav = pTrav->pNext;
- pTrav->pNext = (PIPELINE_NODE*)malloc(sizeof(PIPELINE_NODE));
-#if ALLOC_DEBUG
- printf("Alloc23 #%lu pTrav->pNext addr(%p)\n", ++g_alloc_count, (void*)pTrav->pNext);
-#endif
- pTrav = pTrav->pNext;
- }
- else {
- pTrav = (PIPELINE_NODE*)malloc(sizeof(PIPELINE_NODE));
-#if ALLOC_DEBUG
- printf("Alloc24 #%lu pTrav addr(%p)\n", ++g_alloc_count, (void*)pTrav);
-#endif
- g_pPipelineHead = pTrav;
- }
- memset((void*)pTrav, 0, sizeof(PIPELINE_NODE));
- pTrav->pipeline = *pPipeline;
- initPipeline(pTrav, pCreateInfo);
- loader_platform_thread_unlock_mutex(&globalLock);
-}
-
-XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglCreateGraphicsPipeline(XGL_DEVICE device, const XGL_GRAPHICS_PIPELINE_CREATE_INFO* pCreateInfo, XGL_PIPELINE* pPipeline)
-{
- XGL_RESULT result = nextTable.CreateGraphicsPipeline(device, pCreateInfo, pPipeline);
- // Create LL HEAD for this Pipeline
- char str[1024];
- sprintf(str, "Created Gfx Pipeline %p", (void*)*pPipeline);
- layerCbMsg(XGL_DBG_MSG_UNKNOWN, XGL_VALIDATION_LEVEL_0, pPipeline, 0, DRAWSTATE_NONE, "DS", str);
-
- track_pipeline(pCreateInfo, pPipeline);
-
- return result;
-}
-
-XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglCreateGraphicsPipelineDerivative(
- XGL_DEVICE device,
- const XGL_GRAPHICS_PIPELINE_CREATE_INFO* pCreateInfo,
- XGL_PIPELINE basePipeline,
- XGL_PIPELINE* pPipeline)
-{
- XGL_RESULT result = nextTable.CreateGraphicsPipelineDerivative(device, pCreateInfo, basePipeline, pPipeline);
- // Create LL HEAD for this Pipeline
- char str[1024];
- sprintf(str, "Created Gfx Pipeline %p (derived from pipeline %p)", (void*)*pPipeline, basePipeline);
- layerCbMsg(XGL_DBG_MSG_UNKNOWN, XGL_VALIDATION_LEVEL_0, pPipeline, 0, DRAWSTATE_NONE, "DS", str);
-
- track_pipeline(pCreateInfo, pPipeline);
-
- return result;
-}
-
-XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglCreateSampler(XGL_DEVICE device, const XGL_SAMPLER_CREATE_INFO* pCreateInfo, XGL_SAMPLER* pSampler)
-{
- XGL_RESULT result = nextTable.CreateSampler(device, pCreateInfo, pSampler);
- if (XGL_SUCCESS == result) {
- loader_platform_thread_lock_mutex(&globalLock);
- SAMPLER_NODE *pNewNode = (SAMPLER_NODE*)malloc(sizeof(SAMPLER_NODE));
-#if ALLOC_DEBUG
- printf("Alloc25 #%lu pNewNode addr(%p)\n", ++g_alloc_count, (void*)pNewNode);
-#endif
- pNewNode->sampler = *pSampler;
- memcpy(&pNewNode->createInfo, pCreateInfo, sizeof(XGL_SAMPLER_CREATE_INFO));
- pNewNode->pNext = g_pSamplerHead;
- g_pSamplerHead = pNewNode;
- loader_platform_thread_unlock_mutex(&globalLock);
- }
- return result;
-}
-
-XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglCreateDescriptorSetLayout(XGL_DEVICE device, XGL_FLAGS stageFlags, const uint32_t* pSetBindPoints, XGL_DESCRIPTOR_SET_LAYOUT priorSetLayout, const XGL_DESCRIPTOR_SET_LAYOUT_CREATE_INFO* pSetLayoutInfoList, XGL_DESCRIPTOR_SET_LAYOUT* pSetLayout)
-{
- XGL_RESULT result = nextTable.CreateDescriptorSetLayout(device, stageFlags, pSetBindPoints, priorSetLayout, pSetLayoutInfoList, pSetLayout);
- if (XGL_SUCCESS == result) {
- LAYOUT_NODE* pNewNode = (LAYOUT_NODE*)malloc(sizeof(LAYOUT_NODE));
-#if ALLOC_DEBUG
- printf("Alloc26 #%lu pNewNode addr(%p)\n", ++g_alloc_count, (void*)pNewNode);
-#endif
- if (NULL == pNewNode) {
- char str[1024];
- sprintf(str, "Out of memory while attempting to allocate LAYOUT_NODE in xglCreateDescriptorSetLayout()");
- layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, *pSetLayout, 0, DRAWSTATE_OUT_OF_MEMORY, "DS", str);
- }
- memset(pNewNode, 0, sizeof(LAYOUT_NODE));
- // TODO : API Currently missing a count here that we should multiply by struct size
- pNewNode->pCreateInfoList = (XGL_DESCRIPTOR_SET_LAYOUT_CREATE_INFO*)malloc(sizeof(XGL_DESCRIPTOR_SET_LAYOUT_CREATE_INFO));
-#if ALLOC_DEBUG
- printf("Alloc27 #%lu pNewNode->pCreateInfoList addr(%p)\n", ++g_alloc_count, (void*)pNewNode->pCreateInfoList);
-#endif
- memset((void*)pNewNode->pCreateInfoList, 0, sizeof(XGL_DESCRIPTOR_SET_LAYOUT_CREATE_INFO));
- void* pCITrav = NULL;
- uint32_t totalCount = 0;
- if (pSetLayoutInfoList) {
- memcpy((void*)pNewNode->pCreateInfoList, pSetLayoutInfoList, sizeof(XGL_DESCRIPTOR_SET_LAYOUT_CREATE_INFO));
- pCITrav = (void*)pSetLayoutInfoList->pNext;
- totalCount = pSetLayoutInfoList->count;
- }
- void** ppNext = (void**)&pNewNode->pCreateInfoList->pNext;
- while (pCITrav) {
- totalCount += ((XGL_DESCRIPTOR_SET_LAYOUT_CREATE_INFO*)pCITrav)->count;
- *ppNext = (void*)malloc(sizeof(XGL_DESCRIPTOR_SET_LAYOUT_CREATE_INFO));
-#if ALLOC_DEBUG
- printf("Alloc28 #%lu *ppNext addr(%p)\n", ++g_alloc_count, (void*)*ppNext);
-#endif
- memcpy((void*)*ppNext, pCITrav, sizeof(XGL_DESCRIPTOR_SET_LAYOUT_CREATE_INFO));
- pCITrav = (void*)((XGL_DESCRIPTOR_SET_LAYOUT_CREATE_INFO*)pCITrav)->pNext;
- ppNext = (void**)&((XGL_DESCRIPTOR_SET_LAYOUT_CREATE_INFO*)*ppNext)->pNext;
- }
- if (totalCount > 0) {
- pNewNode->pTypes = (XGL_DESCRIPTOR_TYPE*)malloc(totalCount*sizeof(XGL_DESCRIPTOR_TYPE));
-#if ALLOC_DEBUG
- printf("Alloc29 #%lu pNewNode->pTypes addr(%p)\n", ++g_alloc_count, (void*)pNewNode->pTypes);
-#endif
- XGL_DESCRIPTOR_SET_LAYOUT_CREATE_INFO* pLCI = (XGL_DESCRIPTOR_SET_LAYOUT_CREATE_INFO*)pSetLayoutInfoList;
- uint32_t offset = 0;
- uint32_t i = 0;
- while (pLCI) {
- for (i = 0; i < pLCI->count; i++) {
- pNewNode->pTypes[offset + i] = pLCI->descriptorType;
- }
- offset += i;
- pLCI = (XGL_DESCRIPTOR_SET_LAYOUT_CREATE_INFO*)pLCI->pNext;
- }
- }
- pNewNode->layout = *pSetLayout;
- pNewNode->stageFlags = stageFlags;
- uint32_t i = (XGL_SHADER_STAGE_FLAGS_ALL == stageFlags) ? 0 : XGL_SHADER_STAGE_COMPUTE;
- for (uint32_t stage = XGL_SHADER_STAGE_FLAGS_COMPUTE_BIT; stage > 0; stage >>= 1) {
- assert(i < XGL_NUM_SHADER_STAGE);
- if (stage & stageFlags)
- pNewNode->shaderStageBindPoints[i] = pSetBindPoints[i];
- i = (i == 0) ? 0 : (i-1);
- }
- pNewNode->startIndex = 0;
- LAYOUT_NODE* pPriorNode = getLayoutNode(priorSetLayout);
- // Point to prior node or NULL if no prior node
- if (NULL != priorSetLayout && pPriorNode == NULL) {
- char str[1024];
- sprintf(str, "Invalid priorSetLayout of %p passed to xglCreateDescriptorSetLayout()", (void*)priorSetLayout);
- layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, priorSetLayout, 0, DRAWSTATE_INVALID_LAYOUT, "DS", str);
- }
- else if (pPriorNode != NULL) { // We have a node for a valid prior layout
- // Get count for prior layout
- pNewNode->startIndex = pPriorNode->endIndex + 1;
- }
- pNewNode->endIndex = pNewNode->startIndex + totalCount - 1;
- assert(pNewNode->endIndex >= pNewNode->startIndex);
- pNewNode->pPriorSetLayout = pPriorNode;
- // Put new node at Head of global Layer list
- loader_platform_thread_lock_mutex(&globalLock);
- pNewNode->pNext = g_pLayoutHead;
- g_pLayoutHead = pNewNode;
- loader_platform_thread_unlock_mutex(&globalLock);
- }
- return result;
-}
-
-XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglBeginDescriptorRegionUpdate(XGL_DEVICE device, XGL_DESCRIPTOR_UPDATE_MODE updateMode)
-{
- XGL_RESULT result = nextTable.BeginDescriptorRegionUpdate(device, updateMode);
- if (XGL_SUCCESS == result) {
- loader_platform_thread_lock_mutex(&globalLock);
- REGION_NODE* pRegionNode = g_pRegionHead;
- if (!pRegionNode) {
- char str[1024];
- sprintf(str, "Unable to find region node for global region head %p", (void*)g_pRegionHead);
- layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, g_pRegionHead, 0, DRAWSTATE_INTERNAL_ERROR, "DS", str);
- }
- else {
- pRegionNode->updateActive = 1;
- }
- loader_platform_thread_unlock_mutex(&globalLock);
- }
- return result;
-}
-
-XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglEndDescriptorRegionUpdate(XGL_DEVICE device, XGL_CMD_BUFFER cmd)
-{
- XGL_RESULT result = nextTable.EndDescriptorRegionUpdate(device, cmd);
- if (XGL_SUCCESS == result) {
- loader_platform_thread_lock_mutex(&globalLock);
- REGION_NODE* pRegionNode = g_pRegionHead;
- if (!pRegionNode) {
- char str[1024];
- sprintf(str, "Unable to find region node for global region head %p", (void*)g_pRegionHead);
- layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, g_pRegionHead, 0, DRAWSTATE_INTERNAL_ERROR, "DS", str);
- }
- else {
- if (!pRegionNode->updateActive) {
- char str[1024];
- sprintf(str, "You must call xglBeginDescriptorRegionUpdate() before this call to xglEndDescriptorRegionUpdate()!");
- layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, g_pRegionHead, 0, DRAWSTATE_DS_END_WITHOUT_BEGIN, "DS", str);
- }
- else {
- pRegionNode->updateActive = 0;
- }
- }
- loader_platform_thread_unlock_mutex(&globalLock);
- }
- return result;
-}
-
-XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglCreateDescriptorRegion(XGL_DEVICE device, XGL_DESCRIPTOR_REGION_USAGE regionUsage, uint32_t maxSets, const XGL_DESCRIPTOR_REGION_CREATE_INFO* pCreateInfo, XGL_DESCRIPTOR_REGION* pDescriptorRegion)
-{
- XGL_RESULT result = nextTable.CreateDescriptorRegion(device, regionUsage, maxSets, pCreateInfo, pDescriptorRegion);
- if (XGL_SUCCESS == result) {
- // Insert this region into Global Region LL at head
- char str[1024];
- sprintf(str, "Created Descriptor Region %p", (void*)*pDescriptorRegion);
- layerCbMsg(XGL_DBG_MSG_UNKNOWN, XGL_VALIDATION_LEVEL_0, pDescriptorRegion, 0, DRAWSTATE_NONE, "DS", str);
- loader_platform_thread_lock_mutex(&globalLock);
- REGION_NODE* pNewNode = (REGION_NODE*)malloc(sizeof(REGION_NODE));
-#if ALLOC_DEBUG
- printf("Alloc30 #%lu pNewNode addr(%p)\n", ++g_alloc_count, (void*)pNewNode);
-#endif
- if (NULL == pNewNode) {
- char str[1024];
- sprintf(str, "Out of memory while attempting to allocate REGION_NODE in xglCreateDescriptorRegion()");
- layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, *pDescriptorRegion, 0, DRAWSTATE_OUT_OF_MEMORY, "DS", str);
- }
- else {
- memset(pNewNode, 0, sizeof(REGION_NODE));
- pNewNode->pNext = g_pRegionHead;
- g_pRegionHead = pNewNode;
- XGL_DESCRIPTOR_REGION_CREATE_INFO* pCI = (XGL_DESCRIPTOR_REGION_CREATE_INFO*)&pNewNode->createInfo;
- memcpy((void*)pCI, pCreateInfo, sizeof(XGL_DESCRIPTOR_REGION_CREATE_INFO));
- size_t typeCountSize = pNewNode->createInfo.count * sizeof(XGL_DESCRIPTOR_TYPE_COUNT);
- if (typeCountSize) {
- XGL_DESCRIPTOR_TYPE_COUNT** ppTypeCount = (XGL_DESCRIPTOR_TYPE_COUNT**)&pNewNode->createInfo.pTypeCount;
- *ppTypeCount = (XGL_DESCRIPTOR_TYPE_COUNT*)malloc(typeCountSize);
-#if ALLOC_DEBUG
- printf("Alloc31 #%lu *ppTypeCount addr(%p)\n", ++g_alloc_count, (void*)*ppTypeCount);
-#endif
- memcpy((void*)*ppTypeCount, pCreateInfo->pTypeCount, typeCountSize);
- }
- pNewNode->regionUsage = regionUsage;
- pNewNode->updateActive = 0;
- pNewNode->maxSets = maxSets;
- pNewNode->region = *pDescriptorRegion;
- }
- loader_platform_thread_unlock_mutex(&globalLock);
- }
- else {
- // Need to do anything if region create fails?
- }
- return result;
-}
-
-XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglClearDescriptorRegion(XGL_DESCRIPTOR_REGION descriptorRegion)
-{
- XGL_RESULT result = nextTable.ClearDescriptorRegion(descriptorRegion);
- if (XGL_SUCCESS == result) {
- clearDescriptorRegion(descriptorRegion);
- }
- return result;
-}
-
-XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglAllocDescriptorSets(XGL_DESCRIPTOR_REGION descriptorRegion, XGL_DESCRIPTOR_SET_USAGE setUsage, uint32_t count, const XGL_DESCRIPTOR_SET_LAYOUT* pSetLayouts, XGL_DESCRIPTOR_SET* pDescriptorSets, uint32_t* pCount)
-{
- XGL_RESULT result = nextTable.AllocDescriptorSets(descriptorRegion, setUsage, count, pSetLayouts, pDescriptorSets, pCount);
- if ((XGL_SUCCESS == result) || (*pCount > 0)) {
- REGION_NODE *pRegionNode = getRegionNode(descriptorRegion);
- if (!pRegionNode) {
- char str[1024];
- sprintf(str, "Unable to find region node for region %p specified in xglAllocDescriptorSets() call", (void*)descriptorRegion);
- layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, descriptorRegion, 0, DRAWSTATE_INVALID_REGION, "DS", str);
- }
- else {
- for (uint32_t i = 0; i < *pCount; i++) {
- char str[1024];
- sprintf(str, "Created Descriptor Set %p", (void*)pDescriptorSets[i]);
- layerCbMsg(XGL_DBG_MSG_UNKNOWN, XGL_VALIDATION_LEVEL_0, pDescriptorSets[i], 0, DRAWSTATE_NONE, "DS", str);
- // Create new set node and add to head of region nodes
- SET_NODE* pNewNode = (SET_NODE*)malloc(sizeof(SET_NODE));
-#if ALLOC_DEBUG
- printf("Alloc32 #%lu pNewNode addr(%p)\n", ++g_alloc_count, (void*)pNewNode);
-#endif
- if (NULL == pNewNode) {
- char str[1024];
- sprintf(str, "Out of memory while attempting to allocate SET_NODE in xglAllocDescriptorSets()");
- layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, pDescriptorSets[i], 0, DRAWSTATE_OUT_OF_MEMORY, "DS", str);
- }
- else {
- memset(pNewNode, 0, sizeof(SET_NODE));
- // Insert set at head of Set LL for this region
- pNewNode->pNext = pRegionNode->pSets;
- pRegionNode->pSets = pNewNode;
- LAYOUT_NODE* pLayout = getLayoutNode(pSetLayouts[i]);
- if (NULL == pLayout) {
- char str[1024];
- sprintf(str, "Unable to find set layout node for layout %p specified in xglAllocDescriptorSets() call", (void*)pSetLayouts[i]);
- layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, pSetLayouts[i], 0, DRAWSTATE_INVALID_LAYOUT, "DS", str);
- }
- pNewNode->pLayouts = pLayout;
- pNewNode->region = descriptorRegion;
- pNewNode->set = pDescriptorSets[i];
- pNewNode->setUsage = setUsage;
- pNewNode->descriptorCount = pLayout->endIndex + 1;
- size_t descriptorArraySize = sizeof(GENERIC_HEADER*)*pNewNode->descriptorCount;
- pNewNode->ppDescriptors = (GENERIC_HEADER**)malloc(descriptorArraySize);
-#if ALLOC_DEBUG
- printf("Alloc35 #%lu pSet->ppDescriptors addr(%p)\n", ++g_alloc_count, (void*)pNewNode->ppDescriptors);
-#endif
- memset(pNewNode->ppDescriptors, 0, descriptorArraySize);
- }
- }
- }
- }
- return result;
-}
-
-XGL_LAYER_EXPORT void XGLAPI xglClearDescriptorSets(XGL_DESCRIPTOR_REGION descriptorRegion, uint32_t count, const XGL_DESCRIPTOR_SET* pDescriptorSets)
-{
- for (uint32_t i = 0; i < count; i++) {
- clearDescriptorSet(pDescriptorSets[i]);
- }
- nextTable.ClearDescriptorSets(descriptorRegion, count, pDescriptorSets);
-}
-
-XGL_LAYER_EXPORT void XGLAPI xglUpdateDescriptors(XGL_DESCRIPTOR_SET descriptorSet, const void* pUpdateChain)
-{
- if (!dsUpdateActive(descriptorSet)) {
- char str[1024];
- sprintf(str, "You must call xglBeginDescriptorRegionUpdate() before this call to xglUpdateDescriptors()!");
- layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, g_pRegionHead->region, 0, DRAWSTATE_UPDATE_WITHOUT_BEGIN, "DS", str);
- }
- else {
- // pUpdateChain is a Linked-list of XGL_UPDATE_* structures defining the mappings for the descriptors
- dsUpdate(descriptorSet, (GENERIC_HEADER*)pUpdateChain);
- }
-
- nextTable.UpdateDescriptors(descriptorSet, pUpdateChain);
-}
-
-XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglCreateDynamicViewportState(XGL_DEVICE device, const XGL_DYNAMIC_VP_STATE_CREATE_INFO* pCreateInfo, XGL_DYNAMIC_VP_STATE_OBJECT* pState)
-{
- XGL_RESULT result = nextTable.CreateDynamicViewportState(device, pCreateInfo, pState);
- insertDynamicState(*pState, (GENERIC_HEADER*)pCreateInfo, XGL_STATE_BIND_VIEWPORT);
- return result;
-}
-
-XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglCreateDynamicRasterState(XGL_DEVICE device, const XGL_DYNAMIC_RS_STATE_CREATE_INFO* pCreateInfo, XGL_DYNAMIC_RS_STATE_OBJECT* pState)
-{
- XGL_RESULT result = nextTable.CreateDynamicRasterState(device, pCreateInfo, pState);
- insertDynamicState(*pState, (GENERIC_HEADER*)pCreateInfo, XGL_STATE_BIND_RASTER);
- return result;
-}
-
-XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglCreateDynamicColorBlendState(XGL_DEVICE device, const XGL_DYNAMIC_CB_STATE_CREATE_INFO* pCreateInfo, XGL_DYNAMIC_CB_STATE_OBJECT* pState)
-{
- XGL_RESULT result = nextTable.CreateDynamicColorBlendState(device, pCreateInfo, pState);
- insertDynamicState(*pState, (GENERIC_HEADER*)pCreateInfo, XGL_STATE_BIND_COLOR_BLEND);
- return result;
-}
-
-XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglCreateDynamicDepthStencilState(XGL_DEVICE device, const XGL_DYNAMIC_DS_STATE_CREATE_INFO* pCreateInfo, XGL_DYNAMIC_DS_STATE_OBJECT* pState)
-{
- XGL_RESULT result = nextTable.CreateDynamicDepthStencilState(device, pCreateInfo, pState);
- insertDynamicState(*pState, (GENERIC_HEADER*)pCreateInfo, XGL_STATE_BIND_DEPTH_STENCIL);
- return result;
-}
-
-XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglCreateCommandBuffer(XGL_DEVICE device, const XGL_CMD_BUFFER_CREATE_INFO* pCreateInfo, XGL_CMD_BUFFER* pCmdBuffer)
-{
- XGL_RESULT result = nextTable.CreateCommandBuffer(device, pCreateInfo, pCmdBuffer);
- if (XGL_SUCCESS == result) {
- loader_platform_thread_lock_mutex(&globalLock);
- GLOBAL_CB_NODE* pCB = (GLOBAL_CB_NODE*)malloc(sizeof(GLOBAL_CB_NODE));
-#if ALLOC_DEBUG
- printf("Alloc33 #%lu pCB addr(%p)\n", ++g_alloc_count, (void*)pCB);
-#endif
- memset(pCB, 0, sizeof(GLOBAL_CB_NODE));
- pCB->pNextGlobalCBNode = g_pCmdBufferHead;
- g_pCmdBufferHead = pCB;
- pCB->cmdBuffer = *pCmdBuffer;
- pCB->flags = pCreateInfo->flags;
- pCB->queueNodeIndex = pCreateInfo->queueNodeIndex;
- pCB->lastVtxBinding = MAX_BINDING;
- loader_platform_thread_unlock_mutex(&globalLock);
- updateCBTracking(*pCmdBuffer);
- }
- return result;
-}
-
-XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglBeginCommandBuffer(XGL_CMD_BUFFER cmdBuffer, const XGL_CMD_BUFFER_BEGIN_INFO* pBeginInfo)
-{
- XGL_RESULT result = nextTable.BeginCommandBuffer(cmdBuffer, pBeginInfo);
- if (XGL_SUCCESS == result) {
- GLOBAL_CB_NODE* pCB = getCBNode(cmdBuffer);
- if (pCB) {
- if (CB_NEW != pCB->state)
- resetCB(cmdBuffer);
- pCB->state = CB_UPDATE_ACTIVE;
- }
- else {
- char str[1024];
- sprintf(str, "In xglBeginCommandBuffer() and unable to find CmdBuffer Node for CB %p!", (void*)cmdBuffer);
- layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, cmdBuffer, 0, DRAWSTATE_INVALID_CMD_BUFFER, "DS", str);
- }
- updateCBTracking(cmdBuffer);
- }
- return result;
-}
-
-XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglEndCommandBuffer(XGL_CMD_BUFFER cmdBuffer)
-{
- XGL_RESULT result = nextTable.EndCommandBuffer(cmdBuffer);
- if (XGL_SUCCESS == result) {
- GLOBAL_CB_NODE* pCB = getCBNode(cmdBuffer);
- if (pCB) {
- pCB->state = CB_UPDATE_COMPLETE;
- printCB(cmdBuffer);
- }
- else {
- char str[1024];
- sprintf(str, "In xglEndCommandBuffer() and unable to find CmdBuffer Node for CB %p!", (void*)cmdBuffer);
- layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, cmdBuffer, 0, DRAWSTATE_INVALID_CMD_BUFFER, "DS", str);
- }
- updateCBTracking(cmdBuffer);
- //cbDumpDotFile("cb_dump.dot");
- }
- return result;
-}
-
-XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglResetCommandBuffer(XGL_CMD_BUFFER cmdBuffer)
-{
- XGL_RESULT result = nextTable.ResetCommandBuffer(cmdBuffer);
- if (XGL_SUCCESS == result) {
- resetCB(cmdBuffer);
- updateCBTracking(cmdBuffer);
- }
- return result;
-}
-
-XGL_LAYER_EXPORT void XGLAPI xglCmdBindPipeline(XGL_CMD_BUFFER cmdBuffer, XGL_PIPELINE_BIND_POINT pipelineBindPoint, XGL_PIPELINE pipeline)
-{
- GLOBAL_CB_NODE* pCB = getCBNode(cmdBuffer);
- if (pCB) {
- updateCBTracking(cmdBuffer);
- addCmd(pCB, CMD_BINDPIPELINE);
- 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];
- sprintf(str, "Attempt to bind Pipeline %p that doesn't exist!", (void*)pipeline);
- layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, pipeline, 0, DRAWSTATE_INVALID_PIPELINE, "DS", str);
- }
- }
- else {
- char str[1024];
- sprintf(str, "Attempt to use CmdBuffer %p that doesn't exist!", (void*)cmdBuffer);
- layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, cmdBuffer, 0, DRAWSTATE_INVALID_CMD_BUFFER, "DS", str);
- }
- nextTable.CmdBindPipeline(cmdBuffer, pipelineBindPoint, pipeline);
-}
-
-XGL_LAYER_EXPORT void XGLAPI xglCmdBindDynamicStateObject(XGL_CMD_BUFFER cmdBuffer, XGL_STATE_BIND_POINT stateBindPoint, XGL_DYNAMIC_STATE_OBJECT state)
-{
- setLastBoundDynamicState(cmdBuffer, state, stateBindPoint);
- nextTable.CmdBindDynamicStateObject(cmdBuffer, stateBindPoint, state);
-}
-
-XGL_LAYER_EXPORT void XGLAPI xglCmdBindDescriptorSet(XGL_CMD_BUFFER cmdBuffer, XGL_PIPELINE_BIND_POINT pipelineBindPoint, XGL_DESCRIPTOR_SET descriptorSet, const uint32_t* pUserData)
-{
- GLOBAL_CB_NODE* pCB = getCBNode(cmdBuffer);
- if (pCB) {
- updateCBTracking(cmdBuffer);
- addCmd(pCB, CMD_BINDDESCRIPTORSET);
- if (getSetNode(descriptorSet)) {
- if (dsUpdateActive(descriptorSet)) {
- // TODO : This check here needs to be made at QueueSubmit time
-/*
- char str[1024];
- sprintf(str, "You must call xglEndDescriptorRegionUpdate(%p) before this call to xglCmdBindDescriptorSet()!", (void*)descriptorSet);
- layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, descriptorSet, 0, DRAWSTATE_BINDING_DS_NO_END_UPDATE, "DS", str);
-*/
- }
- loader_platform_thread_lock_mutex(&globalLock);
- pCB->lastBoundDescriptorSet = descriptorSet;
- g_lastBoundDescriptorSet = descriptorSet;
- loader_platform_thread_unlock_mutex(&globalLock);
- char str[1024];
- sprintf(str, "DS %p bound on pipeline %s", (void*)descriptorSet, string_XGL_PIPELINE_BIND_POINT(pipelineBindPoint));
- layerCbMsg(XGL_DBG_MSG_UNKNOWN, XGL_VALIDATION_LEVEL_0, descriptorSet, 0, DRAWSTATE_NONE, "DS", str);
- synchAndPrintDSConfig(cmdBuffer);
- }
- else {
- char str[1024];
- sprintf(str, "Attempt to bind DS %p that doesn't exist!", (void*)descriptorSet);
- layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, descriptorSet, 0, DRAWSTATE_INVALID_SET, "DS", str);
- }
- }
- else {
- char str[1024];
- sprintf(str, "Attempt to use CmdBuffer %p that doesn't exist!", (void*)cmdBuffer);
- layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, cmdBuffer, 0, DRAWSTATE_INVALID_CMD_BUFFER, "DS", str);
- }
- nextTable.CmdBindDescriptorSet(cmdBuffer, pipelineBindPoint, descriptorSet, pUserData);
-}
-
-XGL_LAYER_EXPORT void XGLAPI xglCmdBindIndexBuffer(XGL_CMD_BUFFER cmdBuffer, XGL_BUFFER buffer, XGL_GPU_SIZE offset, XGL_INDEX_TYPE indexType)
-{
- GLOBAL_CB_NODE* pCB = getCBNode(cmdBuffer);
- if (pCB) {
- updateCBTracking(cmdBuffer);
- addCmd(pCB, CMD_BINDINDEXBUFFER);
- // TODO : Track idxBuffer binding
- }
- else {
- char str[1024];
- sprintf(str, "Attempt to use CmdBuffer %p that doesn't exist!", (void*)cmdBuffer);
- layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, cmdBuffer, 0, DRAWSTATE_INVALID_CMD_BUFFER, "DS", str);
- }
- nextTable.CmdBindIndexBuffer(cmdBuffer, buffer, offset, indexType);
-}
-
-XGL_LAYER_EXPORT void XGLAPI xglCmdBindVertexBuffer(XGL_CMD_BUFFER cmdBuffer, XGL_BUFFER buffer, XGL_GPU_SIZE offset, uint32_t binding)
-{
- GLOBAL_CB_NODE* pCB = getCBNode(cmdBuffer);
- if (pCB) {
- updateCBTracking(cmdBuffer);
- addCmd(pCB, CMD_BINDVERTEXBUFFER);
- pCB->lastVtxBinding = binding;
- validateVBBinding(cmdBuffer);
- }
- else {
- char str[1024];
- sprintf(str, "Attempt to use CmdBuffer %p that doesn't exist!", (void*)cmdBuffer);
- layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, cmdBuffer, 0, DRAWSTATE_INVALID_CMD_BUFFER, "DS", str);
- }
- nextTable.CmdBindVertexBuffer(cmdBuffer, buffer, offset, binding);
-}
-
-XGL_LAYER_EXPORT void XGLAPI xglCmdDraw(XGL_CMD_BUFFER cmdBuffer, uint32_t firstVertex, uint32_t vertexCount, uint32_t firstInstance, uint32_t instanceCount)
-{
- GLOBAL_CB_NODE* pCB = getCBNode(cmdBuffer);
- if (pCB) {
- updateCBTracking(cmdBuffer);
- addCmd(pCB, CMD_DRAW);
- pCB->drawCount[DRAW]++;
- char str[1024];
- sprintf(str, "xglCmdDraw() call #%lu, reporting DS state:", g_drawCount[DRAW]++);
- layerCbMsg(XGL_DBG_MSG_UNKNOWN, XGL_VALIDATION_LEVEL_0, cmdBuffer, 0, DRAWSTATE_NONE, "DS", str);
- synchAndPrintDSConfig(cmdBuffer);
- }
- else {
- char str[1024];
- sprintf(str, "Attempt to use CmdBuffer %p that doesn't exist!", (void*)cmdBuffer);
- layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, cmdBuffer, 0, DRAWSTATE_INVALID_CMD_BUFFER, "DS", str);
- }
- nextTable.CmdDraw(cmdBuffer, firstVertex, vertexCount, firstInstance, instanceCount);
-}
-
-XGL_LAYER_EXPORT void XGLAPI xglCmdDrawIndexed(XGL_CMD_BUFFER cmdBuffer, uint32_t firstIndex, uint32_t indexCount, int32_t vertexOffset, uint32_t firstInstance, uint32_t instanceCount)
-{
- GLOBAL_CB_NODE* pCB = getCBNode(cmdBuffer);
- if (pCB) {
- updateCBTracking(cmdBuffer);
- addCmd(pCB, CMD_DRAWINDEXED);
- pCB->drawCount[DRAW_INDEXED]++;
- char str[1024];
- sprintf(str, "xglCmdDrawIndexed() call #%lu, reporting DS state:", g_drawCount[DRAW_INDEXED]++);
- layerCbMsg(XGL_DBG_MSG_UNKNOWN, XGL_VALIDATION_LEVEL_0, cmdBuffer, 0, DRAWSTATE_NONE, "DS", str);
- synchAndPrintDSConfig(cmdBuffer);
- }
- else {
- char str[1024];
- sprintf(str, "Attempt to use CmdBuffer %p that doesn't exist!", (void*)cmdBuffer);
- layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, cmdBuffer, 0, DRAWSTATE_INVALID_CMD_BUFFER, "DS", str);
- }
- nextTable.CmdDrawIndexed(cmdBuffer, firstIndex, indexCount, vertexOffset, firstInstance, instanceCount);
-}
-
-XGL_LAYER_EXPORT void XGLAPI xglCmdDrawIndirect(XGL_CMD_BUFFER cmdBuffer, XGL_BUFFER buffer, XGL_GPU_SIZE offset, uint32_t count, uint32_t stride)
-{
- GLOBAL_CB_NODE* pCB = getCBNode(cmdBuffer);
- if (pCB) {
- updateCBTracking(cmdBuffer);
- addCmd(pCB, CMD_DRAWINDIRECT);
- pCB->drawCount[DRAW_INDIRECT]++;
- char str[1024];
- sprintf(str, "xglCmdDrawIndirect() call #%lu, reporting DS state:", g_drawCount[DRAW_INDIRECT]++);
- layerCbMsg(XGL_DBG_MSG_UNKNOWN, XGL_VALIDATION_LEVEL_0, cmdBuffer, 0, DRAWSTATE_NONE, "DS", str);
- synchAndPrintDSConfig(cmdBuffer);
- }
- else {
- char str[1024];
- sprintf(str, "Attempt to use CmdBuffer %p that doesn't exist!", (void*)cmdBuffer);
- layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, cmdBuffer, 0, DRAWSTATE_INVALID_CMD_BUFFER, "DS", str);
- }
- nextTable.CmdDrawIndirect(cmdBuffer, buffer, offset, count, stride);
-}
-
-XGL_LAYER_EXPORT void XGLAPI xglCmdDrawIndexedIndirect(XGL_CMD_BUFFER cmdBuffer, XGL_BUFFER buffer, XGL_GPU_SIZE offset, uint32_t count, uint32_t stride)
-{
- GLOBAL_CB_NODE* pCB = getCBNode(cmdBuffer);
- if (pCB) {
- updateCBTracking(cmdBuffer);
- addCmd(pCB, CMD_DRAWINDEXEDINDIRECT);
- pCB->drawCount[DRAW_INDEXED_INDIRECT]++;
- char str[1024];
- sprintf(str, "xglCmdDrawIndexedIndirect() call #%lu, reporting DS state:", g_drawCount[DRAW_INDEXED_INDIRECT]++);
- layerCbMsg(XGL_DBG_MSG_UNKNOWN, XGL_VALIDATION_LEVEL_0, cmdBuffer, 0, DRAWSTATE_NONE, "DS", str);
- synchAndPrintDSConfig(cmdBuffer);
- }
- else {
- char str[1024];
- sprintf(str, "Attempt to use CmdBuffer %p that doesn't exist!", (void*)cmdBuffer);
- layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, cmdBuffer, 0, DRAWSTATE_INVALID_CMD_BUFFER, "DS", str);
- }
- nextTable.CmdDrawIndexedIndirect(cmdBuffer, buffer, offset, count, stride);
-}
-
-XGL_LAYER_EXPORT void XGLAPI xglCmdDispatch(XGL_CMD_BUFFER cmdBuffer, uint32_t x, uint32_t y, uint32_t z)
-{
- GLOBAL_CB_NODE* pCB = getCBNode(cmdBuffer);
- if (pCB) {
- updateCBTracking(cmdBuffer);
- addCmd(pCB, CMD_DISPATCH);
- }
- else {
- char str[1024];
- sprintf(str, "Attempt to use CmdBuffer %p that doesn't exist!", (void*)cmdBuffer);
- layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, cmdBuffer, 0, DRAWSTATE_INVALID_CMD_BUFFER, "DS", str);
- }
- nextTable.CmdDispatch(cmdBuffer, x, y, z);
-}
-
-XGL_LAYER_EXPORT void XGLAPI xglCmdDispatchIndirect(XGL_CMD_BUFFER cmdBuffer, XGL_BUFFER buffer, XGL_GPU_SIZE offset)
-{
- GLOBAL_CB_NODE* pCB = getCBNode(cmdBuffer);
- if (pCB) {
- updateCBTracking(cmdBuffer);
- addCmd(pCB, CMD_DISPATCHINDIRECT);
- }
- else {
- char str[1024];
- sprintf(str, "Attempt to use CmdBuffer %p that doesn't exist!", (void*)cmdBuffer);
- layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, cmdBuffer, 0, DRAWSTATE_INVALID_CMD_BUFFER, "DS", str);
- }
- nextTable.CmdDispatchIndirect(cmdBuffer, buffer, offset);
-}
-
-XGL_LAYER_EXPORT void XGLAPI xglCmdCopyBuffer(XGL_CMD_BUFFER cmdBuffer, XGL_BUFFER srcBuffer, XGL_BUFFER destBuffer, uint32_t regionCount, const XGL_BUFFER_COPY* pRegions)
-{
- GLOBAL_CB_NODE* pCB = getCBNode(cmdBuffer);
- if (pCB) {
- updateCBTracking(cmdBuffer);
- addCmd(pCB, CMD_COPYBUFFER);
- }
- else {
- char str[1024];
- sprintf(str, "Attempt to use CmdBuffer %p that doesn't exist!", (void*)cmdBuffer);
- layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, cmdBuffer, 0, DRAWSTATE_INVALID_CMD_BUFFER, "DS", str);
- }
- nextTable.CmdCopyBuffer(cmdBuffer, srcBuffer, destBuffer, regionCount, pRegions);
-}
-
-XGL_LAYER_EXPORT void XGLAPI xglCmdCopyImage(XGL_CMD_BUFFER cmdBuffer,
- XGL_IMAGE srcImage,
- XGL_IMAGE_LAYOUT srcImageLayout,
- XGL_IMAGE destImage,
- XGL_IMAGE_LAYOUT destImageLayout,
- uint32_t regionCount, const XGL_IMAGE_COPY* pRegions)
-{
- GLOBAL_CB_NODE* pCB = getCBNode(cmdBuffer);
- if (pCB) {
- updateCBTracking(cmdBuffer);
- addCmd(pCB, CMD_COPYIMAGE);
- }
- else {
- char str[1024];
- sprintf(str, "Attempt to use CmdBuffer %p that doesn't exist!", (void*)cmdBuffer);
- layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, cmdBuffer, 0, DRAWSTATE_INVALID_CMD_BUFFER, "DS", str);
- }
- nextTable.CmdCopyImage(cmdBuffer, srcImage, srcImageLayout, destImage, destImageLayout, regionCount, pRegions);
-}
-
-XGL_LAYER_EXPORT void XGLAPI xglCmdBlitImage(XGL_CMD_BUFFER cmdBuffer,
- XGL_IMAGE srcImage, XGL_IMAGE_LAYOUT srcImageLayout,
- XGL_IMAGE destImage, XGL_IMAGE_LAYOUT destImageLayout,
- uint32_t regionCount, const XGL_IMAGE_BLIT* pRegions)
-{
- GLOBAL_CB_NODE* pCB = getCBNode(cmdBuffer);
- if (pCB) {
- updateCBTracking(cmdBuffer);
- addCmd(pCB, CMD_COPYIMAGE);
- }
- else {
- char str[1024];
- sprintf(str, "Attempt to use CmdBuffer %p that doesn't exist!", (void*)cmdBuffer);
- layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, cmdBuffer, 0, DRAWSTATE_INVALID_CMD_BUFFER, "DS", str);
- }
- nextTable.CmdBlitImage(cmdBuffer, srcImage, srcImageLayout, destImage, destImageLayout, regionCount, pRegions);
-}
-
-XGL_LAYER_EXPORT void XGLAPI xglCmdCopyBufferToImage(XGL_CMD_BUFFER cmdBuffer,
- XGL_BUFFER srcBuffer,
- XGL_IMAGE destImage, XGL_IMAGE_LAYOUT destImageLayout,
- uint32_t regionCount, const XGL_BUFFER_IMAGE_COPY* pRegions)
-{
- GLOBAL_CB_NODE* pCB = getCBNode(cmdBuffer);
- if (pCB) {
- updateCBTracking(cmdBuffer);
- addCmd(pCB, CMD_COPYBUFFERTOIMAGE);
- }
- else {
- char str[1024];
- sprintf(str, "Attempt to use CmdBuffer %p that doesn't exist!", (void*)cmdBuffer);
- layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, cmdBuffer, 0, DRAWSTATE_INVALID_CMD_BUFFER, "DS", str);
- }
- nextTable.CmdCopyBufferToImage(cmdBuffer, srcBuffer, destImage, destImageLayout, regionCount, pRegions);
-}
-
-XGL_LAYER_EXPORT void XGLAPI xglCmdCopyImageToBuffer(XGL_CMD_BUFFER cmdBuffer,
- XGL_IMAGE srcImage, XGL_IMAGE_LAYOUT srcImageLayout,
- XGL_BUFFER destBuffer,
- uint32_t regionCount, const XGL_BUFFER_IMAGE_COPY* pRegions)
-{
- GLOBAL_CB_NODE* pCB = getCBNode(cmdBuffer);
- if (pCB) {
- updateCBTracking(cmdBuffer);
- addCmd(pCB, CMD_COPYIMAGETOBUFFER);
- }
- else {
- char str[1024];
- sprintf(str, "Attempt to use CmdBuffer %p that doesn't exist!", (void*)cmdBuffer);
- layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, cmdBuffer, 0, DRAWSTATE_INVALID_CMD_BUFFER, "DS", str);
- }
- nextTable.CmdCopyImageToBuffer(cmdBuffer, srcImage, srcImageLayout, destBuffer, regionCount, pRegions);
-}
-
-XGL_LAYER_EXPORT void XGLAPI xglCmdCloneImageData(XGL_CMD_BUFFER cmdBuffer, XGL_IMAGE srcImage, XGL_IMAGE_LAYOUT srcImageLayout, XGL_IMAGE destImage, XGL_IMAGE_LAYOUT destImageLayout)
-{
- GLOBAL_CB_NODE* pCB = getCBNode(cmdBuffer);
- if (pCB) {
- updateCBTracking(cmdBuffer);
- addCmd(pCB, CMD_CLONEIMAGEDATA);
- }
- else {
- char str[1024];
- sprintf(str, "Attempt to use CmdBuffer %p that doesn't exist!", (void*)cmdBuffer);
- layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, cmdBuffer, 0, DRAWSTATE_INVALID_CMD_BUFFER, "DS", str);
- }
- nextTable.CmdCloneImageData(cmdBuffer, srcImage, srcImageLayout, destImage, destImageLayout);
-}
-
-XGL_LAYER_EXPORT void XGLAPI xglCmdUpdateBuffer(XGL_CMD_BUFFER cmdBuffer, XGL_BUFFER destBuffer, XGL_GPU_SIZE destOffset, XGL_GPU_SIZE dataSize, const uint32_t* pData)
-{
- GLOBAL_CB_NODE* pCB = getCBNode(cmdBuffer);
- if (pCB) {
- updateCBTracking(cmdBuffer);
- addCmd(pCB, CMD_UPDATEBUFFER);
- }
- else {
- char str[1024];
- sprintf(str, "Attempt to use CmdBuffer %p that doesn't exist!", (void*)cmdBuffer);
- layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, cmdBuffer, 0, DRAWSTATE_INVALID_CMD_BUFFER, "DS", str);
- }
- nextTable.CmdUpdateBuffer(cmdBuffer, destBuffer, destOffset, dataSize, pData);
-}
-
-XGL_LAYER_EXPORT void XGLAPI xglCmdFillBuffer(XGL_CMD_BUFFER cmdBuffer, XGL_BUFFER destBuffer, XGL_GPU_SIZE destOffset, XGL_GPU_SIZE fillSize, uint32_t data)
-{
- GLOBAL_CB_NODE* pCB = getCBNode(cmdBuffer);
- if (pCB) {
- updateCBTracking(cmdBuffer);
- addCmd(pCB, CMD_FILLBUFFER);
- }
- else {
- char str[1024];
- sprintf(str, "Attempt to use CmdBuffer %p that doesn't exist!", (void*)cmdBuffer);
- layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, cmdBuffer, 0, DRAWSTATE_INVALID_CMD_BUFFER, "DS", str);
- }
- nextTable.CmdFillBuffer(cmdBuffer, destBuffer, destOffset, fillSize, data);
-}
-
-XGL_LAYER_EXPORT void XGLAPI xglCmdClearColorImage(XGL_CMD_BUFFER cmdBuffer,
- XGL_IMAGE image, XGL_IMAGE_LAYOUT imageLayout,
- XGL_CLEAR_COLOR color,
- uint32_t rangeCount, const XGL_IMAGE_SUBRESOURCE_RANGE* pRanges)
-{
- GLOBAL_CB_NODE* pCB = getCBNode(cmdBuffer);
- if (pCB) {
- updateCBTracking(cmdBuffer);
- addCmd(pCB, CMD_CLEARCOLORIMAGE);
- }
- else {
- char str[1024];
- sprintf(str, "Attempt to use CmdBuffer %p that doesn't exist!", (void*)cmdBuffer);
- layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, cmdBuffer, 0, DRAWSTATE_INVALID_CMD_BUFFER, "DS", str);
- }
- nextTable.CmdClearColorImage(cmdBuffer, image, imageLayout, color, rangeCount, pRanges);
-}
-
-XGL_LAYER_EXPORT void XGLAPI xglCmdClearDepthStencil(XGL_CMD_BUFFER cmdBuffer,
- XGL_IMAGE image, XGL_IMAGE_LAYOUT imageLayout,
- float depth, uint32_t stencil,
- uint32_t rangeCount, const XGL_IMAGE_SUBRESOURCE_RANGE* pRanges)
-{
- GLOBAL_CB_NODE* pCB = getCBNode(cmdBuffer);
- if (pCB) {
- updateCBTracking(cmdBuffer);
- addCmd(pCB, CMD_CLEARDEPTHSTENCIL);
- }
- else {
- char str[1024];
- sprintf(str, "Attempt to use CmdBuffer %p that doesn't exist!", (void*)cmdBuffer);
- layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, cmdBuffer, 0, DRAWSTATE_INVALID_CMD_BUFFER, "DS", str);
- }
- nextTable.CmdClearDepthStencil(cmdBuffer, image, imageLayout, depth, stencil, rangeCount, pRanges);
-}
-
-XGL_LAYER_EXPORT void XGLAPI xglCmdResolveImage(XGL_CMD_BUFFER cmdBuffer,
- XGL_IMAGE srcImage, XGL_IMAGE_LAYOUT srcImageLayout,
- XGL_IMAGE destImage, XGL_IMAGE_LAYOUT destImageLayout,
- uint32_t rectCount, const XGL_IMAGE_RESOLVE* pRects)
-{
- GLOBAL_CB_NODE* pCB = getCBNode(cmdBuffer);
- if (pCB) {
- updateCBTracking(cmdBuffer);
- addCmd(pCB, CMD_RESOLVEIMAGE);
- }
- else {
- char str[1024];
- sprintf(str, "Attempt to use CmdBuffer %p that doesn't exist!", (void*)cmdBuffer);
- layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, cmdBuffer, 0, DRAWSTATE_INVALID_CMD_BUFFER, "DS", str);
- }
- nextTable.CmdResolveImage(cmdBuffer, srcImage, srcImageLayout, destImage, destImageLayout, rectCount, pRects);
-}
-
-XGL_LAYER_EXPORT void XGLAPI xglCmdSetEvent(XGL_CMD_BUFFER cmdBuffer, XGL_EVENT event, XGL_PIPE_EVENT pipeEvent)
-{
- GLOBAL_CB_NODE* pCB = getCBNode(cmdBuffer);
- if (pCB) {
- updateCBTracking(cmdBuffer);
- addCmd(pCB, CMD_SETEVENT);
- }
- else {
- char str[1024];
- sprintf(str, "Attempt to use CmdBuffer %p that doesn't exist!", (void*)cmdBuffer);
- layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, cmdBuffer, 0, DRAWSTATE_INVALID_CMD_BUFFER, "DS", str);
- }
- nextTable.CmdSetEvent(cmdBuffer, event, pipeEvent);
-}
-
-XGL_LAYER_EXPORT void XGLAPI xglCmdResetEvent(XGL_CMD_BUFFER cmdBuffer, XGL_EVENT event, XGL_PIPE_EVENT pipeEvent)
-{
- GLOBAL_CB_NODE* pCB = getCBNode(cmdBuffer);
- if (pCB) {
- updateCBTracking(cmdBuffer);
- addCmd(pCB, CMD_RESETEVENT);
- }
- else {
- char str[1024];
- sprintf(str, "Attempt to use CmdBuffer %p that doesn't exist!", (void*)cmdBuffer);
- layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, cmdBuffer, 0, DRAWSTATE_INVALID_CMD_BUFFER, "DS", str);
- }
- nextTable.CmdResetEvent(cmdBuffer, event, pipeEvent);
-}
-
-XGL_LAYER_EXPORT void XGLAPI xglCmdWaitEvents(XGL_CMD_BUFFER cmdBuffer, const XGL_EVENT_WAIT_INFO* pWaitInfo)
-{
- GLOBAL_CB_NODE* pCB = getCBNode(cmdBuffer);
- if (pCB) {
- updateCBTracking(cmdBuffer);
- addCmd(pCB, CMD_WAITEVENTS);
- }
- else {
- char str[1024];
- sprintf(str, "Attempt to use CmdBuffer %p that doesn't exist!", (void*)cmdBuffer);
- layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, cmdBuffer, 0, DRAWSTATE_INVALID_CMD_BUFFER, "DS", str);
- }
- nextTable.CmdWaitEvents(cmdBuffer, pWaitInfo);
-}
-
-XGL_LAYER_EXPORT void XGLAPI xglCmdPipelineBarrier(XGL_CMD_BUFFER cmdBuffer, const XGL_PIPELINE_BARRIER* pBarrier)
-{
- GLOBAL_CB_NODE* pCB = getCBNode(cmdBuffer);
- if (pCB) {
- updateCBTracking(cmdBuffer);
- addCmd(pCB, CMD_PIPELINEBARRIER);
- }
- else {
- char str[1024];
- sprintf(str, "Attempt to use CmdBuffer %p that doesn't exist!", (void*)cmdBuffer);
- layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, cmdBuffer, 0, DRAWSTATE_INVALID_CMD_BUFFER, "DS", str);
- }
- nextTable.CmdPipelineBarrier(cmdBuffer, pBarrier);
-}
-
-XGL_LAYER_EXPORT void XGLAPI xglCmdBeginQuery(XGL_CMD_BUFFER cmdBuffer, XGL_QUERY_POOL queryPool, uint32_t slot, XGL_FLAGS flags)
-{
- GLOBAL_CB_NODE* pCB = getCBNode(cmdBuffer);
- if (pCB) {
- updateCBTracking(cmdBuffer);
- addCmd(pCB, CMD_BEGINQUERY);
- }
- else {
- char str[1024];
- sprintf(str, "Attempt to use CmdBuffer %p that doesn't exist!", (void*)cmdBuffer);
- layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, cmdBuffer, 0, DRAWSTATE_INVALID_CMD_BUFFER, "DS", str);
- }
- nextTable.CmdBeginQuery(cmdBuffer, queryPool, slot, flags);
-}
-
-XGL_LAYER_EXPORT void XGLAPI xglCmdEndQuery(XGL_CMD_BUFFER cmdBuffer, XGL_QUERY_POOL queryPool, uint32_t slot)
-{
- GLOBAL_CB_NODE* pCB = getCBNode(cmdBuffer);
- if (pCB) {
- updateCBTracking(cmdBuffer);
- addCmd(pCB, CMD_ENDQUERY);
- }
- else {
- char str[1024];
- sprintf(str, "Attempt to use CmdBuffer %p that doesn't exist!", (void*)cmdBuffer);
- layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, cmdBuffer, 0, DRAWSTATE_INVALID_CMD_BUFFER, "DS", str);
- }
- nextTable.CmdEndQuery(cmdBuffer, queryPool, slot);
-}
-
-XGL_LAYER_EXPORT void XGLAPI xglCmdResetQueryPool(XGL_CMD_BUFFER cmdBuffer, XGL_QUERY_POOL queryPool, uint32_t startQuery, uint32_t queryCount)
-{
- GLOBAL_CB_NODE* pCB = getCBNode(cmdBuffer);
- if (pCB) {
- updateCBTracking(cmdBuffer);
- addCmd(pCB, CMD_RESETQUERYPOOL);
- }
- else {
- char str[1024];
- sprintf(str, "Attempt to use CmdBuffer %p that doesn't exist!", (void*)cmdBuffer);
- layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, cmdBuffer, 0, DRAWSTATE_INVALID_CMD_BUFFER, "DS", str);
- }
- nextTable.CmdResetQueryPool(cmdBuffer, queryPool, startQuery, queryCount);
-}
-
-XGL_LAYER_EXPORT void XGLAPI xglCmdWriteTimestamp(XGL_CMD_BUFFER cmdBuffer, XGL_TIMESTAMP_TYPE timestampType, XGL_BUFFER destBuffer, XGL_GPU_SIZE destOffset)
-{
- GLOBAL_CB_NODE* pCB = getCBNode(cmdBuffer);
- if (pCB) {
- updateCBTracking(cmdBuffer);
- addCmd(pCB, CMD_WRITETIMESTAMP);
- }
- else {
- char str[1024];
- sprintf(str, "Attempt to use CmdBuffer %p that doesn't exist!", (void*)cmdBuffer);
- layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, cmdBuffer, 0, DRAWSTATE_INVALID_CMD_BUFFER, "DS", str);
- }
- nextTable.CmdWriteTimestamp(cmdBuffer, timestampType, destBuffer, destOffset);
-}
-
-XGL_LAYER_EXPORT void XGLAPI xglCmdInitAtomicCounters(XGL_CMD_BUFFER cmdBuffer, XGL_PIPELINE_BIND_POINT pipelineBindPoint, uint32_t startCounter, uint32_t counterCount, const uint32_t* pData)
-{
- GLOBAL_CB_NODE* pCB = getCBNode(cmdBuffer);
- if (pCB) {
- updateCBTracking(cmdBuffer);
- addCmd(pCB, CMD_INITATOMICCOUNTERS);
- }
- else {
- char str[1024];
- sprintf(str, "Attempt to use CmdBuffer %p that doesn't exist!", (void*)cmdBuffer);
- layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, cmdBuffer, 0, DRAWSTATE_INVALID_CMD_BUFFER, "DS", str);
- }
- nextTable.CmdInitAtomicCounters(cmdBuffer, pipelineBindPoint, startCounter, counterCount, pData);
-}
-
-XGL_LAYER_EXPORT void XGLAPI xglCmdLoadAtomicCounters(XGL_CMD_BUFFER cmdBuffer, XGL_PIPELINE_BIND_POINT pipelineBindPoint, uint32_t startCounter, uint32_t counterCount, XGL_BUFFER srcBuffer, XGL_GPU_SIZE srcOffset)
-{
- GLOBAL_CB_NODE* pCB = getCBNode(cmdBuffer);
- if (pCB) {
- updateCBTracking(cmdBuffer);
- addCmd(pCB, CMD_LOADATOMICCOUNTERS);
- }
- else {
- char str[1024];
- sprintf(str, "Attempt to use CmdBuffer %p that doesn't exist!", (void*)cmdBuffer);
- layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, cmdBuffer, 0, DRAWSTATE_INVALID_CMD_BUFFER, "DS", str);
- }
- nextTable.CmdLoadAtomicCounters(cmdBuffer, pipelineBindPoint, startCounter, counterCount, srcBuffer, srcOffset);
-}
-
-XGL_LAYER_EXPORT void XGLAPI xglCmdSaveAtomicCounters(XGL_CMD_BUFFER cmdBuffer, XGL_PIPELINE_BIND_POINT pipelineBindPoint, uint32_t startCounter, uint32_t counterCount, XGL_BUFFER destBuffer, XGL_GPU_SIZE destOffset)
-{
- GLOBAL_CB_NODE* pCB = getCBNode(cmdBuffer);
- if (pCB) {
- updateCBTracking(cmdBuffer);
- addCmd(pCB, CMD_SAVEATOMICCOUNTERS);
- }
- else {
- char str[1024];
- sprintf(str, "Attempt to use CmdBuffer %p that doesn't exist!", (void*)cmdBuffer);
- layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, cmdBuffer, 0, DRAWSTATE_INVALID_CMD_BUFFER, "DS", str);
- }
- nextTable.CmdSaveAtomicCounters(cmdBuffer, pipelineBindPoint, startCounter, counterCount, destBuffer, destOffset);
-}
-
-XGL_LAYER_EXPORT void XGLAPI xglCmdBeginRenderPass(XGL_CMD_BUFFER cmdBuffer, const XGL_RENDER_PASS_BEGIN *pRenderPassBegin)
-{
- GLOBAL_CB_NODE* pCB = getCBNode(cmdBuffer);
- if (pCB) {
- updateCBTracking(cmdBuffer);
- addCmd(pCB, CMD_BEGINRENDERPASS);
- }
- else {
- char str[1024];
- sprintf(str, "Attempt to use CmdBuffer %p that doesn't exist!", (void*)cmdBuffer);
- layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, cmdBuffer, 0, DRAWSTATE_INVALID_CMD_BUFFER, "DS", str);
- }
- nextTable.CmdBeginRenderPass(cmdBuffer, pRenderPassBegin);
-}
-
-XGL_LAYER_EXPORT void XGLAPI xglCmdEndRenderPass(XGL_CMD_BUFFER cmdBuffer, XGL_RENDER_PASS renderPass)
-{
- GLOBAL_CB_NODE* pCB = getCBNode(cmdBuffer);
- if (pCB) {
- updateCBTracking(cmdBuffer);
- addCmd(pCB, CMD_ENDRENDERPASS);
- }
- else {
- char str[1024];
- sprintf(str, "Attempt to use CmdBuffer %p that doesn't exist!", (void*)cmdBuffer);
- layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, cmdBuffer, 0, DRAWSTATE_INVALID_CMD_BUFFER, "DS", str);
- }
- nextTable.CmdEndRenderPass(cmdBuffer, renderPass);
-}
-
-XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglDbgRegisterMsgCallback(XGL_INSTANCE instance, XGL_DBG_MSG_CALLBACK_FUNCTION pfnMsgCallback, void* pUserData)
-{
- // This layer intercepts callbacks
- XGL_LAYER_DBG_FUNCTION_NODE* pNewDbgFuncNode = (XGL_LAYER_DBG_FUNCTION_NODE*)malloc(sizeof(XGL_LAYER_DBG_FUNCTION_NODE));
-#if ALLOC_DEBUG
- printf("Alloc34 #%lu pNewDbgFuncNode addr(%p)\n", ++g_alloc_count, (void*)pNewDbgFuncNode);
-#endif
- if (!pNewDbgFuncNode)
- return XGL_ERROR_OUT_OF_MEMORY;
- pNewDbgFuncNode->pfnMsgCallback = pfnMsgCallback;
- pNewDbgFuncNode->pUserData = pUserData;
- pNewDbgFuncNode->pNext = g_pDbgFunctionHead;
- g_pDbgFunctionHead = pNewDbgFuncNode;
- // force callbacks if DebugAction hasn't been set already other than initial value
- if (g_actionIsDefault) {
- g_debugAction = XGL_DBG_LAYER_ACTION_CALLBACK;
- }
- XGL_RESULT result = nextTable.DbgRegisterMsgCallback(instance, pfnMsgCallback, pUserData);
- return result;
-}
-
-XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglDbgUnregisterMsgCallback(XGL_INSTANCE instance, XGL_DBG_MSG_CALLBACK_FUNCTION pfnMsgCallback)
-{
- XGL_LAYER_DBG_FUNCTION_NODE *pTrav = g_pDbgFunctionHead;
- XGL_LAYER_DBG_FUNCTION_NODE *pPrev = pTrav;
- while (pTrav) {
- if (pTrav->pfnMsgCallback == pfnMsgCallback) {
- pPrev->pNext = pTrav->pNext;
- if (g_pDbgFunctionHead == pTrav)
- g_pDbgFunctionHead = pTrav->pNext;
-#if ALLOC_DEBUG
- printf("Free34 #%lu pNewDbgFuncNode addr(%p)\n", ++g_alloc_count, (void*)pTrav);
-#endif
- free(pTrav);
- break;
- }
- pPrev = pTrav;
- pTrav = pTrav->pNext;
- }
- if (g_pDbgFunctionHead == NULL)
- {
- if (g_actionIsDefault)
- g_debugAction = XGL_DBG_LAYER_ACTION_LOG_MSG;
- else
- g_debugAction &= ~XGL_DBG_LAYER_ACTION_CALLBACK;
- }
- XGL_RESULT result = nextTable.DbgUnregisterMsgCallback(instance, pfnMsgCallback);
- return result;
-}
-
-XGL_LAYER_EXPORT void XGLAPI xglCmdDbgMarkerBegin(XGL_CMD_BUFFER cmdBuffer, const char* pMarker)
-{
- GLOBAL_CB_NODE* pCB = getCBNode(cmdBuffer);
- if (pCB) {
- updateCBTracking(cmdBuffer);
- addCmd(pCB, CMD_DBGMARKERBEGIN);
- }
- else {
- char str[1024];
- sprintf(str, "Attempt to use CmdBuffer %p that doesn't exist!", (void*)cmdBuffer);
- layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, cmdBuffer, 0, DRAWSTATE_INVALID_CMD_BUFFER, "DS", str);
- }
- nextTable.CmdDbgMarkerBegin(cmdBuffer, pMarker);
-}
-
-XGL_LAYER_EXPORT void XGLAPI xglCmdDbgMarkerEnd(XGL_CMD_BUFFER cmdBuffer)
-{
- GLOBAL_CB_NODE* pCB = getCBNode(cmdBuffer);
- if (pCB) {
- updateCBTracking(cmdBuffer);
- addCmd(pCB, CMD_DBGMARKEREND);
- }
- else {
- char str[1024];
- sprintf(str, "Attempt to use CmdBuffer %p that doesn't exist!", (void*)cmdBuffer);
- layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, cmdBuffer, 0, DRAWSTATE_INVALID_CMD_BUFFER, "DS", str);
- }
- nextTable.CmdDbgMarkerEnd(cmdBuffer);
-}
-
-// TODO : Want to pass in a cmdBuffer here based on which state to display
-void drawStateDumpDotFile(char* outFileName)
-{
- // TODO : Currently just setting cmdBuffer based on global var
- //dumpDotFile(g_lastDrawStateCmdBuffer, outFileName);
- dumpGlobalDotFile(outFileName);
-}
-
-void drawStateDumpCommandBufferDotFile(char* outFileName)
-{
- cbDumpDotFile(outFileName);
-}
-
-void drawStateDumpPngFile(char* outFileName)
-{
-#if defined(_WIN32)
-// FIXME: NEED WINDOWS EQUIVALENT
- char str[1024];
- sprintf(str, "Cannot execute dot program yet on Windows.");
- layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, NULL, 0, DRAWSTATE_MISSING_DOT_PROGRAM, "DS", str);
-#else // WIN32
- char dotExe[32] = "/usr/bin/dot";
- if( access(dotExe, X_OK) != -1) {
- dumpDotFile(g_lastCmdBuffer[getTIDIndex()], "/tmp/tmp.dot");
- char dotCmd[1024];
- sprintf(dotCmd, "%s /tmp/tmp.dot -Tpng -o %s", dotExe, outFileName);
- system(dotCmd);
- remove("/tmp/tmp.dot");
- }
- else {
- char str[1024];
- sprintf(str, "Cannot execute dot program at (%s) to dump requested %s file.", dotExe, outFileName);
- layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, NULL, 0, DRAWSTATE_MISSING_DOT_PROGRAM, "DS", str);
- }
-#endif // WIN32
-}
-
-XGL_LAYER_EXPORT void* XGLAPI xglGetProcAddr(XGL_PHYSICAL_GPU gpu, const char* funcName)
-{
- XGL_BASE_LAYER_OBJECT* gpuw = (XGL_BASE_LAYER_OBJECT *) gpu;
-
- if (gpu == NULL)
- return NULL;
- pCurObj = gpuw;
- loader_platform_thread_once(&g_initOnce, initDrawState);
-
- if (!strcmp(funcName, "xglGetProcAddr"))
- return (void *) xglGetProcAddr;
- if (!strcmp(funcName, "xglCreateDevice"))
- return (void*) xglCreateDevice;
- if (!strcmp(funcName, "xglDestroyDevice"))
- return (void*) xglDestroyDevice;
- if (!strcmp(funcName, "xglEnumerateLayers"))
- return (void*) xglEnumerateLayers;
- if (!strcmp(funcName, "xglQueueSubmit"))
- return (void*) xglQueueSubmit;
- if (!strcmp(funcName, "xglDestroyObject"))
- return (void*) xglDestroyObject;
- if (!strcmp(funcName, "xglCreateBufferView"))
- return (void*) xglCreateBufferView;
- if (!strcmp(funcName, "xglCreateImageView"))
- return (void*) xglCreateImageView;
- if (!strcmp(funcName, "xglCreateGraphicsPipeline"))
- return (void*) xglCreateGraphicsPipeline;
- if (!strcmp(funcName, "xglCreateGraphicsPipelineDerivative"))
- return (void*) xglCreateGraphicsPipelineDerivative;
- if (!strcmp(funcName, "xglCreateSampler"))
- return (void*) xglCreateSampler;
- if (!strcmp(funcName, "xglCreateDescriptorSetLayout"))
- return (void*) xglCreateDescriptorSetLayout;
- if (!strcmp(funcName, "xglBeginDescriptorRegionUpdate"))
- return (void*) xglBeginDescriptorRegionUpdate;
- if (!strcmp(funcName, "xglEndDescriptorRegionUpdate"))
- return (void*) xglEndDescriptorRegionUpdate;
- if (!strcmp(funcName, "xglCreateDescriptorRegion"))
- return (void*) xglCreateDescriptorRegion;
- if (!strcmp(funcName, "xglClearDescriptorRegion"))
- return (void*) xglClearDescriptorRegion;
- if (!strcmp(funcName, "xglAllocDescriptorSets"))
- return (void*) xglAllocDescriptorSets;
- if (!strcmp(funcName, "xglClearDescriptorSets"))
- return (void*) xglClearDescriptorSets;
- if (!strcmp(funcName, "xglUpdateDescriptors"))
- return (void*) xglUpdateDescriptors;
- if (!strcmp(funcName, "xglCreateDynamicViewportState"))
- return (void*) xglCreateDynamicViewportState;
- if (!strcmp(funcName, "xglCreateDynamicRasterState"))
- return (void*) xglCreateDynamicRasterState;
- if (!strcmp(funcName, "xglCreateDynamicColorBlendState"))
- return (void*) xglCreateDynamicColorBlendState;
- if (!strcmp(funcName, "xglCreateDynamicDepthStencilState"))
- return (void*) xglCreateDynamicDepthStencilState;
- if (!strcmp(funcName, "xglCreateCommandBuffer"))
- return (void*) xglCreateCommandBuffer;
- if (!strcmp(funcName, "xglBeginCommandBuffer"))
- return (void*) xglBeginCommandBuffer;
- if (!strcmp(funcName, "xglEndCommandBuffer"))
- return (void*) xglEndCommandBuffer;
- if (!strcmp(funcName, "xglResetCommandBuffer"))
- return (void*) xglResetCommandBuffer;
- if (!strcmp(funcName, "xglCmdBindPipeline"))
- return (void*) xglCmdBindPipeline;
- if (!strcmp(funcName, "xglCmdBindDynamicStateObject"))
- return (void*) xglCmdBindDynamicStateObject;
- if (!strcmp(funcName, "xglCmdBindDescriptorSet"))
- return (void*) xglCmdBindDescriptorSet;
- if (!strcmp(funcName, "xglCmdBindVertexBuffer"))
- return (void*) xglCmdBindVertexBuffer;
- if (!strcmp(funcName, "xglCmdBindIndexBuffer"))
- return (void*) xglCmdBindIndexBuffer;
- if (!strcmp(funcName, "xglCmdDraw"))
- return (void*) xglCmdDraw;
- if (!strcmp(funcName, "xglCmdDrawIndexed"))
- return (void*) xglCmdDrawIndexed;
- if (!strcmp(funcName, "xglCmdDrawIndirect"))
- return (void*) xglCmdDrawIndirect;
- if (!strcmp(funcName, "xglCmdDrawIndexedIndirect"))
- return (void*) xglCmdDrawIndexedIndirect;
- if (!strcmp(funcName, "xglCmdDispatch"))
- return (void*) xglCmdDispatch;
- if (!strcmp(funcName, "xglCmdDispatchIndirect"))
- return (void*) xglCmdDispatchIndirect;
- if (!strcmp(funcName, "xglCmdCopyBuffer"))
- return (void*) xglCmdCopyBuffer;
- if (!strcmp(funcName, "xglCmdCopyImage"))
- return (void*) xglCmdCopyImage;
- if (!strcmp(funcName, "xglCmdCopyBufferToImage"))
- return (void*) xglCmdCopyBufferToImage;
- if (!strcmp(funcName, "xglCmdCopyImageToBuffer"))
- return (void*) xglCmdCopyImageToBuffer;
- if (!strcmp(funcName, "xglCmdCloneImageData"))
- return (void*) xglCmdCloneImageData;
- if (!strcmp(funcName, "xglCmdUpdateBuffer"))
- return (void*) xglCmdUpdateBuffer;
- if (!strcmp(funcName, "xglCmdFillBuffer"))
- return (void*) xglCmdFillBuffer;
- if (!strcmp(funcName, "xglCmdClearColorImage"))
- return (void*) xglCmdClearColorImage;
- if (!strcmp(funcName, "xglCmdClearDepthStencil"))
- return (void*) xglCmdClearDepthStencil;
- if (!strcmp(funcName, "xglCmdResolveImage"))
- return (void*) xglCmdResolveImage;
- if (!strcmp(funcName, "xglCmdSetEvent"))
- return (void*) xglCmdSetEvent;
- if (!strcmp(funcName, "xglCmdResetEvent"))
- return (void*) xglCmdResetEvent;
- if (!strcmp(funcName, "xglCmdWaitEvents"))
- return (void*) xglCmdWaitEvents;
- if (!strcmp(funcName, "xglCmdPipelineBarrier"))
- return (void*) xglCmdPipelineBarrier;
- if (!strcmp(funcName, "xglCmdBeginQuery"))
- return (void*) xglCmdBeginQuery;
- if (!strcmp(funcName, "xglCmdEndQuery"))
- return (void*) xglCmdEndQuery;
- if (!strcmp(funcName, "xglCmdResetQueryPool"))
- return (void*) xglCmdResetQueryPool;
- if (!strcmp(funcName, "xglCmdWriteTimestamp"))
- return (void*) xglCmdWriteTimestamp;
- if (!strcmp(funcName, "xglCmdInitAtomicCounters"))
- return (void*) xglCmdInitAtomicCounters;
- if (!strcmp(funcName, "xglCmdLoadAtomicCounters"))
- return (void*) xglCmdLoadAtomicCounters;
- if (!strcmp(funcName, "xglCmdSaveAtomicCounters"))
- return (void*) xglCmdSaveAtomicCounters;
- if (!strcmp(funcName, "xglCmdBeginRenderPass"))
- return (void*) xglCmdBeginRenderPass;
- if (!strcmp(funcName, "xglCmdEndRenderPass"))
- return (void*) xglCmdEndRenderPass;
- if (!strcmp(funcName, "xglDbgRegisterMsgCallback"))
- return (void*) xglDbgRegisterMsgCallback;
- if (!strcmp(funcName, "xglDbgUnregisterMsgCallback"))
- return (void*) xglDbgUnregisterMsgCallback;
- if (!strcmp(funcName, "xglCmdDbgMarkerBegin"))
- return (void*) xglCmdDbgMarkerBegin;
- if (!strcmp(funcName, "xglCmdDbgMarkerEnd"))
- return (void*) xglCmdDbgMarkerEnd;
- if (!strcmp("drawStateDumpDotFile", funcName))
- return drawStateDumpDotFile;
- if (!strcmp("drawStateDumpCommandBufferDotFile", funcName))
- return drawStateDumpCommandBufferDotFile;
- if (!strcmp("drawStateDumpPngFile", funcName))
- return drawStateDumpPngFile;
- else {
- if (gpuw->pGPA == NULL)
- return NULL;
- return gpuw->pGPA(gpuw->nextObject, funcName);
- }
-}
diff --git a/layers/draw_state.cpp b/layers/draw_state.cpp
index 520b6a3..bbbcb58 100644
--- a/layers/draw_state.cpp
+++ b/layers/draw_state.cpp
@@ -46,9 +46,10 @@
unordered_map<XGL_BUFFER_VIEW, BUFFER_NODE*> bufferMap;
unordered_map<XGL_DYNAMIC_STATE_OBJECT, DYNAMIC_STATE_NODE*> dynamicStateMap;
unordered_map<XGL_PIPELINE, PIPELINE_NODE*> pipelineMap;
-unordered_map<XGL_DESCRIPTOR_REGION, REGION_NODE*> regionMap;
+unordered_map<XGL_DESCRIPTOR_POOL, POOL_NODE*> poolMap;
unordered_map<XGL_DESCRIPTOR_SET, SET_NODE*> setMap;
unordered_map<XGL_DESCRIPTOR_SET_LAYOUT, LAYOUT_NODE*> layoutMap;
+// Map for layout chains
unordered_map<XGL_CMD_BUFFER, GLOBAL_CB_NODE*> cmdBufferMap;
unordered_map<XGL_RENDER_PASS, XGL_RENDER_PASS_CREATE_INFO*> renderPassMap;
unordered_map<XGL_FRAMEBUFFER, XGL_FRAMEBUFFER_CREATE_INFO*> frameBufferMap;
@@ -92,8 +93,8 @@
return "CMD_BINDPIPELINEDELTA";
case CMD_BINDDYNAMICSTATEOBJECT:
return "CMD_BINDDYNAMICSTATEOBJECT";
- case CMD_BINDDESCRIPTORSET:
- return "CMD_BINDDESCRIPTORSET";
+ case CMD_BINDDESCRIPTORSETS:
+ return "CMD_BINDDESCRIPTORSETS";
case CMD_BINDINDEXBUFFER:
return "CMD_BINDINDEXBUFFER";
case CMD_BINDVERTEXBUFFER:
@@ -114,6 +115,8 @@
return "CMD_COPYBUFFER";
case CMD_COPYIMAGE:
return "CMD_COPYIMAGE";
+ case CMD_BLITIMAGE:
+ return "CMD_BLITIMAGE";
case CMD_COPYBUFFERTOIMAGE:
return "CMD_COPYBUFFERTOIMAGE";
case CMD_COPYIMAGETOBUFFER:
@@ -527,16 +530,16 @@
// Block of code at start here specifically for managing/tracking DSs
-// Return Region node ptr for specified region or else NULL
-static REGION_NODE* getRegionNode(XGL_DESCRIPTOR_REGION region)
+// Return Pool node ptr for specified pool or else NULL
+static POOL_NODE* getPoolNode(XGL_DESCRIPTOR_POOL pool)
{
loader_platform_thread_lock_mutex(&globalLock);
- if (regionMap.find(region) == regionMap.end()) {
+ if (poolMap.find(pool) == poolMap.end()) {
loader_platform_thread_unlock_mutex(&globalLock);
return NULL;
}
loader_platform_thread_unlock_mutex(&globalLock);
- return regionMap[region];
+ return poolMap[pool];
}
// Return Set node ptr for specified set or else NULL
static SET_NODE* getSetNode(XGL_DESCRIPTOR_SET set)
@@ -550,21 +553,21 @@
return setMap[set];
}
-// Return XGL_TRUE if DS Exists and is within an xglBeginDescriptorRegionUpdate() call sequence, otherwise XGL_FALSE
+// Return XGL_TRUE if DS Exists and is within an xglBeginDescriptorPoolUpdate() call sequence, otherwise XGL_FALSE
static bool32_t dsUpdateActive(XGL_DESCRIPTOR_SET ds)
{
// Note, both "get" functions use global mutex so this guy does not
SET_NODE* pTrav = getSetNode(ds);
if (pTrav) {
- REGION_NODE* pRegion = getRegionNode(pTrav->region);
- if (pRegion) {
- return pRegion->updateActive;
+ POOL_NODE* pPool = getPoolNode(pTrav->pool);
+ if (pPool) {
+ return pPool->updateActive;
}
}
return XGL_FALSE;
}
-static LAYOUT_NODE* getLayoutNode(XGL_DESCRIPTOR_SET_LAYOUT layout) {
+static LAYOUT_NODE* getLayoutNode(const XGL_DESCRIPTOR_SET_LAYOUT layout) {
loader_platform_thread_lock_mutex(&globalLock);
if (layoutMap.find(layout) == layoutMap.end()) {
loader_platform_thread_unlock_mutex(&globalLock);
@@ -574,54 +577,105 @@
return layoutMap[layout];
}
-static uint32_t getUpdateIndex(GENERIC_HEADER* pUpdateStruct)
+// For given update struct, return binding
+static uint32_t getUpdateBinding(const GENERIC_HEADER* pUpdateStruct)
{
switch (pUpdateStruct->sType)
{
case XGL_STRUCTURE_TYPE_UPDATE_SAMPLERS:
- return ((XGL_UPDATE_SAMPLERS*)pUpdateStruct)->index;
+ return ((XGL_UPDATE_SAMPLERS*)pUpdateStruct)->binding;
case XGL_STRUCTURE_TYPE_UPDATE_SAMPLER_TEXTURES:
- return ((XGL_UPDATE_SAMPLER_TEXTURES*)pUpdateStruct)->index;
+ return ((XGL_UPDATE_SAMPLER_TEXTURES*)pUpdateStruct)->binding;
case XGL_STRUCTURE_TYPE_UPDATE_IMAGES:
- return ((XGL_UPDATE_IMAGES*)pUpdateStruct)->index;
+ return ((XGL_UPDATE_IMAGES*)pUpdateStruct)->binding;
case XGL_STRUCTURE_TYPE_UPDATE_BUFFERS:
- return ((XGL_UPDATE_BUFFERS*)pUpdateStruct)->index;
+ return ((XGL_UPDATE_BUFFERS*)pUpdateStruct)->binding;
case XGL_STRUCTURE_TYPE_UPDATE_AS_COPY:
- return ((XGL_UPDATE_AS_COPY*)pUpdateStruct)->descriptorIndex;
+ return ((XGL_UPDATE_AS_COPY*)pUpdateStruct)->binding;
default:
// TODO : Flag specific error for this case
+ assert(0);
return 0;
}
}
-
-static uint32_t getUpdateUpperBound(GENERIC_HEADER* pUpdateStruct)
+// Return count for given update struct
+static uint32_t getUpdateArrayIndex(const GENERIC_HEADER* pUpdateStruct)
{
switch (pUpdateStruct->sType)
{
case XGL_STRUCTURE_TYPE_UPDATE_SAMPLERS:
- return (((XGL_UPDATE_SAMPLERS*)pUpdateStruct)->count + ((XGL_UPDATE_SAMPLERS*)pUpdateStruct)->index);
+ return (((XGL_UPDATE_SAMPLERS*)pUpdateStruct)->arrayIndex);
case XGL_STRUCTURE_TYPE_UPDATE_SAMPLER_TEXTURES:
- return (((XGL_UPDATE_SAMPLER_TEXTURES*)pUpdateStruct)->count + ((XGL_UPDATE_SAMPLER_TEXTURES*)pUpdateStruct)->index);
+ return (((XGL_UPDATE_SAMPLER_TEXTURES*)pUpdateStruct)->arrayIndex);
case XGL_STRUCTURE_TYPE_UPDATE_IMAGES:
- return (((XGL_UPDATE_IMAGES*)pUpdateStruct)->count + ((XGL_UPDATE_IMAGES*)pUpdateStruct)->index);
+ return (((XGL_UPDATE_IMAGES*)pUpdateStruct)->arrayIndex);
case XGL_STRUCTURE_TYPE_UPDATE_BUFFERS:
- return (((XGL_UPDATE_BUFFERS*)pUpdateStruct)->count + ((XGL_UPDATE_BUFFERS*)pUpdateStruct)->index);
+ return (((XGL_UPDATE_BUFFERS*)pUpdateStruct)->arrayIndex);
case XGL_STRUCTURE_TYPE_UPDATE_AS_COPY:
// TODO : Need to understand this case better and make sure code is correct
- return (((XGL_UPDATE_AS_COPY*)pUpdateStruct)->count + ((XGL_UPDATE_AS_COPY*)pUpdateStruct)->descriptorIndex);
+ return (((XGL_UPDATE_AS_COPY*)pUpdateStruct)->arrayElement);
default:
// TODO : Flag specific error for this case
+ assert(0);
return 0;
}
}
-
+// Return count for given update struct
+static uint32_t getUpdateCount(const GENERIC_HEADER* pUpdateStruct)
+{
+ switch (pUpdateStruct->sType)
+ {
+ case XGL_STRUCTURE_TYPE_UPDATE_SAMPLERS:
+ return (((XGL_UPDATE_SAMPLERS*)pUpdateStruct)->count);
+ case XGL_STRUCTURE_TYPE_UPDATE_SAMPLER_TEXTURES:
+ return (((XGL_UPDATE_SAMPLER_TEXTURES*)pUpdateStruct)->count);
+ case XGL_STRUCTURE_TYPE_UPDATE_IMAGES:
+ return (((XGL_UPDATE_IMAGES*)pUpdateStruct)->count);
+ case XGL_STRUCTURE_TYPE_UPDATE_BUFFERS:
+ return (((XGL_UPDATE_BUFFERS*)pUpdateStruct)->count);
+ case XGL_STRUCTURE_TYPE_UPDATE_AS_COPY:
+ // TODO : Need to understand this case better and make sure code is correct
+ return (((XGL_UPDATE_AS_COPY*)pUpdateStruct)->count);
+ default:
+ // TODO : Flag specific error for this case
+ assert(0);
+ return 0;
+ }
+}
+// For given Layout Node and binding, return index where that binding begins
+static uint32_t getBindingStartIndex(const LAYOUT_NODE* pLayout, const uint32_t binding)
+{
+ uint32_t offsetIndex = 0;
+ for (uint32_t i = 0; i<binding; i++) {
+ offsetIndex += pLayout->createInfo.pBinding[i].count;
+ }
+ return offsetIndex;
+}
+// For given layout node and binding, return last index that is updated
+static uint32_t getBindingEndIndex(const LAYOUT_NODE* pLayout, const uint32_t binding)
+{
+ uint32_t offsetIndex = 0;
+ for (uint32_t i = 0; i<=binding; i++) {
+ offsetIndex += pLayout->createInfo.pBinding[i].count;
+ }
+ return offsetIndex-1;
+}
+// For given layout and update, return the first overall index of the layout that is update
+static uint32_t getUpdateStartIndex(const LAYOUT_NODE* pLayout, const GENERIC_HEADER* pUpdateStruct)
+{
+ return (getBindingStartIndex(pLayout, getUpdateBinding(pUpdateStruct))+getUpdateArrayIndex(pUpdateStruct));
+}
+// For given layout and update, return the last overall index of the layout that is update
+static uint32_t getUpdateEndIndex(const LAYOUT_NODE* pLayout, const GENERIC_HEADER* pUpdateStruct)
+{
+ return (getBindingStartIndex(pLayout, getUpdateBinding(pUpdateStruct))+getUpdateArrayIndex(pUpdateStruct)+getUpdateCount(pUpdateStruct)-1);
+}
// Verify that the descriptor type in the update struct matches what's expected by the layout
-static bool32_t validateUpdateType(GENERIC_HEADER* pUpdateStruct, const LAYOUT_NODE* pLayout)//XGL_DESCRIPTOR_TYPE type)
+static bool32_t validateUpdateType(const LAYOUT_NODE* pLayout, const GENERIC_HEADER* pUpdateStruct)
{
// First get actual type of update
XGL_DESCRIPTOR_TYPE actualType;
uint32_t i = 0;
- uint32_t bound = getUpdateUpperBound(pUpdateStruct);
switch (pUpdateStruct->sType)
{
case XGL_STRUCTURE_TYPE_UPDATE_SAMPLERS:
@@ -643,20 +697,12 @@
// TODO : Flag specific error for this case
return 0;
}
- for (i = getUpdateIndex(pUpdateStruct); i < bound; i++) {
+ for (i = getUpdateStartIndex(pLayout, pUpdateStruct); i <= getUpdateEndIndex(pLayout, pUpdateStruct); i++) {
if (pLayout->pTypes[i] != actualType)
return 0;
}
return 1;
}
-
-// Verify that update region for this update does not exceed max layout index for this type
-static bool32_t validateUpdateSize(GENERIC_HEADER* pUpdateStruct, uint32_t layoutIdx)
-{
- if ((getUpdateUpperBound(pUpdateStruct)-1) > layoutIdx)
- return 0;
- return 1;
-}
// Determine the update type, allocate a new struct of that type, shadow the given pUpdate
// struct into the new struct and return ptr to shadow struct cast as GENERIC_HEADER
// NOTE : Calls to this function should be wrapped in mutex
@@ -669,8 +715,8 @@
size_t baseBuffAddr = 0;
XGL_UPDATE_BUFFERS* pUBCI;
XGL_UPDATE_IMAGES* pUICI;
- XGL_IMAGE_VIEW_ATTACH_INFO*** pppLocalImageViews = NULL;
- XGL_BUFFER_VIEW_ATTACH_INFO*** pppLocalBufferViews = NULL;
+ XGL_IMAGE_VIEW_ATTACH_INFO** ppLocalImageViews = NULL;
+ XGL_BUFFER_VIEW_ATTACH_INFO** ppLocalBufferViews = NULL;
char str[1024];
switch (pUpdate->sType)
{
@@ -714,18 +760,13 @@
printf("Alloc15 #%lu pNewNode addr(%p)\n", ++g_alloc_count, (void*)pNewNode);
#endif
memcpy(pNewNode, pUpdate, sizeof(XGL_UPDATE_IMAGES));
- base_array_size = sizeof(XGL_IMAGE_VIEW_ATTACH_INFO*) * ((XGL_UPDATE_IMAGES*)pNewNode)->count;
- total_array_size = (sizeof(XGL_IMAGE_VIEW_ATTACH_INFO) * ((XGL_UPDATE_IMAGES*)pNewNode)->count) + base_array_size;
- pppLocalImageViews = (XGL_IMAGE_VIEW_ATTACH_INFO***)&((XGL_UPDATE_IMAGES*)pNewNode)->pImageViews;
- *pppLocalImageViews = (XGL_IMAGE_VIEW_ATTACH_INFO**)malloc(total_array_size);
+ total_array_size = (sizeof(XGL_IMAGE_VIEW_ATTACH_INFO) * ((XGL_UPDATE_IMAGES*)pNewNode)->count);
+ ppLocalImageViews = (XGL_IMAGE_VIEW_ATTACH_INFO**)&(((XGL_UPDATE_IMAGES*)pNewNode)->pImageViews);
+ *ppLocalImageViews = (XGL_IMAGE_VIEW_ATTACH_INFO*)malloc(total_array_size);
#if ALLOC_DEBUG
- printf("Alloc16 #%lu *pppLocalImageViews addr(%p)\n", ++g_alloc_count, (void*)*pppLocalImageViews);
+ printf("Alloc16 #%lu *pppLocalImageViews addr(%p)\n", ++g_alloc_count, (void*)*ppLocalImageViews);
#endif
- baseBuffAddr = (size_t)(*pppLocalImageViews) + base_array_size;
- for (uint32_t i = 0; i < pUICI->count; i++) {
- (*pppLocalImageViews)[i] = (XGL_IMAGE_VIEW_ATTACH_INFO*)(baseBuffAddr + (i * sizeof(XGL_IMAGE_VIEW_ATTACH_INFO)));
- memcpy((*pppLocalImageViews)[i], pUICI->pImageViews[i], sizeof(XGL_IMAGE_VIEW_ATTACH_INFO));
- }
+ memcpy((void*)*ppLocalImageViews, pUICI->pImageViews, total_array_size);
break;
case XGL_STRUCTURE_TYPE_UPDATE_BUFFERS:
pUBCI = (XGL_UPDATE_BUFFERS*)pUpdate;
@@ -734,19 +775,13 @@
printf("Alloc17 #%lu pNewNode addr(%p)\n", ++g_alloc_count, (void*)pNewNode);
#endif
memcpy(pNewNode, pUpdate, sizeof(XGL_UPDATE_BUFFERS));
- base_array_size = sizeof(XGL_BUFFER_VIEW_ATTACH_INFO*) * pUBCI->count;
- total_array_size = (sizeof(XGL_BUFFER_VIEW_ATTACH_INFO) * pUBCI->count) + base_array_size;
- pppLocalBufferViews = (XGL_BUFFER_VIEW_ATTACH_INFO***)&((XGL_UPDATE_BUFFERS*)pNewNode)->pBufferViews;
- *pppLocalBufferViews = (XGL_BUFFER_VIEW_ATTACH_INFO**)malloc(total_array_size);
+ total_array_size = (sizeof(XGL_BUFFER_VIEW_ATTACH_INFO) * pUBCI->count);
+ ppLocalBufferViews = (XGL_BUFFER_VIEW_ATTACH_INFO**)&(((XGL_UPDATE_BUFFERS*)pNewNode)->pBufferViews);
+ *ppLocalBufferViews = (XGL_BUFFER_VIEW_ATTACH_INFO*)malloc(total_array_size);
#if ALLOC_DEBUG
- printf("Alloc18 #%lu *pppLocalBufferViews addr(%p)\n", ++g_alloc_count, (void*)*pppLocalBufferViews);
+ printf("Alloc18 #%lu *pppLocalBufferViews addr(%p)\n", ++g_alloc_count, (void*)*ppLocalBufferViews);
#endif
- baseBuffAddr = (size_t)(*pppLocalBufferViews) + base_array_size;
- for (uint32_t i = 0; i < pUBCI->count; i++) {
- // Set ptr and then copy data into that ptr
- (*pppLocalBufferViews)[i] = (XGL_BUFFER_VIEW_ATTACH_INFO*)(baseBuffAddr + (i * sizeof(XGL_BUFFER_VIEW_ATTACH_INFO)));
- memcpy((*pppLocalBufferViews)[i], pUBCI->pBufferViews[i], sizeof(XGL_BUFFER_VIEW_ATTACH_INFO));
- }
+ memcpy((void*)*ppLocalBufferViews, pUBCI->pBufferViews, total_array_size);
break;
case XGL_STRUCTURE_TYPE_UPDATE_AS_COPY:
pNewNode = (GENERIC_HEADER*)malloc(sizeof(XGL_UPDATE_AS_COPY));
@@ -764,8 +799,8 @@
pNewNode->pNext = NULL;
return pNewNode;
}
-// For given ds, update its mapping based on pUpdateChain linked-list
-static void dsUpdate(XGL_DESCRIPTOR_SET ds, GENERIC_HEADER* pUpdateChain)
+// For given ds, update its mapping based on ppUpdateArray
+static void dsUpdate(XGL_DESCRIPTOR_SET ds, uint32_t updateCount, const void** ppUpdateArray)
{
SET_NODE* pSet = getSetNode(ds);
loader_platform_thread_lock_mutex(&globalLock);
@@ -773,40 +808,37 @@
LAYOUT_NODE* pLayout = NULL;
XGL_DESCRIPTOR_SET_LAYOUT_CREATE_INFO* pLayoutCI = NULL;
// TODO : If pCIList is NULL, flag error
- GENERIC_HEADER* pUpdates = pUpdateChain;
// Perform all updates
- while (pUpdates) {
- pLayout = pSet->pLayouts;
- // For each update first find the layout section that it overlaps
- while (pLayout && (pLayout->startIndex > getUpdateIndex(pUpdates))) {
- pLayout = pLayout->pPriorSetLayout;
- }
- if (!pLayout) {
+ for (uint32_t i = 0; i < updateCount; i++) {
+ GENERIC_HEADER* pUpdate = (GENERIC_HEADER*)ppUpdateArray[i];
+ pLayout = pSet->pLayout;
+ // Make sure that binding is within bounds
+ if (pLayout->createInfo.count < getUpdateBinding(pUpdate)) {
char str[1024];
- sprintf(str, "Descriptor Set %p does not have index to match update index %u for update type %s!", ds, getUpdateIndex(pUpdates), string_XGL_STRUCTURE_TYPE(pUpdates->sType));
+ sprintf(str, "Descriptor Set %p does not have binding to match update binding %u for update type %s!", ds, getUpdateBinding(pUpdate), string_XGL_STRUCTURE_TYPE(pUpdate->sType));
layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, ds, 0, DRAWSTATE_INVALID_UPDATE_INDEX, "DS", str);
}
else {
- // Next verify that update is correct size
- if (!validateUpdateSize(pUpdates, pLayout->endIndex)) {
+ // Next verify that update falls within size of given binding
+ if (getBindingEndIndex(pLayout, getUpdateBinding(pUpdate)) < getUpdateEndIndex(pLayout, pUpdate)) {
char str[48*1024]; // TODO : Keep count of layout CI structs and size this string dynamically based on that count
- pLayoutCI = (XGL_DESCRIPTOR_SET_LAYOUT_CREATE_INFO*)pLayout->pCreateInfoList;
- string DSstr = xgl_print_xgl_descriptor_set_layout_create_info(pLayoutCI, "{DS} ").c_str();
- sprintf(str, "Descriptor update type of %s is out of bounds for matching layout w/ CI:\n%s!", string_XGL_STRUCTURE_TYPE(pUpdates->sType), DSstr.c_str());
+ pLayoutCI = &pLayout->createInfo;
+ string DSstr = xgl_print_xgl_descriptor_set_layout_create_info(pLayoutCI, "{DS} ");
+ sprintf(str, "Descriptor update type of %s is out of bounds for matching binding %u in Layout w/ CI:\n%s!", string_XGL_STRUCTURE_TYPE(pUpdate->sType), getUpdateBinding(pUpdate), DSstr.c_str());
layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, ds, 0, DRAWSTATE_DESCRIPTOR_UPDATE_OUT_OF_BOUNDS, "DS", str);
}
else { // TODO : should we skip update on a type mismatch or force it?
- // We have the right layout section, now verify that update is of the right type
- if (!validateUpdateType(pUpdates, pLayout)) {
+ // Layout bindings match w/ update ok, now verify that update is of the right type
+ if (!validateUpdateType(pLayout, pUpdate)) {
char str[1024];
- sprintf(str, "Descriptor update type of %s does not match overlapping layout type!", string_XGL_STRUCTURE_TYPE(pUpdates->sType));
+ sprintf(str, "Descriptor update type of %s does not match overlapping binding type!", string_XGL_STRUCTURE_TYPE(pUpdate->sType));
layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, ds, 0, DRAWSTATE_DESCRIPTOR_TYPE_MISMATCH, "DS", str);
}
else {
// Save the update info
// TODO : Info message that update successful
// Create new update struct for this set's shadow copy
- GENERIC_HEADER* pNewNode = shadowUpdateNode(pUpdates);
+ GENERIC_HEADER* pNewNode = shadowUpdateNode(pUpdate);
if (NULL == pNewNode) {
char str[1024];
sprintf(str, "Out of memory while attempting to allocate UPDATE struct in xglUpdateDescriptors()");
@@ -817,15 +849,14 @@
pNewNode->pNext = pSet->pUpdateStructs;
pSet->pUpdateStructs = pNewNode;
// Now update appropriate descriptor(s) to point to new Update node
- for (uint32_t i = getUpdateIndex(pUpdates); i < getUpdateUpperBound(pUpdates); i++) {
- assert(i<pSet->descriptorCount);
- pSet->ppDescriptors[i] = pNewNode;
+ for (uint32_t j = getUpdateStartIndex(pLayout, pUpdate); j <= getUpdateEndIndex(pLayout, pUpdate); j++) {
+ assert(j<pSet->descriptorCount);
+ pSet->ppDescriptors[j] = pNewNode;
}
}
}
}
}
- pUpdates = (GENERIC_HEADER*)pUpdates->pNext;
}
loader_platform_thread_unlock_mutex(&globalLock);
}
@@ -908,11 +939,11 @@
free(pFreeUpdate);
}
}
-// Free all DS Regions including their Sets & related sub-structs
+// Free all DS Pools including their Sets & related sub-structs
// NOTE : Calls to this function should be wrapped in mutex
-static void freeRegions()
+static void freePools()
{
- for (unordered_map<XGL_DESCRIPTOR_REGION, REGION_NODE*>::iterator ii=regionMap.begin(); ii!=regionMap.end(); ++ii) {
+ for (unordered_map<XGL_DESCRIPTOR_POOL, POOL_NODE*>::iterator ii=poolMap.begin(); ii!=poolMap.end(); ++ii) {
SET_NODE* pSet = (*ii).second->pSets;
SET_NODE* pFreeSet = pSet;
while (pSet) {
@@ -932,18 +963,12 @@
delete (*ii).second;
}
}
-// WARN : Once freeLayouts() called, any layout ptrs in Region/Set data structure will be invalid
+// WARN : Once freeLayouts() called, any layout ptrs in Pool/Set data structure will be invalid
// NOTE : Calls to this function should be wrapped in mutex
static void freeLayouts()
{
for (unordered_map<XGL_DESCRIPTOR_SET_LAYOUT, LAYOUT_NODE*>::iterator ii=layoutMap.begin(); ii!=layoutMap.end(); ++ii) {
LAYOUT_NODE* pLayout = (*ii).second;
- GENERIC_HEADER* pTrav = (GENERIC_HEADER*)pLayout->pCreateInfoList;
- while (pTrav) {
- GENERIC_HEADER* pToFree = pTrav;
- pTrav = (GENERIC_HEADER*)pTrav->pNext;
- delete pToFree;
- }
if (pLayout->pTypes) {
delete pLayout->pTypes;
}
@@ -965,24 +990,23 @@
}
}
-static void clearDescriptorRegion(XGL_DESCRIPTOR_REGION region)
+static void clearDescriptorPool(XGL_DESCRIPTOR_POOL pool)
{
- REGION_NODE* pRegion = getRegionNode(region);
- if (!pRegion) {
+ POOL_NODE* pPool = getPoolNode(pool);
+ if (!pPool) {
char str[1024];
- sprintf(str, "Unable to find region node for region %p specified in xglClearDescriptorRegion() call", (void*)region);
- layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, region, 0, DRAWSTATE_INVALID_REGION, "DS", str);
+ sprintf(str, "Unable to find pool node for pool %p specified in xglClearDescriptorPool() call", (void*)pool);
+ layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, pool, 0, DRAWSTATE_INVALID_POOL, "DS", str);
}
else
{
- // For every set off of this region, clear it
- SET_NODE* pSet = pRegion->pSets;
+ // For every set off of this pool, clear it
+ SET_NODE* pSet = pPool->pSets;
while (pSet) {
clearDescriptorSet(pSet->set);
}
}
}
-
// Code here to manage the Cmd buffer LL
static GLOBAL_CB_NODE* getCBNode(XGL_CMD_BUFFER cb)
{
@@ -1086,35 +1110,28 @@
{
SET_NODE* pSet = getSetNode(ds);
if (pSet) {
- REGION_NODE* pRegion = getRegionNode(pSet->region);
+ POOL_NODE* pPool = getPoolNode(pSet->pool);
char tmp_str[4*1024];
- fprintf(pOutFile, "subgraph cluster_DescriptorRegion\n{\nlabel=\"Descriptor Region\"\n");
- sprintf(tmp_str, "Region (%p)", pRegion->region);
- char* pGVstr = xgl_gv_print_xgl_descriptor_region_create_info(&pRegion->createInfo, tmp_str);
+ fprintf(pOutFile, "subgraph cluster_DescriptorPool\n{\nlabel=\"Descriptor Pool\"\n");
+ sprintf(tmp_str, "Pool (%p)", pPool->pool);
+ char* pGVstr = xgl_gv_print_xgl_descriptor_pool_create_info(&pPool->createInfo, tmp_str);
fprintf(pOutFile, "%s", pGVstr);
free(pGVstr);
fprintf(pOutFile, "subgraph cluster_DescriptorSet\n{\nlabel=\"Descriptor Set (%p)\"\n", pSet->set);
sprintf(tmp_str, "Descriptor Set (%p)", pSet->set);
- LAYOUT_NODE* pLayout = pSet->pLayouts;
+ LAYOUT_NODE* pLayout = pSet->pLayout;
uint32_t layout_index = 0;
- while (pLayout) {
- ++layout_index;
- sprintf(tmp_str, "LAYOUT%u", layout_index);
- pGVstr = xgl_gv_print_xgl_descriptor_set_layout_create_info(pLayout->pCreateInfoList, tmp_str);
- fprintf(pOutFile, "%s", pGVstr);
- free(pGVstr);
- pLayout = pLayout->pPriorSetLayout;
- if (pLayout) {
- fprintf(pOutFile, "\"%s\" -> \"LAYOUT%u\" [];\n", tmp_str, layout_index+1);
- }
- }
+ ++layout_index;
+ sprintf(tmp_str, "LAYOUT%u", layout_index);
+ pGVstr = xgl_gv_print_xgl_descriptor_set_layout_create_info(&pLayout->createInfo, tmp_str);
+ fprintf(pOutFile, "%s", pGVstr);
+ free(pGVstr);
if (pSet->pUpdateStructs) {
pGVstr = dynamic_gv_display(pSet->pUpdateStructs, "Descriptor Updates");
fprintf(pOutFile, "%s", pGVstr);
free(pGVstr);
}
if (pSet->ppDescriptors) {
- //void* pDesc = NULL;
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++) {
@@ -1150,7 +1167,7 @@
{
case XGL_STRUCTURE_TYPE_UPDATE_SAMPLERS:
pUS = (XGL_UPDATE_SAMPLERS*)pSet->ppDescriptors[i];
- pSCI = getSamplerCreateInfo(pUS->pSamplers[i-pUS->index]);
+ pSCI = getSamplerCreateInfo(pUS->pSamplers[i-pUS->arrayIndex]);
if (pSCI) {
sprintf(tmp_str, "SAMPLER%u", i);
fprintf(pOutFile, "%s", xgl_gv_print_xgl_sampler_create_info(pSCI, tmp_str));
@@ -1159,13 +1176,13 @@
break;
case XGL_STRUCTURE_TYPE_UPDATE_SAMPLER_TEXTURES:
pUST = (XGL_UPDATE_SAMPLER_TEXTURES*)pSet->ppDescriptors[i];
- pSCI = getSamplerCreateInfo(pUST->pSamplerImageViews[i-pUST->index].pSampler);
+ pSCI = getSamplerCreateInfo(pUST->pSamplerImageViews[i-pUST->arrayIndex].sampler);
if (pSCI) {
sprintf(tmp_str, "SAMPLER%u", i);
fprintf(pOutFile, "%s", xgl_gv_print_xgl_sampler_create_info(pSCI, tmp_str));
fprintf(pOutFile, "\"DESCRIPTORS\":slot%u -> \"%s\" [color=\"#%s\"];\n", i, tmp_str, edgeColors[colorIdx].c_str());
}
- pIVCI = getImageViewCreateInfo(pUST->pSamplerImageViews[i-pUST->index].pImageView->view);
+ pIVCI = getImageViewCreateInfo(pUST->pSamplerImageViews[i-pUST->arrayIndex].pImageView->view);
if (pIVCI) {
sprintf(tmp_str, "IMAGE_VIEW%u", i);
fprintf(pOutFile, "%s", xgl_gv_print_xgl_image_view_create_info(pIVCI, tmp_str));
@@ -1174,7 +1191,7 @@
break;
case XGL_STRUCTURE_TYPE_UPDATE_IMAGES:
pUI = (XGL_UPDATE_IMAGES*)pSet->ppDescriptors[i];
- pIVCI = getImageViewCreateInfo(pUI->pImageViews[i-pUI->index]->view);
+ pIVCI = getImageViewCreateInfo(pUI->pImageViews[i-pUI->arrayIndex].view);
if (pIVCI) {
sprintf(tmp_str, "IMAGE_VIEW%u", i);
fprintf(pOutFile, "%s", xgl_gv_print_xgl_image_view_create_info(pIVCI, tmp_str));
@@ -1183,7 +1200,7 @@
break;
case XGL_STRUCTURE_TYPE_UPDATE_BUFFERS:
pUB = (XGL_UPDATE_BUFFERS*)pSet->ppDescriptors[i];
- pBVCI = getBufferViewCreateInfo(pUB->pBufferViews[i-pUB->index]->view);
+ pBVCI = getBufferViewCreateInfo(pUB->pBufferViews[i-pUB->arrayIndex].view);
if (pBVCI) {
sprintf(tmp_str, "BUFFER_VIEW%u", i);
fprintf(pOutFile, "%s", xgl_gv_print_xgl_buffer_view_create_info(pBVCI, tmp_str));
@@ -1355,30 +1372,27 @@
GLOBAL_CB_NODE* pCB = getCBNode(cb);
if (pCB) {
SET_NODE* pSet = getSetNode(pCB->lastBoundDescriptorSet);
- REGION_NODE* pRegion = getRegionNode(pSet->region);
- // Print out region details
- sprintf(tmp_str, "Details for region %p.", (void*)pRegion->region);
+ POOL_NODE* pPool = getPoolNode(pSet->pool);
+ // Print out pool details
+ sprintf(tmp_str, "Details for pool %p.", (void*)pPool->pool);
layerCbMsg(XGL_DBG_MSG_UNKNOWN, XGL_VALIDATION_LEVEL_0, NULL, 0, DRAWSTATE_NONE, "DS", tmp_str);
- string regionStr = xgl_print_xgl_descriptor_region_create_info(&pRegion->createInfo, " ");
- sprintf(ds_config_str, "%s", regionStr.c_str());
+ string poolStr = xgl_print_xgl_descriptor_pool_create_info(&pPool->createInfo, " ");
+ sprintf(ds_config_str, "%s", poolStr.c_str());
layerCbMsg(XGL_DBG_MSG_UNKNOWN, XGL_VALIDATION_LEVEL_0, NULL, 0, DRAWSTATE_NONE, "DS", ds_config_str);
// Print out set details
char prefix[10];
uint32_t index = 0;
sprintf(tmp_str, "Details for descriptor set %p.", (void*)pSet->set);
layerCbMsg(XGL_DBG_MSG_UNKNOWN, XGL_VALIDATION_LEVEL_0, NULL, 0, DRAWSTATE_NONE, "DS", tmp_str);
- LAYOUT_NODE* pLayout = pSet->pLayouts;
- while (pLayout) {
- // Print layout details
- sprintf(tmp_str, "Layout #%u, (object %p) for DS %p.", index+1, (void*)pLayout->layout, (void*)pSet->set);
- layerCbMsg(XGL_DBG_MSG_UNKNOWN, XGL_VALIDATION_LEVEL_0, NULL, 0, DRAWSTATE_NONE, "DS", tmp_str);
- sprintf(prefix, " [L%u] ", index);
- string DSLstr = xgl_print_xgl_descriptor_set_layout_create_info(&pLayout->pCreateInfoList[0], prefix).c_str();
- sprintf(ds_config_str, "%s", DSLstr.c_str());
- layerCbMsg(XGL_DBG_MSG_UNKNOWN, XGL_VALIDATION_LEVEL_0, NULL, 0, DRAWSTATE_NONE, "DS", ds_config_str);
- pLayout = pLayout->pPriorSetLayout;
- index++;
- }
+ LAYOUT_NODE* pLayout = pSet->pLayout;
+ // Print layout details
+ sprintf(tmp_str, "Layout #%u, (object %p) for DS %p.", index+1, (void*)pLayout->layout, (void*)pSet->set);
+ layerCbMsg(XGL_DBG_MSG_UNKNOWN, XGL_VALIDATION_LEVEL_0, NULL, 0, DRAWSTATE_NONE, "DS", tmp_str);
+ sprintf(prefix, " [L%u] ", index);
+ string DSLstr = xgl_print_xgl_descriptor_set_layout_create_info(&pLayout->createInfo, prefix).c_str();
+ sprintf(ds_config_str, "%s", DSLstr.c_str());
+ layerCbMsg(XGL_DBG_MSG_UNKNOWN, XGL_VALIDATION_LEVEL_0, NULL, 0, DRAWSTATE_NONE, "DS", ds_config_str);
+ index++;
GENERIC_HEADER* pUpdate = pSet->pUpdateStructs;
if (pUpdate) {
sprintf(tmp_str, "Update Chain [UC] for descriptor set %p:", (void*)pSet->set);
@@ -1493,7 +1507,7 @@
freeBuffers();
freeCmdBuffers();
freeDynamicState();
- freeRegions();
+ freePools();
freeLayouts();
loader_platform_thread_unlock_mutex(&globalLock);
XGL_RESULT result = nextTable.DestroyDevice(device);
@@ -1619,9 +1633,9 @@
return result;
}
-XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglCreateDescriptorSetLayout(XGL_DEVICE device, XGL_FLAGS stageFlags, const uint32_t* pSetBindPoints, XGL_DESCRIPTOR_SET_LAYOUT priorSetLayout, const XGL_DESCRIPTOR_SET_LAYOUT_CREATE_INFO* pSetLayoutInfoList, XGL_DESCRIPTOR_SET_LAYOUT* pSetLayout)
+XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglCreateDescriptorSetLayout(XGL_DEVICE device, const XGL_DESCRIPTOR_SET_LAYOUT_CREATE_INFO* pCreateInfo, XGL_DESCRIPTOR_SET_LAYOUT* pSetLayout)
{
- XGL_RESULT result = nextTable.CreateDescriptorSetLayout(device, stageFlags, pSetBindPoints, priorSetLayout, pSetLayoutInfoList, pSetLayout);
+ XGL_RESULT result = nextTable.CreateDescriptorSetLayout(device, pCreateInfo, pSetLayout);
if (XGL_SUCCESS == result) {
LAYOUT_NODE* pNewNode = new LAYOUT_NODE;
if (NULL == pNewNode) {
@@ -1630,61 +1644,33 @@
layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, *pSetLayout, 0, DRAWSTATE_OUT_OF_MEMORY, "DS", str);
}
memset(pNewNode, 0, sizeof(LAYOUT_NODE));
- // TODO : API Currently missing a count here that we should multiply by struct size
- pNewNode->pCreateInfoList = new XGL_DESCRIPTOR_SET_LAYOUT_CREATE_INFO;
- memset((void*)pNewNode->pCreateInfoList, 0, sizeof(XGL_DESCRIPTOR_SET_LAYOUT_CREATE_INFO));
- void* pCITrav = NULL;
+ memcpy((void*)&pNewNode->createInfo, pCreateInfo, sizeof(XGL_DESCRIPTOR_SET_LAYOUT_CREATE_INFO));
+ pNewNode->createInfo.pBinding = new XGL_DESCRIPTOR_SET_LAYOUT_BINDING[pCreateInfo->count];
+ memcpy((void*)pNewNode->createInfo.pBinding, pCreateInfo->pBinding, sizeof(XGL_DESCRIPTOR_SET_LAYOUT_BINDING)*pCreateInfo->count);
uint32_t totalCount = 0;
- if (pSetLayoutInfoList) {
- memcpy((void*)pNewNode->pCreateInfoList, pSetLayoutInfoList, sizeof(XGL_DESCRIPTOR_SET_LAYOUT_CREATE_INFO));
- pCITrav = (void*)pSetLayoutInfoList->pNext;
- totalCount = pSetLayoutInfoList->count;
- }
- void** ppNext = (void**)&pNewNode->pCreateInfoList->pNext;
- while (pCITrav) {
- totalCount += ((XGL_DESCRIPTOR_SET_LAYOUT_CREATE_INFO*)pCITrav)->count;
- *ppNext = new XGL_DESCRIPTOR_SET_LAYOUT_CREATE_INFO;
- memcpy((void*)*ppNext, pCITrav, sizeof(XGL_DESCRIPTOR_SET_LAYOUT_CREATE_INFO));
- pCITrav = (void*)((XGL_DESCRIPTOR_SET_LAYOUT_CREATE_INFO*)pCITrav)->pNext;
- ppNext = (void**)&((XGL_DESCRIPTOR_SET_LAYOUT_CREATE_INFO*)*ppNext)->pNext;
+ for (uint32_t i=0; i<pCreateInfo->count; i++) {
+ totalCount += pCreateInfo->pBinding[i].count;
+ if (pCreateInfo->pBinding[i].pImmutableSamplers) {
+ void** ppImmutableSamplers = (void**)&pNewNode->createInfo.pBinding[i].pImmutableSamplers;
+ *ppImmutableSamplers = malloc(sizeof(XGL_SAMPLER)*pCreateInfo->pBinding[i].count);
+ memcpy(*ppImmutableSamplers, pCreateInfo->pBinding[i].pImmutableSamplers, pCreateInfo->pBinding[i].count*sizeof(XGL_SAMPLER));
+ }
}
if (totalCount > 0) {
pNewNode->pTypes = new XGL_DESCRIPTOR_TYPE[totalCount];
- XGL_DESCRIPTOR_SET_LAYOUT_CREATE_INFO* pLCI = (XGL_DESCRIPTOR_SET_LAYOUT_CREATE_INFO*)pSetLayoutInfoList;
uint32_t offset = 0;
- uint32_t i = 0;
- while (pLCI) {
- for (i = 0; i < pLCI->count; i++) {
- pNewNode->pTypes[offset + i] = pLCI->descriptorType;
+ uint32_t j = 0;
+ for (uint32_t i=0; i<pCreateInfo->count; i++) {
+ for (j = 0; j < pCreateInfo->pBinding[i].count; j++) {
+ pNewNode->pTypes[offset + j] = pCreateInfo->pBinding[i].descriptorType;
}
- offset += i;
- pLCI = (XGL_DESCRIPTOR_SET_LAYOUT_CREATE_INFO*)pLCI->pNext;
+ offset += j;
}
}
pNewNode->layout = *pSetLayout;
- pNewNode->stageFlags = stageFlags;
- uint32_t i = (XGL_SHADER_STAGE_FLAGS_ALL == stageFlags) ? 0 : XGL_SHADER_STAGE_COMPUTE;
- for (uint32_t stage = XGL_SHADER_STAGE_FLAGS_COMPUTE_BIT; stage > 0; stage >>= 1) {
- assert(i < XGL_NUM_SHADER_STAGE);
- if (stage & stageFlags)
- pNewNode->shaderStageBindPoints[i] = pSetBindPoints[i];
- i = (i == 0) ? 0 : (i-1);
- }
pNewNode->startIndex = 0;
- LAYOUT_NODE* pPriorNode = getLayoutNode(priorSetLayout);
- // Point to prior node or NULL if no prior node
- if (NULL != priorSetLayout && pPriorNode == NULL) {
- char str[1024];
- sprintf(str, "Invalid priorSetLayout of %p passed to xglCreateDescriptorSetLayout()", (void*)priorSetLayout);
- layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, priorSetLayout, 0, DRAWSTATE_INVALID_LAYOUT, "DS", str);
- }
- else if (pPriorNode != NULL) { // We have a node for a valid prior layout
- // Get count for prior layout
- pNewNode->startIndex = pPriorNode->endIndex + 1;
- }
pNewNode->endIndex = pNewNode->startIndex + totalCount - 1;
assert(pNewNode->endIndex >= pNewNode->startIndex);
- pNewNode->pPriorSetLayout = pPriorNode;
// Put new node at Head of global Layer list
loader_platform_thread_lock_mutex(&globalLock);
layoutMap[*pSetLayout] = pNewNode;
@@ -1693,115 +1679,124 @@
return result;
}
-XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglBeginDescriptorRegionUpdate(XGL_DEVICE device, XGL_DESCRIPTOR_UPDATE_MODE updateMode)
+XGL_RESULT XGLAPI xglCreateDescriptorSetLayoutChain(XGL_DEVICE device, uint32_t setLayoutArrayCount, const XGL_DESCRIPTOR_SET_LAYOUT* pSetLayoutArray, XGL_DESCRIPTOR_SET_LAYOUT_CHAIN* pLayoutChain)
{
- XGL_RESULT result = nextTable.BeginDescriptorRegionUpdate(device, updateMode);
+ XGL_RESULT result = nextTable.CreateDescriptorSetLayoutChain(device, setLayoutArrayCount, pSetLayoutArray, pLayoutChain);
+ if (XGL_SUCCESS == result) {
+ // TODO : Need to capture the layout chains
+ }
+ return result;
+}
+
+XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglBeginDescriptorPoolUpdate(XGL_DEVICE device, XGL_DESCRIPTOR_UPDATE_MODE updateMode)
+{
+ XGL_RESULT result = nextTable.BeginDescriptorPoolUpdate(device, updateMode);
if (XGL_SUCCESS == result) {
loader_platform_thread_lock_mutex(&globalLock);
- REGION_NODE* pRegionNode = regionMap.begin()->second;
- if (!pRegionNode) {
+ POOL_NODE* pPoolNode = poolMap.begin()->second;
+ if (!pPoolNode) {
char str[1024];
- sprintf(str, "Unable to find region node");
+ sprintf(str, "Unable to find pool node");
layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, NULL, 0, DRAWSTATE_INTERNAL_ERROR, "DS", str);
}
else {
- pRegionNode->updateActive = 1;
+ pPoolNode->updateActive = 1;
}
loader_platform_thread_unlock_mutex(&globalLock);
}
return result;
}
-XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglEndDescriptorRegionUpdate(XGL_DEVICE device, XGL_CMD_BUFFER cmd)
+XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglEndDescriptorPoolUpdate(XGL_DEVICE device, XGL_CMD_BUFFER cmd)
{
- XGL_RESULT result = nextTable.EndDescriptorRegionUpdate(device, cmd);
+ XGL_RESULT result = nextTable.EndDescriptorPoolUpdate(device, cmd);
if (XGL_SUCCESS == result) {
loader_platform_thread_lock_mutex(&globalLock);
- REGION_NODE* pRegionNode = regionMap.begin()->second;
- if (!pRegionNode) {
+ POOL_NODE* pPoolNode = poolMap.begin()->second;
+ if (!pPoolNode) {
char str[1024];
- sprintf(str, "Unable to find region node");
+ sprintf(str, "Unable to find pool node");
layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, NULL, 0, DRAWSTATE_INTERNAL_ERROR, "DS", str);
}
else {
- if (!pRegionNode->updateActive) {
+ if (!pPoolNode->updateActive) {
char str[1024];
- sprintf(str, "You must call xglBeginDescriptorRegionUpdate() before this call to xglEndDescriptorRegionUpdate()!");
+ sprintf(str, "You must call xglBeginDescriptorPoolUpdate() before this call to xglEndDescriptorPoolUpdate()!");
layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, NULL, 0, DRAWSTATE_DS_END_WITHOUT_BEGIN, "DS", str);
}
else {
- pRegionNode->updateActive = 0;
+ pPoolNode->updateActive = 0;
}
- pRegionNode->updateActive = 0;
+ pPoolNode->updateActive = 0;
}
loader_platform_thread_unlock_mutex(&globalLock);
}
return result;
}
-XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglCreateDescriptorRegion(XGL_DEVICE device, XGL_DESCRIPTOR_REGION_USAGE regionUsage, uint32_t maxSets, const XGL_DESCRIPTOR_REGION_CREATE_INFO* pCreateInfo, XGL_DESCRIPTOR_REGION* pDescriptorRegion)
+XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglCreateDescriptorPool(XGL_DEVICE device, XGL_DESCRIPTOR_POOL_USAGE poolUsage, uint32_t maxSets, const XGL_DESCRIPTOR_POOL_CREATE_INFO* pCreateInfo, XGL_DESCRIPTOR_POOL* pDescriptorPool)
{
- XGL_RESULT result = nextTable.CreateDescriptorRegion(device, regionUsage, maxSets, pCreateInfo, pDescriptorRegion);
+ XGL_RESULT result = nextTable.CreateDescriptorPool(device, poolUsage, maxSets, pCreateInfo, pDescriptorPool);
if (XGL_SUCCESS == result) {
- // Insert this region into Global Region LL at head
+ // Insert this pool into Global Pool LL at head
char str[1024];
- sprintf(str, "Created Descriptor Region %p", (void*)*pDescriptorRegion);
- layerCbMsg(XGL_DBG_MSG_UNKNOWN, XGL_VALIDATION_LEVEL_0, (XGL_BASE_OBJECT)pDescriptorRegion, 0, DRAWSTATE_NONE, "DS", str);
+ sprintf(str, "Created Descriptor Pool %p", (void*)*pDescriptorPool);
+ layerCbMsg(XGL_DBG_MSG_UNKNOWN, XGL_VALIDATION_LEVEL_0, (XGL_BASE_OBJECT)pDescriptorPool, 0, DRAWSTATE_NONE, "DS", str);
loader_platform_thread_lock_mutex(&globalLock);
- REGION_NODE* pNewNode = new REGION_NODE;
+ POOL_NODE* pNewNode = new POOL_NODE;
if (NULL == pNewNode) {
char str[1024];
- sprintf(str, "Out of memory while attempting to allocate REGION_NODE in xglCreateDescriptorRegion()");
- layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, (XGL_BASE_OBJECT)*pDescriptorRegion, 0, DRAWSTATE_OUT_OF_MEMORY, "DS", str);
+ sprintf(str, "Out of memory while attempting to allocate POOL_NODE in xglCreateDescriptorPool()");
+ layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, (XGL_BASE_OBJECT)*pDescriptorPool, 0, DRAWSTATE_OUT_OF_MEMORY, "DS", str);
}
else {
- memset(pNewNode, 0, sizeof(REGION_NODE));
- XGL_DESCRIPTOR_REGION_CREATE_INFO* pCI = (XGL_DESCRIPTOR_REGION_CREATE_INFO*)&pNewNode->createInfo;
- memcpy((void*)pCI, pCreateInfo, sizeof(XGL_DESCRIPTOR_REGION_CREATE_INFO));
+ memset(pNewNode, 0, sizeof(POOL_NODE));
+ XGL_DESCRIPTOR_POOL_CREATE_INFO* pCI = (XGL_DESCRIPTOR_POOL_CREATE_INFO*)&pNewNode->createInfo;
+ memcpy((void*)pCI, pCreateInfo, sizeof(XGL_DESCRIPTOR_POOL_CREATE_INFO));
if (pNewNode->createInfo.count) {
size_t typeCountSize = pNewNode->createInfo.count * sizeof(XGL_DESCRIPTOR_TYPE_COUNT);
pNewNode->createInfo.pTypeCount = new XGL_DESCRIPTOR_TYPE_COUNT[typeCountSize];
memcpy((void*)pNewNode->createInfo.pTypeCount, pCreateInfo->pTypeCount, typeCountSize);
}
- pNewNode->regionUsage = regionUsage;
+ pNewNode->poolUsage = poolUsage;
pNewNode->updateActive = 0;
pNewNode->maxSets = maxSets;
- pNewNode->region = *pDescriptorRegion;
- regionMap[*pDescriptorRegion] = pNewNode;
+ pNewNode->pool = *pDescriptorPool;
+ poolMap[*pDescriptorPool] = pNewNode;
}
loader_platform_thread_unlock_mutex(&globalLock);
}
else {
- // Need to do anything if region create fails?
+ // Need to do anything if pool create fails?
}
return result;
}
-XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglClearDescriptorRegion(XGL_DESCRIPTOR_REGION descriptorRegion)
+XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglResetDescriptorPool(XGL_DESCRIPTOR_POOL descriptorPool)
{
- XGL_RESULT result = nextTable.ClearDescriptorRegion(descriptorRegion);
+ XGL_RESULT result = nextTable.ResetDescriptorPool(descriptorPool);
if (XGL_SUCCESS == result) {
- clearDescriptorRegion(descriptorRegion);
+ clearDescriptorPool(descriptorPool);
}
return result;
}
-XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglAllocDescriptorSets(XGL_DESCRIPTOR_REGION descriptorRegion, XGL_DESCRIPTOR_SET_USAGE setUsage, uint32_t count, const XGL_DESCRIPTOR_SET_LAYOUT* pSetLayouts, XGL_DESCRIPTOR_SET* pDescriptorSets, uint32_t* pCount)
+XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglAllocDescriptorSets(XGL_DESCRIPTOR_POOL descriptorPool, XGL_DESCRIPTOR_SET_USAGE setUsage, uint32_t count, const XGL_DESCRIPTOR_SET_LAYOUT* pSetLayouts, XGL_DESCRIPTOR_SET* pDescriptorSets, uint32_t* pCount)
{
- XGL_RESULT result = nextTable.AllocDescriptorSets(descriptorRegion, setUsage, count, pSetLayouts, pDescriptorSets, pCount);
+ XGL_RESULT result = nextTable.AllocDescriptorSets(descriptorPool, setUsage, count, pSetLayouts, pDescriptorSets, pCount);
if ((XGL_SUCCESS == result) || (*pCount > 0)) {
- REGION_NODE *pRegionNode = getRegionNode(descriptorRegion);
- if (!pRegionNode) {
+ POOL_NODE *pPoolNode = getPoolNode(descriptorPool);
+ if (!pPoolNode) {
char str[1024];
- sprintf(str, "Unable to find region node for region %p specified in xglAllocDescriptorSets() call", (void*)descriptorRegion);
- layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, descriptorRegion, 0, DRAWSTATE_INVALID_REGION, "DS", str);
+ sprintf(str, "Unable to find pool node for pool %p specified in xglAllocDescriptorSets() call", (void*)descriptorPool);
+ layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, descriptorPool, 0, DRAWSTATE_INVALID_POOL, "DS", str);
}
else {
for (uint32_t i = 0; i < *pCount; i++) {
char str[1024];
sprintf(str, "Created Descriptor Set %p", (void*)pDescriptorSets[i]);
layerCbMsg(XGL_DBG_MSG_UNKNOWN, XGL_VALIDATION_LEVEL_0, pDescriptorSets[i], 0, DRAWSTATE_NONE, "DS", str);
- // Create new set node and add to head of region nodes
+ // Create new set node and add to head of pool nodes
SET_NODE* pNewNode = new SET_NODE;
if (NULL == pNewNode) {
char str[1024];
@@ -1810,17 +1805,17 @@
}
else {
memset(pNewNode, 0, sizeof(SET_NODE));
- // Insert set at head of Set LL for this region
- pNewNode->pNext = pRegionNode->pSets;
- pRegionNode->pSets = pNewNode;
+ // Insert set at head of Set LL for this pool
+ pNewNode->pNext = pPoolNode->pSets;
+ pPoolNode->pSets = pNewNode;
LAYOUT_NODE* pLayout = getLayoutNode(pSetLayouts[i]);
if (NULL == pLayout) {
char str[1024];
sprintf(str, "Unable to find set layout node for layout %p specified in xglAllocDescriptorSets() call", (void*)pSetLayouts[i]);
layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, pSetLayouts[i], 0, DRAWSTATE_INVALID_LAYOUT, "DS", str);
}
- pNewNode->pLayouts = pLayout;
- pNewNode->region = descriptorRegion;
+ pNewNode->pLayout = pLayout;
+ pNewNode->pool = descriptorPool;
pNewNode->set = pDescriptorSets[i];
pNewNode->setUsage = setUsage;
pNewNode->descriptorCount = pLayout->endIndex + 1;
@@ -1837,28 +1832,28 @@
return result;
}
-XGL_LAYER_EXPORT void XGLAPI xglClearDescriptorSets(XGL_DESCRIPTOR_REGION descriptorRegion, uint32_t count, const XGL_DESCRIPTOR_SET* pDescriptorSets)
+XGL_LAYER_EXPORT void XGLAPI xglClearDescriptorSets(XGL_DESCRIPTOR_POOL descriptorPool, uint32_t count, const XGL_DESCRIPTOR_SET* pDescriptorSets)
{
for (uint32_t i = 0; i < count; i++) {
clearDescriptorSet(pDescriptorSets[i]);
}
- nextTable.ClearDescriptorSets(descriptorRegion, count, pDescriptorSets);
+ nextTable.ClearDescriptorSets(descriptorPool, count, pDescriptorSets);
}
-XGL_LAYER_EXPORT void XGLAPI xglUpdateDescriptors(XGL_DESCRIPTOR_SET descriptorSet, const void* pUpdateChain)
+XGL_LAYER_EXPORT void XGLAPI xglUpdateDescriptors(XGL_DESCRIPTOR_SET descriptorSet, uint32_t updateCount, const void** ppUpdateArray)
{
SET_NODE* pSet = getSetNode(descriptorSet);
if (!dsUpdateActive(descriptorSet)) {
char str[1024];
- sprintf(str, "You must call xglBeginDescriptorRegionUpdate() before this call to xglUpdateDescriptors()!");
- layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, pSet->region, 0, DRAWSTATE_UPDATE_WITHOUT_BEGIN, "DS", str);
+ sprintf(str, "You must call xglBeginDescriptorPoolUpdate() before this call to xglUpdateDescriptors()!");
+ layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, pSet->pool, 0, DRAWSTATE_UPDATE_WITHOUT_BEGIN, "DS", str);
}
else {
// pUpdateChain is a Linked-list of XGL_UPDATE_* structures defining the mappings for the descriptors
- dsUpdate(descriptorSet, (GENERIC_HEADER*)pUpdateChain);
+ dsUpdate(descriptorSet, updateCount, ppUpdateArray);
}
- nextTable.UpdateDescriptors(descriptorSet, pUpdateChain);
+ nextTable.UpdateDescriptors(descriptorSet, updateCount, ppUpdateArray);
}
XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglCreateDynamicViewportState(XGL_DEVICE device, const XGL_DYNAMIC_VP_STATE_CREATE_INFO* pCreateInfo, XGL_DYNAMIC_VP_STATE_OBJECT* pState)
@@ -1997,34 +1992,36 @@
nextTable.CmdBindDynamicStateObject(cmdBuffer, stateBindPoint, state);
}
-XGL_LAYER_EXPORT void XGLAPI xglCmdBindDescriptorSet(XGL_CMD_BUFFER cmdBuffer, XGL_PIPELINE_BIND_POINT pipelineBindPoint, XGL_DESCRIPTOR_SET descriptorSet, const uint32_t* pUserData)
+XGL_LAYER_EXPORT void XGLAPI xglCmdBindDescriptorSets(XGL_CMD_BUFFER cmdBuffer, XGL_PIPELINE_BIND_POINT pipelineBindPoint, XGL_DESCRIPTOR_SET_LAYOUT_CHAIN layoutChain, uint32_t layoutChainSlot, uint32_t count, const XGL_DESCRIPTOR_SET* pDescriptorSets, const uint32_t* pUserData)
{
GLOBAL_CB_NODE* pCB = getCBNode(cmdBuffer);
if (pCB) {
updateCBTracking(cmdBuffer);
- addCmd(pCB, CMD_BINDDESCRIPTORSET);
- if (getSetNode(descriptorSet)) {
- if (dsUpdateActive(descriptorSet)) {
- // TODO : This check here needs to be made at QueueSubmit time
-/*
+ addCmd(pCB, CMD_BINDDESCRIPTORSETS);
+ for (uint32_t i=0; i<count; i++) {
+ if (getSetNode(pDescriptorSets[i])) {
+ if (dsUpdateActive(pDescriptorSets[i])) {
+ // TODO : This check here needs to be made at QueueSubmit time
+ /*
+ char str[1024];
+ sprintf(str, "You must call xglEndDescriptorPoolUpdate(%p) before this call to xglCmdBindDescriptorSet()!", (void*)descriptorSet);
+ layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, descriptorSet, 0, DRAWSTATE_BINDING_DS_NO_END_UPDATE, "DS", str);
+ */
+ }
+ loader_platform_thread_lock_mutex(&globalLock);
+ pCB->lastBoundDescriptorSet = pDescriptorSets[i];
+ g_lastBoundDescriptorSet = pDescriptorSets[i];
+ loader_platform_thread_unlock_mutex(&globalLock);
char str[1024];
- sprintf(str, "You must call xglEndDescriptorRegionUpdate(%p) before this call to xglCmdBindDescriptorSet()!", (void*)descriptorSet);
- layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, descriptorSet, 0, DRAWSTATE_BINDING_DS_NO_END_UPDATE, "DS", str);
-*/
+ sprintf(str, "DS %p bound on pipeline %s", (void*)pDescriptorSets[i], string_XGL_PIPELINE_BIND_POINT(pipelineBindPoint));
+ layerCbMsg(XGL_DBG_MSG_UNKNOWN, XGL_VALIDATION_LEVEL_0, pDescriptorSets[i], 0, DRAWSTATE_NONE, "DS", str);
+ synchAndPrintDSConfig(cmdBuffer);
}
- loader_platform_thread_lock_mutex(&globalLock);
- pCB->lastBoundDescriptorSet = descriptorSet;
- g_lastBoundDescriptorSet = descriptorSet;
- loader_platform_thread_unlock_mutex(&globalLock);
- char str[1024];
- sprintf(str, "DS %p bound on pipeline %s", (void*)descriptorSet, string_XGL_PIPELINE_BIND_POINT(pipelineBindPoint));
- layerCbMsg(XGL_DBG_MSG_UNKNOWN, XGL_VALIDATION_LEVEL_0, descriptorSet, 0, DRAWSTATE_NONE, "DS", str);
- synchAndPrintDSConfig(cmdBuffer);
- }
- else {
- char str[1024];
- sprintf(str, "Attempt to bind DS %p that doesn't exist!", (void*)descriptorSet);
- layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, descriptorSet, 0, DRAWSTATE_INVALID_SET, "DS", str);
+ else {
+ char str[1024];
+ sprintf(str, "Attempt to bind DS %p that doesn't exist!", (void*)pDescriptorSets[i]);
+ layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, pDescriptorSets[i], 0, DRAWSTATE_INVALID_SET, "DS", str);
+ }
}
}
else {
@@ -2032,7 +2029,7 @@
sprintf(str, "Attempt to use CmdBuffer %p that doesn't exist!", (void*)cmdBuffer);
layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, cmdBuffer, 0, DRAWSTATE_INVALID_CMD_BUFFER, "DS", str);
}
- nextTable.CmdBindDescriptorSet(cmdBuffer, pipelineBindPoint, descriptorSet, pUserData);
+ nextTable.CmdBindDescriptorSets(cmdBuffer, pipelineBindPoint, layoutChain, layoutChainSlot, count, pDescriptorSets, pUserData);
}
XGL_LAYER_EXPORT void XGLAPI xglCmdBindIndexBuffer(XGL_CMD_BUFFER cmdBuffer, XGL_BUFFER buffer, XGL_GPU_SIZE offset, XGL_INDEX_TYPE indexType)
@@ -2220,7 +2217,7 @@
GLOBAL_CB_NODE* pCB = getCBNode(cmdBuffer);
if (pCB) {
updateCBTracking(cmdBuffer);
- addCmd(pCB, CMD_COPYIMAGE);
+ addCmd(pCB, CMD_BLITIMAGE);
}
else {
char str[1024];
@@ -2760,14 +2757,16 @@
return (void*) xglCreateSampler;
if (!strcmp(funcName, "xglCreateDescriptorSetLayout"))
return (void*) xglCreateDescriptorSetLayout;
- if (!strcmp(funcName, "xglBeginDescriptorRegionUpdate"))
- return (void*) xglBeginDescriptorRegionUpdate;
- if (!strcmp(funcName, "xglEndDescriptorRegionUpdate"))
- return (void*) xglEndDescriptorRegionUpdate;
- if (!strcmp(funcName, "xglCreateDescriptorRegion"))
- return (void*) xglCreateDescriptorRegion;
- if (!strcmp(funcName, "xglClearDescriptorRegion"))
- return (void*) xglClearDescriptorRegion;
+ if (!strcmp(funcName, "xglCreateDescriptorSetLayoutChain"))
+ return (void*) xglCreateDescriptorSetLayoutChain;
+ if (!strcmp(funcName, "xglBeginDescriptorPoolUpdate"))
+ return (void*) xglBeginDescriptorPoolUpdate;
+ if (!strcmp(funcName, "xglEndDescriptorPoolUpdate"))
+ return (void*) xglEndDescriptorPoolUpdate;
+ if (!strcmp(funcName, "xglCreateDescriptorPool"))
+ return (void*) xglCreateDescriptorPool;
+ if (!strcmp(funcName, "xglResetDescriptorPool"))
+ return (void*) xglResetDescriptorPool;
if (!strcmp(funcName, "xglAllocDescriptorSets"))
return (void*) xglAllocDescriptorSets;
if (!strcmp(funcName, "xglClearDescriptorSets"))
@@ -2794,8 +2793,8 @@
return (void*) xglCmdBindPipeline;
if (!strcmp(funcName, "xglCmdBindDynamicStateObject"))
return (void*) xglCmdBindDynamicStateObject;
- if (!strcmp(funcName, "xglCmdBindDescriptorSet"))
- return (void*) xglCmdBindDescriptorSet;
+ if (!strcmp(funcName, "xglCmdBindDescriptorSets"))
+ return (void*) xglCmdBindDescriptorSets;
if (!strcmp(funcName, "xglCmdBindVertexBuffer"))
return (void*) xglCmdBindVertexBuffer;
if (!strcmp(funcName, "xglCmdBindIndexBuffer"))
diff --git a/layers/draw_state.h b/layers/draw_state.h
index 0fb771e..d2d7650 100644
--- a/layers/draw_state.h
+++ b/layers/draw_state.h
@@ -32,18 +32,18 @@
DRAWSTATE_NONE, // Used for INFO & other non-error messages
DRAWSTATE_INTERNAL_ERROR, // Error with DrawState internal data structures
DRAWSTATE_NO_PIPELINE_BOUND, // Unable to identify a bound pipeline
- DRAWSTATE_INVALID_REGION, // Invalid DS region
+ DRAWSTATE_INVALID_POOL, // Invalid DS pool
DRAWSTATE_INVALID_SET, // Invalid DS
DRAWSTATE_INVALID_LAYOUT, // Invalid DS layout
DRAWSTATE_DS_END_WITHOUT_BEGIN, // EndDSUpdate called w/o corresponding BeginDSUpdate
- DRAWSTATE_UPDATE_WITHOUT_BEGIN, // Attempt to update descriptors w/o calling BeginDescriptorRegionUpdate
+ DRAWSTATE_UPDATE_WITHOUT_BEGIN, // Attempt to update descriptors w/o calling BeginDescriptorPoolUpdate
DRAWSTATE_INVALID_PIPELINE, // Invalid Pipeline referenced
DRAWSTATE_INVALID_CMD_BUFFER, // Invalid CmdBuffer referenced
DRAWSTATE_VTX_INDEX_OUT_OF_BOUNDS, // binding in xglCmdBindVertexData() too large for PSO's pVertexBindingDescriptions array
DRAWSTATE_INVALID_DYNAMIC_STATE_OBJECT, // Invalid dyn state object
DRAWSTATE_MISSING_DOT_PROGRAM, // No "dot" program in order to generate png image
DRAWSTATE_BINDING_DS_NO_END_UPDATE, // DS bound to CmdBuffer w/o call to xglEndDescriptorSetUpdate())
- DRAWSTATE_NO_DS_REGION, // No DS Region is available
+ DRAWSTATE_NO_DS_POOL, // No DS Pool is available
DRAWSTATE_OUT_OF_MEMORY, // malloc failed
DRAWSTATE_DESCRIPTOR_TYPE_MISMATCH, // Type in layout vs. update are not the same
DRAWSTATE_DESCRIPTOR_UPDATE_OUT_OF_BOUNDS, // Descriptors set for update out of bounds for corresponding layout section
@@ -129,41 +129,37 @@
XGL_DYNAMIC_CB_STATE_CREATE_INFO cbci;
XGL_DYNAMIC_DS_STATE_CREATE_INFO dsci;
} create_info;
- //struct _DYNAMIC_STATE_NODE* pNext;
} DYNAMIC_STATE_NODE;
// Descriptor Data structures
// Layout Node has the core layout data
typedef struct _LAYOUT_NODE {
XGL_DESCRIPTOR_SET_LAYOUT layout;
- XGL_FLAGS stageFlags;
- uint32_t shaderStageBindPoints[XGL_NUM_SHADER_STAGE];
XGL_DESCRIPTOR_TYPE* pTypes; // Dynamic array that will be created to verify descriptor types
- XGL_DESCRIPTOR_SET_LAYOUT_CREATE_INFO* pCreateInfoList;
+ XGL_DESCRIPTOR_SET_LAYOUT_CREATE_INFO createInfo;
uint32_t startIndex; // 1st index of this layout
uint32_t endIndex; // last index of this layout
- struct _LAYOUT_NODE* pPriorSetLayout; // Points to node w/ priorSetLayout
} LAYOUT_NODE;
typedef struct _SET_NODE {
XGL_DESCRIPTOR_SET set;
- XGL_DESCRIPTOR_REGION region;
+ XGL_DESCRIPTOR_POOL pool;
XGL_DESCRIPTOR_SET_USAGE setUsage;
// Head of LL of all Update structs for this set
GENERIC_HEADER* pUpdateStructs;
// Total num of descriptors in this set (count of its layout plus all prior layouts)
uint32_t descriptorCount;
GENERIC_HEADER** ppDescriptors; // Array where each index points to update node for its slot
- LAYOUT_NODE* pLayouts;
+ LAYOUT_NODE* pLayout; // Layout for this set
struct _SET_NODE* pNext;
} SET_NODE;
-typedef struct _REGION_NODE {
- XGL_DESCRIPTOR_REGION region;
- XGL_DESCRIPTOR_REGION_USAGE regionUsage;
+typedef struct _POOL_NODE {
+ XGL_DESCRIPTOR_POOL pool;
+ XGL_DESCRIPTOR_POOL_USAGE poolUsage;
uint32_t maxSets;
- XGL_DESCRIPTOR_REGION_CREATE_INFO createInfo;
- bool32_t updateActive; // Track if Region is in an update block
- SET_NODE* pSets; // Head of LL of sets for this Region
-} REGION_NODE;
+ XGL_DESCRIPTOR_POOL_CREATE_INFO createInfo;
+ bool32_t updateActive; // Track if Pool is in an update block
+ SET_NODE* pSets; // Head of LL of sets for this Pool
+} POOL_NODE;
// Cmd Buffer Tracking
typedef enum _CMD_TYPE
@@ -171,7 +167,7 @@
CMD_BINDPIPELINE,
CMD_BINDPIPELINEDELTA,
CMD_BINDDYNAMICSTATEOBJECT,
- CMD_BINDDESCRIPTORSET,
+ CMD_BINDDESCRIPTORSETS,
CMD_BINDINDEXBUFFER,
CMD_BINDVERTEXBUFFER,
CMD_DRAW,
@@ -182,6 +178,7 @@
CMD_DISPATCHINDIRECT,
CMD_COPYBUFFER,
CMD_COPYIMAGE,
+ CMD_BLITIMAGE,
CMD_COPYBUFFERTOIMAGE,
CMD_COPYIMAGETOBUFFER,
CMD_CLONEIMAGEDATA,
@@ -222,7 +219,7 @@
// Cmd Buffer Wrapper Struct
typedef struct _GLOBAL_CB_NODE {
XGL_CMD_BUFFER cmdBuffer;
- uint32_t queueNodeIndex;
+ uint32_t queueNodeIndex;
XGL_FLAGS flags;
XGL_FENCE fence; // fence tracking this cmd buffer
uint64_t numCmds; // number of cmds in this CB
diff --git a/xgl_helper.py b/xgl_helper.py
index 397d43c..701d9b4 100755
--- a/xgl_helper.py
+++ b/xgl_helper.py
@@ -757,8 +757,10 @@
if not idx_ss_decl:
sh_funcs.append('%sstringstream index_ss;' % (indent))
idx_ss_decl = True
+ sh_funcs.append('%sif (pStruct->%s) {' % (indent, stp_list[index]['name']))
+ indent += ' '
sh_funcs.append('%sfor (uint32_t i = 0; i < %s; i++) {' % (indent, array_count))
- indent = ' '
+ indent += ' '
sh_funcs.append('%sindex_ss.str("");' % (indent))
sh_funcs.append('%sindex_ss << i;' % (indent))
if not is_type(stp_list[index]['type'], 'struct'):
@@ -772,8 +774,10 @@
sh_funcs.append('%sstp_strs[%u] += " " + prefix + "%s[" + index_ss.str() + "] (addr)\\n" + tmp_str;' % (indent, index, stp_list[index]['name']))
else:
sh_funcs.append('%sstp_strs[%u] += " " + prefix + "%s[" + index_ss.str() + "] (" + ss[%u].str() + ")\\n" + tmp_str;' % (indent, index, stp_list[index]['name'], index))
+ indent = indent[4:]
+ sh_funcs.append('%s}' % (indent))
sh_funcs.append('%sss[%u].str("");' % (indent, index))
- indent = ' '
+ indent = indent[4:]
sh_funcs.append('%s}' % (indent))
elif (stp_list[index]['ptr']):
sh_funcs.append(' if (pStruct->%s) {' % stp_list[index]['name'])
@@ -1414,7 +1418,7 @@
gv_funcs.append(' free(tmpStr);\n')
else:
gv_funcs.append(' sprintf(nodeName, "%s_%%p", (void*)pStruct->%s);\n' % (stp_list[index]['name'], stp_list[index]['name']))
- if stp_list[index]['name'] in ['pTypeCount', 'pBufferViews', 'pImageViews', 'pSamplerImageViews']:
+ if stp_list[index]['name'] in ['pTypeCount', 'pSamplerImageViews']:
gv_funcs.append(' tmpStr = %s_array(pStruct->count, pStruct->%s, nodeName);\n' % (self._get_gv_func_name(stp_list[index]['type']), stp_list[index]['name']))
else:
gv_funcs.append(' tmpStr = %s(pStruct->%s, nodeName);\n' % (self._get_gv_func_name(stp_list[index]['type']), stp_list[index]['name']))