diff options
Diffstat (limited to 'layers/mem_tracker.cpp')
| -rw-r--r-- | layers/mem_tracker.cpp | 1330 |
1 files changed, 665 insertions, 665 deletions
diff --git a/layers/mem_tracker.cpp b/layers/mem_tracker.cpp index 5b47bfc5..71b8a5aa 100644 --- a/layers/mem_tracker.cpp +++ b/layers/mem_tracker.cpp @@ -32,8 +32,8 @@ using namespace std; #include "loader_platform.h" -#include "xgl_dispatch_table_helper.h" -#include "xgl_struct_string_helper_cpp.h" +#include "vk_dispatch_table_helper.h" +#include "vk_struct_string_helper_cpp.h" #include "mem_tracker.h" #include "layers_config.h" // The following is #included again to catch certain OS-specific functions @@ -41,8 +41,8 @@ using namespace std; #include "loader_platform.h" #include "layers_msg.h" -static XGL_LAYER_DISPATCH_TABLE nextTable; -static XGL_BASE_LAYER_OBJECT *pCurObj; +static VK_LAYER_DISPATCH_TABLE nextTable; +static VK_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; @@ -50,18 +50,18 @@ static loader_platform_thread_mutex globalLock; #define MAX_BINDING 0xFFFFFFFF -map<XGL_CMD_BUFFER, MT_CB_INFO*> cbMap; -map<XGL_GPU_MEMORY, MT_MEM_OBJ_INFO*> memObjMap; -map<XGL_OBJECT, MT_OBJ_INFO*> objectMap; +map<VK_CMD_BUFFER, MT_CB_INFO*> cbMap; +map<VK_GPU_MEMORY, MT_MEM_OBJ_INFO*> memObjMap; +map<VK_OBJECT, MT_OBJ_INFO*> objectMap; map<uint64_t, MT_FENCE_INFO*> fenceMap; // Map fenceId to fence info -map<XGL_QUEUE, MT_QUEUE_INFO*> queueMap; +map<VK_QUEUE, MT_QUEUE_INFO*> queueMap; // TODO : Add per-device fence completion static uint64_t g_currentFenceId = 1; -static XGL_DEVICE globalDevice = NULL; +static VK_DEVICE globalDevice = NULL; // Add new queue for this device to map container -static void addQueueInfo(const XGL_QUEUE queue) +static void addQueueInfo(const VK_QUEUE queue) { MT_QUEUE_INFO* pInfo = new MT_QUEUE_INFO; pInfo->lastRetiredId = 0; @@ -72,23 +72,23 @@ static void addQueueInfo(const XGL_QUEUE queue) static void deleteQueueInfoList(void) { // Process queue list, cleaning up each entry before deleting - for (map<XGL_QUEUE, MT_QUEUE_INFO*>::iterator ii=queueMap.begin(); ii!=queueMap.end(); ++ii) { + for (map<VK_QUEUE, MT_QUEUE_INFO*>::iterator ii=queueMap.begin(); ii!=queueMap.end(); ++ii) { (*ii).second->pQueueCmdBuffers.clear(); } queueMap.clear(); } // Add new CBInfo for this cb to map container -static void addCBInfo(const XGL_CMD_BUFFER cb) +static void addCBInfo(const VK_CMD_BUFFER cb) { MT_CB_INFO* pInfo = new MT_CB_INFO; - memset(pInfo, 0, (sizeof(MT_CB_INFO) - sizeof(list<XGL_GPU_MEMORY>))); + memset(pInfo, 0, (sizeof(MT_CB_INFO) - sizeof(list<VK_GPU_MEMORY>))); pInfo->cmdBuffer = cb; cbMap[cb] = pInfo; } // Return ptr to Info in CB map, or NULL if not found -static MT_CB_INFO* getCBInfo(const XGL_CMD_BUFFER cb) +static MT_CB_INFO* getCBInfo(const VK_CMD_BUFFER cb) { MT_CB_INFO* pCBInfo = NULL; if (cbMap.find(cb) != cbMap.end()) { @@ -98,7 +98,7 @@ static MT_CB_INFO* getCBInfo(const XGL_CMD_BUFFER cb) } // Return object info for 'object' or return NULL if no info exists -static MT_OBJ_INFO* getObjectInfo(const XGL_OBJECT object) +static MT_OBJ_INFO* getObjectInfo(const VK_OBJECT object) { MT_OBJ_INFO* pObjInfo = NULL; @@ -108,7 +108,7 @@ static MT_OBJ_INFO* getObjectInfo(const XGL_OBJECT object) return pObjInfo; } -static MT_OBJ_INFO* addObjectInfo(XGL_OBJECT object, XGL_STRUCTURE_TYPE sType, const void *pCreateInfo, const int struct_size, const char *name_prefix) +static MT_OBJ_INFO* addObjectInfo(VK_OBJECT object, VK_STRUCTURE_TYPE sType, const void *pCreateInfo, const int struct_size, const char *name_prefix) { MT_OBJ_INFO* pInfo = new MT_OBJ_INFO; memset(pInfo, 0, sizeof(MT_OBJ_INFO)); @@ -124,7 +124,7 @@ static MT_OBJ_INFO* addObjectInfo(XGL_OBJECT object, XGL_STRUCTURE_TYPE sType, c } // Add a fence, creating one if necessary to our list of fences/fenceIds -static uint64_t addFenceInfo(XGL_FENCE fence, XGL_QUEUE queue) +static uint64_t addFenceInfo(VK_FENCE fence, VK_QUEUE queue) { // Create fence object MT_FENCE_INFO* pFenceInfo = new MT_FENCE_INFO; @@ -133,15 +133,15 @@ static uint64_t addFenceInfo(XGL_FENCE fence, XGL_QUEUE queue) memset(pFenceInfo, 0, sizeof(MT_FENCE_INFO)); // If no fence, create an internal fence to track the submissions if (fence == NULL) { - XGL_FENCE_CREATE_INFO fci; - fci.sType = XGL_STRUCTURE_TYPE_FENCE_CREATE_INFO; + VK_FENCE_CREATE_INFO fci; + fci.sType = VK_STRUCTURE_TYPE_FENCE_CREATE_INFO; fci.pNext = NULL; - fci.flags = static_cast<XGL_FENCE_CREATE_FLAGS>(0); + fci.flags = static_cast<VK_FENCE_CREATE_FLAGS>(0); nextTable.CreateFence(globalDevice, &fci, &pFenceInfo->fence); - addObjectInfo(pFenceInfo->fence, fci.sType, &fci, sizeof(XGL_FENCE_CREATE_INFO), "internalFence"); - pFenceInfo->localFence = XGL_TRUE; + addObjectInfo(pFenceInfo->fence, fci.sType, &fci, sizeof(VK_FENCE_CREATE_INFO), "internalFence"); + pFenceInfo->localFence = VK_TRUE; } else { - pFenceInfo->localFence = XGL_FALSE; + pFenceInfo->localFence = VK_FALSE; pFenceInfo->fence = fence; } pFenceInfo->queue = queue; @@ -159,7 +159,7 @@ static void deleteFenceInfo(uint64_t fenceId) map<uint64_t, MT_FENCE_INFO*>::iterator item; MT_FENCE_INFO* pDelInfo = fenceMap[fenceId]; if (pDelInfo != NULL) { - if (pDelInfo->localFence == XGL_TRUE) { + if (pDelInfo->localFence == VK_TRUE) { nextTable.DestroyObject(pDelInfo->fence); } delete pDelInfo; @@ -171,11 +171,11 @@ static void deleteFenceInfo(uint64_t fenceId) } // Search through list for this fence, deleting all items before it (with lower IDs) and updating lastRetiredId -static void updateFenceTracking(XGL_FENCE fence) +static void updateFenceTracking(VK_FENCE fence) { MT_FENCE_INFO *pCurFenceInfo = NULL; uint64_t fenceId = 0; - XGL_QUEUE queue = NULL; + VK_QUEUE queue = NULL; for (map<uint64_t, MT_FENCE_INFO*>::iterator ii=fenceMap.begin(); ii!=fenceMap.end(); ++ii) { if ((*ii).second != NULL) { @@ -189,7 +189,7 @@ static void updateFenceTracking(XGL_FENCE fence) // Update fence state in fenceCreateInfo structure MT_OBJ_INFO* pObjectInfo = getObjectInfo(fence); if (pObjectInfo != NULL) { - pObjectInfo->create_info.fence_create_info.flags = XGL_FENCE_CREATE_SIGNALED_BIT; + pObjectInfo->create_info.fence_create_info.flags = VK_FENCE_CREATE_SIGNALED_BIT; } } } @@ -198,25 +198,25 @@ static void updateFenceTracking(XGL_FENCE fence) // Utility function that determines if a fenceId has been retired yet static bool32_t fenceRetired(uint64_t fenceId) { - bool32_t result = XGL_FALSE; + bool32_t result = VK_FALSE; MT_FENCE_INFO* pFenceInfo = fenceMap[fenceId]; if (pFenceInfo != 0) { MT_QUEUE_INFO* pQueueInfo = queueMap[pFenceInfo->queue]; if (fenceId <= pQueueInfo->lastRetiredId) { - result = XGL_TRUE; + result = VK_TRUE; } } else { // If not in list, fence has been retired and deleted - result = XGL_TRUE; + result = VK_TRUE; } return result; } // Return the fence associated with a fenceId -static XGL_FENCE getFenceFromId(uint64_t fenceId) +static VK_FENCE getFenceFromId(uint64_t fenceId) { - XGL_FENCE fence = NULL; + VK_FENCE fence = NULL; if (fenceId != 0) { // Search for an item with this fenceId if (fenceMap.find(fenceId) != fenceMap.end()) { @@ -233,7 +233,7 @@ static XGL_FENCE getFenceFromId(uint64_t fenceId) } // Helper routine that updates the fence list for a specific queue to all-retired -static void retireQueueFences(XGL_QUEUE queue) +static void retireQueueFences(VK_QUEUE queue) { MT_QUEUE_INFO *pQueueInfo = queueMap[queue]; pQueueInfo->lastRetiredId = pQueueInfo->lastSubmittedId; @@ -253,11 +253,11 @@ static void retireQueueFences(XGL_QUEUE queue) } // Helper routine that updates fence list for all queues to all-retired -static void retireDeviceFences(XGL_DEVICE device) +static void retireDeviceFences(VK_DEVICE device) { // Process each queue for device // TODO: Add multiple device support - for (map<XGL_QUEUE, MT_QUEUE_INFO*>::iterator ii=queueMap.begin(); ii!=queueMap.end(); ++ii) { + for (map<VK_QUEUE, MT_QUEUE_INFO*>::iterator ii=queueMap.begin(); ii!=queueMap.end(); ++ii) { retireQueueFences((*ii).first); } } @@ -265,15 +265,15 @@ static void retireDeviceFences(XGL_DEVICE device) // Returns True if a memory reference is present in a Queue's memory reference list // Queue is validated by caller static bool32_t checkMemRef( - XGL_QUEUE queue, - XGL_GPU_MEMORY mem) + VK_QUEUE queue, + VK_GPU_MEMORY mem) { - bool32_t result = XGL_FALSE; - list<XGL_GPU_MEMORY>::iterator it; + bool32_t result = VK_FALSE; + list<VK_GPU_MEMORY>::iterator it; MT_QUEUE_INFO *pQueueInfo = queueMap[queue]; for (it = pQueueInfo->pMemRefList.begin(); it != pQueueInfo->pMemRefList.end(); ++it) { if ((*it) == mem) { - result = XGL_TRUE; + result = VK_TRUE; break; } } @@ -281,18 +281,18 @@ static bool32_t checkMemRef( } static bool32_t validateQueueMemRefs( - XGL_QUEUE queue, + VK_QUEUE queue, uint32_t cmdBufferCount, - const XGL_CMD_BUFFER *pCmdBuffers) + const VK_CMD_BUFFER *pCmdBuffers) { - bool32_t result = XGL_TRUE; + bool32_t result = VK_TRUE; // Verify Queue MT_QUEUE_INFO *pQueueInfo = queueMap[queue]; if (pQueueInfo == NULL) { char str[1024]; - sprintf(str, "Unknown Queue %p specified in xglQueueSubmit", queue); - layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, queue, 0, MEMTRACK_INVALID_QUEUE, "MEM", str); + sprintf(str, "Unknown Queue %p specified in vkQueueSubmit", queue); + layerCbMsg(VK_DBG_MSG_ERROR, VK_VALIDATION_LEVEL_0, queue, 0, MEMTRACK_INVALID_QUEUE, "MEM", str); } else { // Iterate through all CBs in pCmdBuffers @@ -300,31 +300,31 @@ static bool32_t validateQueueMemRefs( MT_CB_INFO* pCBInfo = getCBInfo(pCmdBuffers[i]); if (!pCBInfo) { char str[1024]; - sprintf(str, "Unable to find info for CB %p in order to check memory references in xglQueueSubmit for queue %p", (void*)pCmdBuffers[i], queue); - layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, pCmdBuffers[i], 0, MEMTRACK_INVALID_CB, "MEM", str); - result = XGL_FALSE; + sprintf(str, "Unable to find info for CB %p in order to check memory references in vkQueueSubmit for queue %p", (void*)pCmdBuffers[i], queue); + layerCbMsg(VK_DBG_MSG_ERROR, VK_VALIDATION_LEVEL_0, pCmdBuffers[i], 0, MEMTRACK_INVALID_CB, "MEM", str); + result = VK_FALSE; } else { // Validate that all actual references are accounted for in pMemRefs - for (list<XGL_GPU_MEMORY>::iterator it = pCBInfo->pMemObjList.begin(); it != pCBInfo->pMemObjList.end(); ++it) { + for (list<VK_GPU_MEMORY>::iterator it = pCBInfo->pMemObjList.begin(); it != pCBInfo->pMemObjList.end(); ++it) { // Search for each memref in queues memreflist. if (checkMemRef(queue, *it)) { char str[1024]; sprintf(str, "Found Mem Obj %p binding to CB %p for queue %p", (*it), pCmdBuffers[i], queue); - layerCbMsg(XGL_DBG_MSG_UNKNOWN, XGL_VALIDATION_LEVEL_0, pCmdBuffers[i], 0, MEMTRACK_NONE, "MEM", str); + layerCbMsg(VK_DBG_MSG_UNKNOWN, VK_VALIDATION_LEVEL_0, pCmdBuffers[i], 0, MEMTRACK_NONE, "MEM", str); } else { char str[1024]; sprintf(str, "Queue %p Memory reference list for Command Buffer %p is missing ref to mem obj %p", queue, pCmdBuffers[i], (*it)); - layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, pCmdBuffers[i], 0, MEMTRACK_INVALID_MEM_REF, "MEM", str); - result = XGL_FALSE; + layerCbMsg(VK_DBG_MSG_ERROR, VK_VALIDATION_LEVEL_0, pCmdBuffers[i], 0, MEMTRACK_INVALID_MEM_REF, "MEM", str); + result = VK_FALSE; } } } } - if (result == XGL_TRUE) { + if (result == VK_TRUE) { char str[1024]; sprintf(str, "Verified all memory dependencies for Queue %p are included in pMemRefs list", queue); - layerCbMsg(XGL_DBG_MSG_UNKNOWN, XGL_VALIDATION_LEVEL_0, queue, 0, MEMTRACK_NONE, "MEM", str); + layerCbMsg(VK_DBG_MSG_UNKNOWN, VK_VALIDATION_LEVEL_0, queue, 0, MEMTRACK_NONE, "MEM", str); // TODO : Could report mem refs in pMemRefs that AREN'T in mem list, that would be primarily informational // Currently just noting that there is a difference } @@ -335,7 +335,7 @@ static bool32_t validateQueueMemRefs( // Return ptr to info in map container containing mem, or NULL if not found // Calls to this function should be wrapped in mutex -static MT_MEM_OBJ_INFO* getMemObjInfo(const XGL_GPU_MEMORY mem) +static MT_MEM_OBJ_INFO* getMemObjInfo(const VK_GPU_MEMORY mem) { MT_MEM_OBJ_INFO* pMemObjInfo = NULL; @@ -345,14 +345,14 @@ static MT_MEM_OBJ_INFO* getMemObjInfo(const XGL_GPU_MEMORY mem) return pMemObjInfo; } -static void addMemObjInfo(const XGL_GPU_MEMORY mem, const XGL_MEMORY_ALLOC_INFO* pAllocInfo) +static void addMemObjInfo(const VK_GPU_MEMORY mem, const VK_MEMORY_ALLOC_INFO* pAllocInfo) { MT_MEM_OBJ_INFO* pInfo = new MT_MEM_OBJ_INFO; pInfo->refCount = 0; - memset(&pInfo->allocInfo, 0, sizeof(XGL_MEMORY_ALLOC_INFO)); + memset(&pInfo->allocInfo, 0, sizeof(VK_MEMORY_ALLOC_INFO)); - if (pAllocInfo) { // MEM alloc created by xglWsiX11CreatePresentableImage() doesn't have alloc info struct - memcpy(&pInfo->allocInfo, pAllocInfo, sizeof(XGL_MEMORY_ALLOC_INFO)); + if (pAllocInfo) { // MEM alloc created by vkWsiX11CreatePresentableImage() doesn't have alloc info struct + memcpy(&pInfo->allocInfo, pAllocInfo, sizeof(VK_MEMORY_ALLOC_INFO)); // TODO: Update for real hardware, actually process allocation info structures pInfo->allocInfo.pNext = NULL; } @@ -362,27 +362,27 @@ static void addMemObjInfo(const XGL_GPU_MEMORY mem, const XGL_MEMORY_ALLOC_INFO* // Find CB Info and add mem binding to list container // Find Mem Obj Info and add CB binding to list container -static bool32_t updateCBBinding(const XGL_CMD_BUFFER cb, const XGL_GPU_MEMORY mem) +static bool32_t updateCBBinding(const VK_CMD_BUFFER cb, const VK_GPU_MEMORY mem) { - bool32_t result = XGL_TRUE; + bool32_t result = VK_TRUE; // First update CB binding in MemObj mini CB list MT_MEM_OBJ_INFO* pMemInfo = getMemObjInfo(mem); if (!pMemInfo) { char str[1024]; sprintf(str, "Trying to bind mem obj %p to CB %p but no info for that mem obj.\n Was it correctly allocated? Did it already get freed?", mem, cb); - layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, cb, 0, MEMTRACK_INVALID_MEM_OBJ, "MEM", str); - result = XGL_FALSE; + layerCbMsg(VK_DBG_MSG_ERROR, VK_VALIDATION_LEVEL_0, cb, 0, MEMTRACK_INVALID_MEM_OBJ, "MEM", str); + result = VK_FALSE; } else { // Search for cmd buffer object in memory object's binding list - bool32_t found = XGL_FALSE; - for (list<XGL_CMD_BUFFER>::iterator it = pMemInfo->pCmdBufferBindings.begin(); it != pMemInfo->pCmdBufferBindings.end(); ++it) { + bool32_t found = VK_FALSE; + for (list<VK_CMD_BUFFER>::iterator it = pMemInfo->pCmdBufferBindings.begin(); it != pMemInfo->pCmdBufferBindings.end(); ++it) { if ((*it) == cb) { - found = XGL_TRUE; + found = VK_TRUE; break; } } // If not present, add to list - if (found == XGL_FALSE) { + if (found == VK_FALSE) { pMemInfo->pCmdBufferBindings.push_front(cb); pMemInfo->refCount++; } @@ -392,19 +392,19 @@ static bool32_t updateCBBinding(const XGL_CMD_BUFFER cb, const XGL_GPU_MEMORY me if (!pCBInfo) { char str[1024]; sprintf(str, "Trying to bind mem obj %p to CB %p but no info for that CB. Was it CB incorrectly destroyed?", mem, cb); - layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, cb, 0, MEMTRACK_INVALID_MEM_OBJ, "MEM", str); - result = XGL_FALSE; + layerCbMsg(VK_DBG_MSG_ERROR, VK_VALIDATION_LEVEL_0, cb, 0, MEMTRACK_INVALID_MEM_OBJ, "MEM", str); + result = VK_FALSE; } else { // Search for memory object in cmd buffer's binding list - bool32_t found = XGL_FALSE; - for (list<XGL_GPU_MEMORY>::iterator it = pCBInfo->pMemObjList.begin(); it != pCBInfo->pMemObjList.end(); ++it) { + bool32_t found = VK_FALSE; + for (list<VK_GPU_MEMORY>::iterator it = pCBInfo->pMemObjList.begin(); it != pCBInfo->pMemObjList.end(); ++it) { if ((*it) == mem) { - found = XGL_TRUE; + found = VK_TRUE; break; } } // If not present, add to list - if (found == XGL_FALSE) { + if (found == VK_FALSE) { pCBInfo->pMemObjList.push_front(mem); } } @@ -414,7 +414,7 @@ static bool32_t updateCBBinding(const XGL_CMD_BUFFER cb, const XGL_GPU_MEMORY me // Clear the CB Binding for mem // Calls to this function should be wrapped in mutex -static void clearCBBinding(const XGL_CMD_BUFFER cb, const XGL_GPU_MEMORY mem) +static void clearCBBinding(const VK_CMD_BUFFER cb, const VK_GPU_MEMORY mem) { MT_MEM_OBJ_INFO* pInfo = getMemObjInfo(mem); // TODO : Having this check is not ideal, really if memInfo was deleted, @@ -427,21 +427,21 @@ static void clearCBBinding(const XGL_CMD_BUFFER cb, const XGL_GPU_MEMORY mem) } // Free bindings related to CB -static bool32_t freeCBBindings(const XGL_CMD_BUFFER cb) +static bool32_t freeCBBindings(const VK_CMD_BUFFER cb) { - bool32_t result = XGL_TRUE; + bool32_t result = VK_TRUE; MT_CB_INFO* pCBInfo = getCBInfo(cb); if (!pCBInfo) { char str[1024]; sprintf(str, "Unable to find global CB info %p for deletion", cb); - layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, cb, 0, MEMTRACK_INVALID_CB, "MEM", str); - result = XGL_FALSE; + layerCbMsg(VK_DBG_MSG_ERROR, VK_VALIDATION_LEVEL_0, cb, 0, MEMTRACK_INVALID_CB, "MEM", str); + result = VK_FALSE; } else { if (!fenceRetired(pCBInfo->fenceId)) { deleteFenceInfo(pCBInfo->fenceId); } - for (list<XGL_GPU_MEMORY>::iterator it=pCBInfo->pMemObjList.begin(); it!=pCBInfo->pMemObjList.end(); ++it) { + for (list<VK_GPU_MEMORY>::iterator it=pCBInfo->pMemObjList.begin(); it!=pCBInfo->pMemObjList.end(); ++it) { clearCBBinding(cb, (*it)); } pCBInfo->pMemObjList.clear(); @@ -452,12 +452,12 @@ static bool32_t freeCBBindings(const XGL_CMD_BUFFER cb) // Delete CBInfo from list along with all of it's mini MemObjInfo // and also clear mem references to CB // TODO : When should this be called? There's no Destroy of CBs that I see -static bool32_t deleteCBInfo(const XGL_CMD_BUFFER cb) +static bool32_t deleteCBInfo(const VK_CMD_BUFFER cb) { - bool32_t result = XGL_TRUE; + bool32_t result = VK_TRUE; result = freeCBBindings(cb); // Delete the CBInfo info - if (result == XGL_TRUE) { + if (result == VK_TRUE) { if (cbMap.find(cb) != cbMap.end()) { MT_CB_INFO* pDelInfo = cbMap[cb]; delete pDelInfo; @@ -470,8 +470,8 @@ static bool32_t deleteCBInfo(const XGL_CMD_BUFFER cb) // Delete the entire CB list static bool32_t deleteCBInfoList() { - bool32_t result = XGL_TRUE; - for (map<XGL_CMD_BUFFER, MT_CB_INFO*>::iterator ii=cbMap.begin(); ii!=cbMap.end(); ++ii) { + bool32_t result = VK_TRUE; + for (map<VK_CMD_BUFFER, MT_CB_INFO*>::iterator ii=cbMap.begin(); ii!=cbMap.end(); ++ii) { freeCBBindings((*ii).first); delete (*ii).second; } @@ -483,25 +483,25 @@ static void reportMemReferences(const MT_MEM_OBJ_INFO* pMemObjInfo) { uint32_t refCount = 0; // Count found references - for (list<XGL_CMD_BUFFER>::const_iterator it = pMemObjInfo->pCmdBufferBindings.begin(); it != pMemObjInfo->pCmdBufferBindings.end(); ++it) { + for (list<VK_CMD_BUFFER>::const_iterator it = pMemObjInfo->pCmdBufferBindings.begin(); it != pMemObjInfo->pCmdBufferBindings.end(); ++it) { refCount++; char str[1024]; sprintf(str, "Command Buffer %p has reference to mem obj %p", (*it), pMemObjInfo->mem); - layerCbMsg(XGL_DBG_MSG_UNKNOWN, XGL_VALIDATION_LEVEL_0, (*it), 0, MEMTRACK_NONE, "MEM", str); + layerCbMsg(VK_DBG_MSG_UNKNOWN, VK_VALIDATION_LEVEL_0, (*it), 0, MEMTRACK_NONE, "MEM", str); } - for (list<XGL_OBJECT>::const_iterator it = pMemObjInfo->pObjBindings.begin(); it != pMemObjInfo->pObjBindings.end(); ++it) { + for (list<VK_OBJECT>::const_iterator it = pMemObjInfo->pObjBindings.begin(); it != pMemObjInfo->pObjBindings.end(); ++it) { char str[1024]; - sprintf(str, "XGL Object %p has reference to mem obj %p", (*it), pMemObjInfo->mem); - layerCbMsg(XGL_DBG_MSG_UNKNOWN, XGL_VALIDATION_LEVEL_0, (*it), 0, MEMTRACK_NONE, "MEM", str); + sprintf(str, "VK Object %p has reference to mem obj %p", (*it), pMemObjInfo->mem); + layerCbMsg(VK_DBG_MSG_UNKNOWN, VK_VALIDATION_LEVEL_0, (*it), 0, MEMTRACK_NONE, "MEM", str); } if (refCount != pMemObjInfo->refCount) { char str[1024]; sprintf(str, "Refcount of %u for Mem Obj %p does't match reported refs of %u", pMemObjInfo->refCount, pMemObjInfo->mem, refCount); - layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, pMemObjInfo->mem, 0, MEMTRACK_INTERNAL_ERROR, "MEM", str); + layerCbMsg(VK_DBG_MSG_ERROR, VK_VALIDATION_LEVEL_0, pMemObjInfo->mem, 0, MEMTRACK_INTERNAL_ERROR, "MEM", str); } } -static void deleteMemObjInfo(XGL_GPU_MEMORY mem) +static void deleteMemObjInfo(VK_GPU_MEMORY mem) { MT_MEM_OBJ_INFO* pDelInfo = memObjMap[mem]; if (memObjMap.find(mem) != memObjMap.end()) { @@ -512,50 +512,50 @@ static void deleteMemObjInfo(XGL_GPU_MEMORY mem) } // Check if fence for given CB is completed -static bool32_t checkCBCompleted(const XGL_CMD_BUFFER cb) +static bool32_t checkCBCompleted(const VK_CMD_BUFFER cb) { - bool32_t result = XGL_TRUE; + bool32_t result = VK_TRUE; MT_CB_INFO* pCBInfo = getCBInfo(cb); if (!pCBInfo) { char str[1024]; sprintf(str, "Unable to find global CB info %p to check for completion", cb); - layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, cb, 0, MEMTRACK_INVALID_CB, "MEM", str); - result = XGL_FALSE; + layerCbMsg(VK_DBG_MSG_ERROR, VK_VALIDATION_LEVEL_0, cb, 0, MEMTRACK_INVALID_CB, "MEM", str); + result = VK_FALSE; } else { if (!fenceRetired(pCBInfo->fenceId)) { char str[1024]; sprintf(str, "FenceId %" PRIx64", fence %p for CB %p has not been checked for completion", pCBInfo->fenceId, getFenceFromId(pCBInfo->fenceId), cb); - layerCbMsg(XGL_DBG_MSG_UNKNOWN, XGL_VALIDATION_LEVEL_0, cb, 0, MEMTRACK_NONE, "MEM", str); - result = XGL_FALSE; + layerCbMsg(VK_DBG_MSG_UNKNOWN, VK_VALIDATION_LEVEL_0, cb, 0, MEMTRACK_NONE, "MEM", str); + result = VK_FALSE; } } return result; } -static bool32_t freeMemObjInfo(XGL_GPU_MEMORY mem, bool internal) +static bool32_t freeMemObjInfo(VK_GPU_MEMORY mem, bool internal) { - bool32_t result = XGL_TRUE; + bool32_t result = VK_TRUE; // Parse global list to find info w/ mem MT_MEM_OBJ_INFO* pInfo = getMemObjInfo(mem); if (!pInfo) { char str[1024]; sprintf(str, "Couldn't find mem info object for %p\n Was %p never allocated or previously freed?", (void*)mem, (void*)mem); - layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, mem, 0, MEMTRACK_INVALID_MEM_OBJ, "MEM", str); - result = XGL_FALSE; + layerCbMsg(VK_DBG_MSG_ERROR, VK_VALIDATION_LEVEL_0, mem, 0, MEMTRACK_INVALID_MEM_OBJ, "MEM", str); + result = VK_FALSE; } else { if (pInfo->allocInfo.allocationSize == 0 && !internal) { char str[1024]; sprintf(str, "Attempting to free memory associated with a Presentable Image, %p, this should not be explicitly freed\n", (void*)mem); - layerCbMsg(XGL_DBG_MSG_WARNING, XGL_VALIDATION_LEVEL_0, mem, 0, MEMTRACK_INVALID_MEM_OBJ, "MEM", str); - result = XGL_FALSE; + layerCbMsg(VK_DBG_MSG_WARNING, VK_VALIDATION_LEVEL_0, mem, 0, MEMTRACK_INVALID_MEM_OBJ, "MEM", str); + result = VK_FALSE; } else { // Clear any CB bindings for completed CBs // TODO : Is there a better place to do this? - list<XGL_CMD_BUFFER>::iterator it = pInfo->pCmdBufferBindings.begin(); - list<XGL_CMD_BUFFER>::iterator temp; + list<VK_CMD_BUFFER>::iterator it = pInfo->pCmdBufferBindings.begin(); + list<VK_CMD_BUFFER>::iterator temp; while (it != pInfo->pCmdBufferBindings.end()) { - if (XGL_TRUE == checkCBCompleted(*it)) { + if (VK_TRUE == checkCBCompleted(*it)) { temp = it; ++temp; freeCBBindings(*it); @@ -570,9 +570,9 @@ static bool32_t freeMemObjInfo(XGL_GPU_MEMORY mem, bool internal) // If references remain, report the error and can search CB list to find references char str[1024]; sprintf(str, "Freeing mem obj %p while it still has references", (void*)mem); - layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, mem, 0, MEMTRACK_FREED_MEM_REF, "MEM", str); + layerCbMsg(VK_DBG_MSG_ERROR, VK_VALIDATION_LEVEL_0, mem, 0, MEMTRACK_FREED_MEM_REF, "MEM", str); reportMemReferences(pInfo); - result = XGL_FALSE; + result = VK_FALSE; } // Delete mem obj info deleteMemObjInfo(mem); @@ -585,32 +585,32 @@ static bool32_t freeMemObjInfo(XGL_GPU_MEMORY mem, bool internal) // 1. Remove ObjectInfo from MemObjInfo list container of obj bindings & free it // 2. Decrement refCount for MemObjInfo // 3. Clear MemObjInfo ptr from ObjectInfo -static bool32_t clearObjectBinding(XGL_OBJECT object) +static bool32_t clearObjectBinding(VK_OBJECT object) { - bool32_t result = XGL_FALSE; + bool32_t result = VK_FALSE; MT_OBJ_INFO* pObjInfo = getObjectInfo(object); if (!pObjInfo) { char str[1024]; sprintf(str, "Attempting to clear mem binding for object %p: devices, queues, command buffers, shaders and memory objects do not have external memory requirements and it is unneccessary to call bind/unbindObjectMemory on them.", object); - layerCbMsg(XGL_DBG_MSG_WARNING, XGL_VALIDATION_LEVEL_0, object, 0, MEMTRACK_INVALID_OBJECT, "MEM", str); + layerCbMsg(VK_DBG_MSG_WARNING, VK_VALIDATION_LEVEL_0, object, 0, MEMTRACK_INVALID_OBJECT, "MEM", str); } else { if (!pObjInfo->pMemObjInfo) { char str[1024]; sprintf(str, "Attempting to clear mem binding on obj %p but it has no binding.", (void*)object); - layerCbMsg(XGL_DBG_MSG_WARNING, XGL_VALIDATION_LEVEL_0, object, 0, MEMTRACK_MEM_OBJ_CLEAR_EMPTY_BINDINGS, "MEM", str); + layerCbMsg(VK_DBG_MSG_WARNING, VK_VALIDATION_LEVEL_0, object, 0, MEMTRACK_MEM_OBJ_CLEAR_EMPTY_BINDINGS, "MEM", str); } else { - for (list<XGL_OBJECT>::iterator it = pObjInfo->pMemObjInfo->pObjBindings.begin(); it != pObjInfo->pMemObjInfo->pObjBindings.end(); ++it) { + for (list<VK_OBJECT>::iterator it = pObjInfo->pMemObjInfo->pObjBindings.begin(); it != pObjInfo->pMemObjInfo->pObjBindings.end(); ++it) { pObjInfo->pMemObjInfo->refCount--; pObjInfo->pMemObjInfo = NULL; it = pObjInfo->pMemObjInfo->pObjBindings.erase(it); - result = XGL_TRUE; + result = VK_TRUE; break; } - if (result == XGL_FALSE) { + if (result == VK_FALSE) { char str[1024]; sprintf(str, "While trying to clear mem binding for object %p, unable to find that object referenced by mem obj %p", object, pObjInfo->pMemObjInfo->mem); - layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, object, 0, MEMTRACK_INTERNAL_ERROR, "MEM", str); + layerCbMsg(VK_DBG_MSG_ERROR, VK_VALIDATION_LEVEL_0, object, 0, MEMTRACK_INTERNAL_ERROR, "MEM", str); } } } @@ -622,38 +622,38 @@ static bool32_t clearObjectBinding(XGL_OBJECT object) // IF a previous binding existed, clear it // Add reference from objectInfo to memoryInfo // Add reference off of objInfo -// Return XGL_TRUE if addition is successful, XGL_FALSE otherwise -static bool32_t updateObjectBinding(XGL_OBJECT object, XGL_GPU_MEMORY mem) +// Return VK_TRUE if addition is successful, VK_FALSE otherwise +static bool32_t updateObjectBinding(VK_OBJECT object, VK_GPU_MEMORY mem) { - bool32_t result = XGL_FALSE; + bool32_t result = VK_FALSE; // Handle NULL case separately, just clear previous binding & decrement reference - if (mem == XGL_NULL_HANDLE) { + if (mem == VK_NULL_HANDLE) { clearObjectBinding(object); - result = XGL_TRUE; + result = VK_TRUE; } else { char str[1024]; MT_OBJ_INFO* pObjInfo = getObjectInfo(object); if (!pObjInfo) { sprintf(str, "Attempting to update Binding of Obj(%p) that's not in global list()", (void*)object); - layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, object, 0, MEMTRACK_INTERNAL_ERROR, "MEM", str); - return XGL_FALSE; + layerCbMsg(VK_DBG_MSG_ERROR, VK_VALIDATION_LEVEL_0, object, 0, MEMTRACK_INTERNAL_ERROR, "MEM", str); + return VK_FALSE; } // non-null case so should have real mem obj MT_MEM_OBJ_INFO* pInfo = getMemObjInfo(mem); if (!pInfo) { sprintf(str, "While trying to bind mem for obj %p, couldn't find info for mem obj %p", (void*)object, (void*)mem); - layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, mem, 0, MEMTRACK_INVALID_MEM_OBJ, "MEM", str); + layerCbMsg(VK_DBG_MSG_ERROR, VK_VALIDATION_LEVEL_0, mem, 0, MEMTRACK_INVALID_MEM_OBJ, "MEM", str); } else { // Search for object in memory object's binding list - bool32_t found = XGL_FALSE; - for (list<XGL_OBJECT>::iterator it = pInfo->pObjBindings.begin(); it != pInfo->pObjBindings.end(); ++it) { + bool32_t found = VK_FALSE; + for (list<VK_OBJECT>::iterator it = pInfo->pObjBindings.begin(); it != pInfo->pObjBindings.end(); ++it) { if ((*it) == object) { - found = XGL_TRUE; + found = VK_TRUE; break; } } // If not present, add to list - if (found == XGL_FALSE) { + if (found == VK_FALSE) { pInfo->pObjBindings.push_front(object); pInfo->refCount++; } @@ -661,19 +661,19 @@ static bool32_t updateObjectBinding(XGL_OBJECT object, XGL_GPU_MEMORY mem) if (pObjInfo->pMemObjInfo) { clearObjectBinding(object); // Need to clear the previous object binding before setting new binding sprintf(str, "Updating memory binding for object %p from mem obj %p to %p", object, pObjInfo->pMemObjInfo->mem, mem); - layerCbMsg(XGL_DBG_MSG_UNKNOWN, XGL_VALIDATION_LEVEL_0, object, 0, MEMTRACK_NONE, "MEM", str); + layerCbMsg(VK_DBG_MSG_UNKNOWN, VK_VALIDATION_LEVEL_0, object, 0, MEMTRACK_NONE, "MEM", str); } // For image objects, make sure default memory state is correctly set // TODO : What's the best/correct way to handle this? - if (XGL_STRUCTURE_TYPE_IMAGE_CREATE_INFO == pObjInfo->sType) { - if (pObjInfo->create_info.image_create_info.usage & (XGL_IMAGE_USAGE_COLOR_ATTACHMENT_BIT | XGL_IMAGE_USAGE_DEPTH_STENCIL_BIT)) { + if (VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO == pObjInfo->sType) { + if (pObjInfo->create_info.image_create_info.usage & (VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT | VK_IMAGE_USAGE_DEPTH_STENCIL_BIT)) { // TODO:: More memory state transition stuff. } } pObjInfo->pMemObjInfo = pInfo; } } - return XGL_TRUE; + return VK_TRUE; } // Print details of global Obj tracking list @@ -682,18 +682,18 @@ static void printObjList() MT_OBJ_INFO* pInfo = NULL; char str[1024]; sprintf(str, "Details of Object list of size %lu elements", objectMap.size()); - layerCbMsg(XGL_DBG_MSG_UNKNOWN, XGL_VALIDATION_LEVEL_0, NULL, 0, MEMTRACK_NONE, "MEM", str); - for (map<XGL_OBJECT, MT_OBJ_INFO*>::iterator ii=objectMap.begin(); ii!=objectMap.end(); ++ii) { + layerCbMsg(VK_DBG_MSG_UNKNOWN, VK_VALIDATION_LEVEL_0, NULL, 0, MEMTRACK_NONE, "MEM", str); + for (map<VK_OBJECT, MT_OBJ_INFO*>::iterator ii=objectMap.begin(); ii!=objectMap.end(); ++ii) { pInfo = (*ii).second; sprintf(str, " ObjInfo %p has object %p, pMemObjInfo %p", pInfo, pInfo->object, pInfo->pMemObjInfo); - layerCbMsg(XGL_DBG_MSG_UNKNOWN, XGL_VALIDATION_LEVEL_0, pInfo->object, 0, MEMTRACK_NONE, "MEM", str); + layerCbMsg(VK_DBG_MSG_UNKNOWN, VK_VALIDATION_LEVEL_0, pInfo->object, 0, MEMTRACK_NONE, "MEM", str); } } // For given Object, get 'mem' obj that it's bound to or NULL if no binding -static XGL_GPU_MEMORY getMemBindingFromObject(const XGL_OBJECT object) +static VK_GPU_MEMORY getMemBindingFromObject(const VK_OBJECT object) { - XGL_GPU_MEMORY mem = NULL; + VK_GPU_MEMORY mem = NULL; MT_OBJ_INFO* pObjInfo = getObjectInfo(object); if (pObjInfo) { if (pObjInfo->pMemObjInfo) { @@ -702,14 +702,14 @@ static XGL_GPU_MEMORY getMemBindingFromObject(const XGL_OBJECT object) else { char str[1024]; sprintf(str, "Trying to get mem binding for object %p but object has no mem binding", (void*)object); - layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, object, 0, MEMTRACK_MISSING_MEM_BINDINGS, "MEM", str); + layerCbMsg(VK_DBG_MSG_ERROR, VK_VALIDATION_LEVEL_0, object, 0, MEMTRACK_MISSING_MEM_BINDINGS, "MEM", str); printObjList(); } } else { char str[1024]; sprintf(str, "Trying to get mem binding for object %p but no such object in global list", (void*)object); - layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, object, 0, MEMTRACK_INVALID_OBJECT, "MEM", str); + layerCbMsg(VK_DBG_MSG_ERROR, VK_VALIDATION_LEVEL_0, object, 0, MEMTRACK_INVALID_OBJECT, "MEM", str); printObjList(); } return mem; @@ -722,38 +722,38 @@ static void printMemList() // Just printing each msg individually for now, may want to package these into single large print char str[1024]; sprintf(str, "MEM INFO : Details of Memory Object list of size %lu elements", memObjMap.size()); - layerCbMsg(XGL_DBG_MSG_UNKNOWN, XGL_VALIDATION_LEVEL_0, NULL, 0, MEMTRACK_NONE, "MEM", str); + layerCbMsg(VK_DBG_MSG_UNKNOWN, VK_VALIDATION_LEVEL_0, NULL, 0, MEMTRACK_NONE, "MEM", str); - for (map<XGL_GPU_MEMORY, MT_MEM_OBJ_INFO*>::iterator ii=memObjMap.begin(); ii!=memObjMap.end(); ++ii) { + for (map<VK_GPU_MEMORY, MT_MEM_OBJ_INFO*>::iterator ii=memObjMap.begin(); ii!=memObjMap.end(); ++ii) { pInfo = (*ii).second; sprintf(str, " ===MemObjInfo at %p===", (void*)pInfo); - layerCbMsg(XGL_DBG_MSG_UNKNOWN, XGL_VALIDATION_LEVEL_0, NULL, 0, MEMTRACK_NONE, "MEM", str); + layerCbMsg(VK_DBG_MSG_UNKNOWN, VK_VALIDATION_LEVEL_0, NULL, 0, MEMTRACK_NONE, "MEM", str); sprintf(str, " Mem object: %p", (void*)pInfo->mem); - layerCbMsg(XGL_DBG_MSG_UNKNOWN, XGL_VALIDATION_LEVEL_0, NULL, 0, MEMTRACK_NONE, "MEM", str); + layerCbMsg(VK_DBG_MSG_UNKNOWN, VK_VALIDATION_LEVEL_0, NULL, 0, MEMTRACK_NONE, "MEM", str); sprintf(str, " Ref Count: %u", pInfo->refCount); - layerCbMsg(XGL_DBG_MSG_UNKNOWN, XGL_VALIDATION_LEVEL_0, NULL, 0, MEMTRACK_NONE, "MEM", str); + layerCbMsg(VK_DBG_MSG_UNKNOWN, VK_VALIDATION_LEVEL_0, NULL, 0, MEMTRACK_NONE, "MEM", str); if (0 != pInfo->allocInfo.allocationSize) { - string pAllocInfoMsg = xgl_print_xgl_memory_alloc_info(&pInfo->allocInfo, "{MEM}INFO : "); + string pAllocInfoMsg = vk_print_vk_memory_alloc_info(&pInfo->allocInfo, "{MEM}INFO : "); sprintf(str, " Mem Alloc info:\n%s", pAllocInfoMsg.c_str()); - layerCbMsg(XGL_DBG_MSG_UNKNOWN, XGL_VALIDATION_LEVEL_0, NULL, 0, MEMTRACK_NONE, "MEM", str); + layerCbMsg(VK_DBG_MSG_UNKNOWN, VK_VALIDATION_LEVEL_0, NULL, 0, MEMTRACK_NONE, "MEM", str); } else { - sprintf(str, " Mem Alloc info is NULL (alloc done by xglWsiX11CreatePresentableImage())"); - layerCbMsg(XGL_DBG_MSG_UNKNOWN, XGL_VALIDATION_LEVEL_0, NULL, 0, MEMTRACK_NONE, "MEM", str); + sprintf(str, " Mem Alloc info is NULL (alloc done by vkWsiX11CreatePresentableImage())"); + layerCbMsg(VK_DBG_MSG_UNKNOWN, VK_VALIDATION_LEVEL_0, NULL, 0, MEMTRACK_NONE, "MEM", str); } - sprintf(str, " XGL OBJECT Binding list of size %lu elements:", pInfo->pObjBindings.size()); - layerCbMsg(XGL_DBG_MSG_UNKNOWN, XGL_VALIDATION_LEVEL_0, NULL, 0, MEMTRACK_NONE, "MEM", str); - for (list<XGL_OBJECT>::iterator it = pInfo->pObjBindings.begin(); it != pInfo->pObjBindings.end(); ++it) { - sprintf(str, " XGL OBJECT %p", (*it)); - layerCbMsg(XGL_DBG_MSG_UNKNOWN, XGL_VALIDATION_LEVEL_0, NULL, 0, MEMTRACK_NONE, "MEM", str); + sprintf(str, " VK OBJECT Binding list of size %lu elements:", pInfo->pObjBindings.size()); + layerCbMsg(VK_DBG_MSG_UNKNOWN, VK_VALIDATION_LEVEL_0, NULL, 0, MEMTRACK_NONE, "MEM", str); + for (list<VK_OBJECT>::iterator it = pInfo->pObjBindings.begin(); it != pInfo->pObjBindings.end(); ++it) { + sprintf(str, " VK OBJECT %p", (*it)); + layerCbMsg(VK_DBG_MSG_UNKNOWN, VK_VALIDATION_LEVEL_0, NULL, 0, MEMTRACK_NONE, "MEM", str); } - sprintf(str, " XGL Command Buffer (CB) binding list of size %lu elements", pInfo->pCmdBufferBindings.size()); - layerCbMsg(XGL_DBG_MSG_UNKNOWN, XGL_VALIDATION_LEVEL_0, NULL, 0, MEMTRACK_NONE, "MEM", str); - for (list<XGL_CMD_BUFFER>::iterator it = pInfo->pCmdBufferBindings.begin(); it != pInfo->pCmdBufferBindings.end(); ++it) { - sprintf(str, " XGL CB %p", (*it)); - layerCbMsg(XGL_DBG_MSG_UNKNOWN, XGL_VALIDATION_LEVEL_0, NULL, 0, MEMTRACK_NONE, "MEM", str); + sprintf(str, " VK Command Buffer (CB) binding list of size %lu elements", pInfo->pCmdBufferBindings.size()); + layerCbMsg(VK_DBG_MSG_UNKNOWN, VK_VALIDATION_LEVEL_0, NULL, 0, MEMTRACK_NONE, "MEM", str); + for (list<VK_CMD_BUFFER>::iterator it = pInfo->pCmdBufferBindings.begin(); it != pInfo->pCmdBufferBindings.end(); ++it) { + sprintf(str, " VK CB %p", (*it)); + layerCbMsg(VK_DBG_MSG_UNKNOWN, VK_VALIDATION_LEVEL_0, NULL, 0, MEMTRACK_NONE, "MEM", str); } } } @@ -763,19 +763,19 @@ static void printCBList() char str[1024] = {0}; MT_CB_INFO* pCBInfo = NULL; sprintf(str, "Details of CB list of size %lu elements", cbMap.size()); - layerCbMsg(XGL_DBG_MSG_UNKNOWN, XGL_VALIDATION_LEVEL_0, NULL, 0, MEMTRACK_NONE, "MEM", str); + layerCbMsg(VK_DBG_MSG_UNKNOWN, VK_VALIDATION_LEVEL_0, NULL, 0, MEMTRACK_NONE, "MEM", str); - for (map<XGL_CMD_BUFFER, MT_CB_INFO*>::iterator ii=cbMap.begin(); ii!=cbMap.end(); ++ii) { + for (map<VK_CMD_BUFFER, MT_CB_INFO*>::iterator ii=cbMap.begin(); ii!=cbMap.end(); ++ii) { pCBInfo = (*ii).second; sprintf(str, " CB Info (%p) has CB %p, fenceId %" PRIx64", and fence %p", (void*)pCBInfo, (void*)pCBInfo->cmdBuffer, pCBInfo->fenceId, (void*)getFenceFromId(pCBInfo->fenceId)); - layerCbMsg(XGL_DBG_MSG_UNKNOWN, XGL_VALIDATION_LEVEL_0, NULL, 0, MEMTRACK_NONE, "MEM", str); + layerCbMsg(VK_DBG_MSG_UNKNOWN, VK_VALIDATION_LEVEL_0, NULL, 0, MEMTRACK_NONE, "MEM", str); - for (list<XGL_GPU_MEMORY>::iterator it = pCBInfo->pMemObjList.begin(); it != pCBInfo->pMemObjList.end(); ++it) { + for (list<VK_GPU_MEMORY>::iterator it = pCBInfo->pMemObjList.begin(); it != pCBInfo->pMemObjList.end(); ++it) { sprintf(str, " Mem obj %p", (*it)); - layerCbMsg(XGL_DBG_MSG_UNKNOWN, XGL_VALIDATION_LEVEL_0, NULL, 0, MEMTRACK_NONE, "MEM", str); + layerCbMsg(VK_DBG_MSG_UNKNOWN, VK_VALIDATION_LEVEL_0, NULL, 0, MEMTRACK_NONE, "MEM", str); } } } @@ -787,7 +787,7 @@ static void initMemTracker(void) getLayerOptionEnum("MemTrackerReportLevel", (uint32_t *) &g_reportingLevel); g_actionIsDefault = getLayerOptionEnum("MemTrackerDebugAction", (uint32_t *) &g_debugAction); - if (g_debugAction & XGL_DBG_LAYER_ACTION_LOG_MSG) + if (g_debugAction & VK_DBG_LAYER_ACTION_LOG_MSG) { strOpt = getLayerOption("MemTrackerLogFilename"); if (strOpt) @@ -800,20 +800,20 @@ static void initMemTracker(void) // initialize Layer dispatch table // TODO handle multiple GPUs - xglGetProcAddrType fpNextGPA; + vkGetProcAddrType fpNextGPA; fpNextGPA = pCurObj->pGPA; assert(fpNextGPA); - layer_initialize_dispatch_table(&nextTable, fpNextGPA, (XGL_PHYSICAL_GPU) pCurObj->nextObject); + layer_initialize_dispatch_table(&nextTable, fpNextGPA, (VK_PHYSICAL_GPU) pCurObj->nextObject); - xglGetProcAddrType fpGetProcAddr = (xglGetProcAddrType)fpNextGPA((XGL_PHYSICAL_GPU) pCurObj->nextObject, (char *) "xglGetProcAddr"); + vkGetProcAddrType fpGetProcAddr = (vkGetProcAddrType)fpNextGPA((VK_PHYSICAL_GPU) pCurObj->nextObject, (char *) "vkGetProcAddr"); 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 + // suggestion is to call this during vkCreateInstance(), and then we + // can clean it up during vkDestroyInstance(). 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); @@ -821,39 +821,39 @@ static void initMemTracker(void) } } -XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglCreateDevice(XGL_PHYSICAL_GPU gpu, const XGL_DEVICE_CREATE_INFO* pCreateInfo, XGL_DEVICE* pDevice) +VK_LAYER_EXPORT VK_RESULT VKAPI vkCreateDevice(VK_PHYSICAL_GPU gpu, const VK_DEVICE_CREATE_INFO* pCreateInfo, VK_DEVICE* pDevice) { - XGL_BASE_LAYER_OBJECT* gpuw = (XGL_BASE_LAYER_OBJECT *) gpu; + VK_BASE_LAYER_OBJECT* gpuw = (VK_BASE_LAYER_OBJECT *) gpu; pCurObj = gpuw; loader_platform_thread_once(&g_initOnce, initMemTracker); - XGL_RESULT result = nextTable.CreateDevice((XGL_PHYSICAL_GPU)gpuw->nextObject, pCreateInfo, pDevice); + VK_RESULT result = nextTable.CreateDevice((VK_PHYSICAL_GPU)gpuw->nextObject, pCreateInfo, pDevice); // Save off device in case we need it to create Fences globalDevice = *pDevice; return result; } -XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglDestroyDevice(XGL_DEVICE device) +VK_LAYER_EXPORT VK_RESULT VKAPI vkDestroyDevice(VK_DEVICE device) { char str[1024]; - sprintf(str, "Printing List details prior to xglDestroyDevice()"); + sprintf(str, "Printing List details prior to vkDestroyDevice()"); loader_platform_thread_lock_mutex(&globalLock); - layerCbMsg(XGL_DBG_MSG_UNKNOWN, XGL_VALIDATION_LEVEL_0, device, 0, MEMTRACK_NONE, "MEM", str); + layerCbMsg(VK_DBG_MSG_UNKNOWN, VK_VALIDATION_LEVEL_0, device, 0, MEMTRACK_NONE, "MEM", str); printMemList(); printCBList(); printObjList(); - if (XGL_FALSE == deleteCBInfoList()) { - sprintf(str, "Issue deleting global CB list in xglDestroyDevice()"); - layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, device, 0, MEMTRACK_INTERNAL_ERROR, "MEM", str); + if (VK_FALSE == deleteCBInfoList()) { + sprintf(str, "Issue deleting global CB list in vkDestroyDevice()"); + layerCbMsg(VK_DBG_MSG_ERROR, VK_VALIDATION_LEVEL_0, device, 0, MEMTRACK_INTERNAL_ERROR, "MEM", str); } // Report any memory leaks MT_MEM_OBJ_INFO* pInfo = NULL; - for (map<XGL_GPU_MEMORY, MT_MEM_OBJ_INFO*>::iterator ii=memObjMap.begin(); ii!=memObjMap.end(); ++ii) { + for (map<VK_GPU_MEMORY, MT_MEM_OBJ_INFO*>::iterator ii=memObjMap.begin(); ii!=memObjMap.end(); ++ii) { pInfo = (*ii).second; if (pInfo->allocInfo.allocationSize != 0) { - sprintf(str, "Mem Object %p has not been freed. You should clean up this memory by calling xglFreeMemory(%p) prior to xglDestroyDevice().", + sprintf(str, "Mem Object %p has not been freed. You should clean up this memory by calling vkFreeMemory(%p) prior to vkDestroyDevice().", pInfo->mem, pInfo->mem); - layerCbMsg(XGL_DBG_MSG_WARNING, XGL_VALIDATION_LEVEL_0, pInfo->mem, 0, MEMTRACK_MEMORY_LEAK, "MEM", str); + layerCbMsg(VK_DBG_MSG_WARNING, VK_VALIDATION_LEVEL_0, pInfo->mem, 0, MEMTRACK_MEMORY_LEAK, "MEM", str); } } @@ -861,54 +861,54 @@ XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglDestroyDevice(XGL_DEVICE device) deleteQueueInfoList(); loader_platform_thread_unlock_mutex(&globalLock); - XGL_RESULT result = nextTable.DestroyDevice(device); + VK_RESULT result = nextTable.DestroyDevice(device); return result; } -XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglGetExtensionSupport(XGL_PHYSICAL_GPU gpu, const char* pExtName) +VK_LAYER_EXPORT VK_RESULT VKAPI vkGetExtensionSupport(VK_PHYSICAL_GPU gpu, const char* pExtName) { - XGL_BASE_LAYER_OBJECT* gpuw = (XGL_BASE_LAYER_OBJECT *) gpu; - XGL_RESULT result; + VK_BASE_LAYER_OBJECT* gpuw = (VK_BASE_LAYER_OBJECT *) gpu; + VK_RESULT result; /* This entrypoint is NOT going to init its own dispatch table since loader calls here early */ if (!strcmp(pExtName, "MemTracker")) { - result = XGL_SUCCESS; + result = VK_SUCCESS; } else if (nextTable.GetExtensionSupport != NULL) { - result = nextTable.GetExtensionSupport((XGL_PHYSICAL_GPU)gpuw->nextObject, pExtName); + result = nextTable.GetExtensionSupport((VK_PHYSICAL_GPU)gpuw->nextObject, pExtName); } else { - result = XGL_ERROR_INVALID_EXTENSION; + result = VK_ERROR_INVALID_EXTENSION; } return result; } -XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglEnumerateLayers(XGL_PHYSICAL_GPU gpu, size_t maxLayerCount, +VK_LAYER_EXPORT VK_RESULT VKAPI vkEnumerateLayers(VK_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; + VK_BASE_LAYER_OBJECT* gpuw = (VK_BASE_LAYER_OBJECT *) gpu; pCurObj = gpuw; loader_platform_thread_once(&g_initOnce, initMemTracker); - XGL_RESULT result = nextTable.EnumerateLayers((XGL_PHYSICAL_GPU)gpuw->nextObject, maxLayerCount, + VK_RESULT result = nextTable.EnumerateLayers((VK_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; + return VK_ERROR_INVALID_POINTER; // This layer compatible with all GPUs *pOutLayerCount = 1; strncpy((char *) pOutLayers[0], "MemTracker", maxStringSize); - return XGL_SUCCESS; + return VK_SUCCESS; } } -XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglGetDeviceQueue(XGL_DEVICE device, uint32_t queueNodeIndex, uint32_t queueIndex, XGL_QUEUE* pQueue) +VK_LAYER_EXPORT VK_RESULT VKAPI vkGetDeviceQueue(VK_DEVICE device, uint32_t queueNodeIndex, uint32_t queueIndex, VK_QUEUE* pQueue) { - XGL_RESULT result = nextTable.GetDeviceQueue(device, queueNodeIndex, queueIndex, pQueue); - if (result == XGL_SUCCESS) { + VK_RESULT result = nextTable.GetDeviceQueue(device, queueNodeIndex, queueIndex, pQueue); + if (result == VK_SUCCESS) { loader_platform_thread_lock_mutex(&globalLock); addQueueInfo(*pQueue); loader_platform_thread_unlock_mutex(&globalLock); @@ -916,24 +916,24 @@ XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglGetDeviceQueue(XGL_DEVICE device, uint32_t return result; } -XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglQueueAddMemReference(XGL_QUEUE queue, XGL_GPU_MEMORY mem) +VK_LAYER_EXPORT VK_RESULT VKAPI vkQueueAddMemReference(VK_QUEUE queue, VK_GPU_MEMORY mem) { - XGL_RESULT result = nextTable.QueueAddMemReference(queue, mem); - if (result == XGL_SUCCESS) { + VK_RESULT result = nextTable.QueueAddMemReference(queue, mem); + if (result == VK_SUCCESS) { loader_platform_thread_lock_mutex(&globalLock); MT_QUEUE_INFO *pQueueInfo = queueMap[queue]; if (pQueueInfo == NULL) { char str[1024]; sprintf(str, "Unknown Queue %p", queue); - layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, queue, 0, MEMTRACK_INVALID_QUEUE, "MEM", str); + layerCbMsg(VK_DBG_MSG_ERROR, VK_VALIDATION_LEVEL_0, queue, 0, MEMTRACK_INVALID_QUEUE, "MEM", str); } else { - if (checkMemRef(queue, mem) == XGL_TRUE) { + if (checkMemRef(queue, mem) == VK_TRUE) { // Alread in list, just warn char str[1024]; sprintf(str, "Request to add a memory reference (%p) to Queue %p -- ref is already present in the queue's reference list", mem, queue); - layerCbMsg(XGL_DBG_MSG_WARNING, XGL_VALIDATION_LEVEL_0, mem, 0, MEMTRACK_INVALID_MEM_REF, "MEM", str); + layerCbMsg(VK_DBG_MSG_WARNING, VK_VALIDATION_LEVEL_0, mem, 0, MEMTRACK_INVALID_MEM_REF, "MEM", str); } else { // Add to queue's memory reference list @@ -945,21 +945,21 @@ XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglQueueAddMemReference(XGL_QUEUE queue, XGL_ return result; } -XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglQueueRemoveMemReference(XGL_QUEUE queue, XGL_GPU_MEMORY mem) +VK_LAYER_EXPORT VK_RESULT VKAPI vkQueueRemoveMemReference(VK_QUEUE queue, VK_GPU_MEMORY mem) { // TODO : Decrement ref count for this memory reference on this queue. Remove if ref count is zero. - XGL_RESULT result = nextTable.QueueRemoveMemReference(queue, mem); - if (result == XGL_SUCCESS) { + VK_RESULT result = nextTable.QueueRemoveMemReference(queue, mem); + if (result == VK_SUCCESS) { loader_platform_thread_lock_mutex(&globalLock); MT_QUEUE_INFO *pQueueInfo = queueMap[queue]; if (pQueueInfo == NULL) { char str[1024]; sprintf(str, "Unknown Queue %p", queue); - layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, queue, 0, MEMTRACK_INVALID_QUEUE, "MEM", str); + layerCbMsg(VK_DBG_MSG_ERROR, VK_VALIDATION_LEVEL_0, queue, 0, MEMTRACK_INVALID_QUEUE, "MEM", str); } else { - for (list<XGL_GPU_MEMORY>::iterator it = pQueueInfo->pMemRefList.begin(); it != pQueueInfo->pMemRefList.end(); ++it) { + for (list<VK_GPU_MEMORY>::iterator it = pQueueInfo->pMemRefList.begin(); it != pQueueInfo->pMemRefList.end(); ++it) { if ((*it) == mem) { it = pQueueInfo->pMemRefList.erase(it); } @@ -970,11 +970,11 @@ XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglQueueRemoveMemReference(XGL_QUEUE queue, X return result; } -XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglQueueSubmit( - XGL_QUEUE queue, +VK_LAYER_EXPORT VK_RESULT VKAPI vkQueueSubmit( + VK_QUEUE queue, uint32_t cmdBufferCount, - const XGL_CMD_BUFFER *pCmdBuffers, - XGL_FENCE fence) + const VK_CMD_BUFFER *pCmdBuffers, + VK_FENCE fence) { loader_platform_thread_lock_mutex(&globalLock); // TODO : Need to track fence and clear mem references when fence clears @@ -988,20 +988,20 @@ XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglQueueSubmit( pCBInfo->fenceId = fenceId; } - if (XGL_FALSE == validateQueueMemRefs(queue, cmdBufferCount, pCmdBuffers)) { + if (VK_FALSE == validateQueueMemRefs(queue, cmdBufferCount, pCmdBuffers)) { char str[1024]; sprintf(str, "Unable to verify memory references for Queue %p", queue); - layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, queue, 0, MEMTRACK_INVALID_MEM_REF, "MEM", str); + layerCbMsg(VK_DBG_MSG_ERROR, VK_VALIDATION_LEVEL_0, queue, 0, MEMTRACK_INVALID_MEM_REF, "MEM", str); } loader_platform_thread_unlock_mutex(&globalLock); - XGL_RESULT result = nextTable.QueueSubmit(queue, cmdBufferCount, pCmdBuffers, getFenceFromId(fenceId)); + VK_RESULT result = nextTable.QueueSubmit(queue, cmdBufferCount, pCmdBuffers, getFenceFromId(fenceId)); return result; } -XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglAllocMemory(XGL_DEVICE device, const XGL_MEMORY_ALLOC_INFO* pAllocInfo, XGL_GPU_MEMORY* pMem) +VK_LAYER_EXPORT VK_RESULT VKAPI vkAllocMemory(VK_DEVICE device, const VK_MEMORY_ALLOC_INFO* pAllocInfo, VK_GPU_MEMORY* pMem) { - XGL_RESULT result = nextTable.AllocMemory(device, pAllocInfo, pMem); + VK_RESULT result = nextTable.AllocMemory(device, pAllocInfo, pMem); // TODO : Track allocations and overall size here loader_platform_thread_lock_mutex(&globalLock); addMemObjInfo(*pMem, pAllocInfo); @@ -1010,93 +1010,93 @@ XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglAllocMemory(XGL_DEVICE device, const XGL_M return result; } -XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglFreeMemory(XGL_GPU_MEMORY mem) +VK_LAYER_EXPORT VK_RESULT VKAPI vkFreeMemory(VK_GPU_MEMORY mem) { - /* From spec : A memory object is freed by calling xglFreeMemory() when it is no longer needed. Before + /* From spec : A memory object is freed by calling vkFreeMemory() when it is no longer needed. Before * freeing a memory object, an application must ensure the memory object is unbound from * all API objects referencing it and that it is not referenced by any queued command buffers */ loader_platform_thread_lock_mutex(&globalLock); - if (XGL_FALSE == freeMemObjInfo(mem, false)) { + if (VK_FALSE == freeMemObjInfo(mem, false)) { char str[1024]; sprintf(str, "Issue while freeing mem obj %p", (void*)mem); - layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, mem, 0, MEMTRACK_FREE_MEM_ERROR, "MEM", str); + layerCbMsg(VK_DBG_MSG_ERROR, VK_VALIDATION_LEVEL_0, mem, 0, MEMTRACK_FREE_MEM_ERROR, "MEM", str); } printMemList(); printObjList(); printCBList(); loader_platform_thread_unlock_mutex(&globalLock); - XGL_RESULT result = nextTable.FreeMemory(mem); + VK_RESULT result = nextTable.FreeMemory(mem); return result; } -XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglSetMemoryPriority(XGL_GPU_MEMORY mem, XGL_MEMORY_PRIORITY priority) +VK_LAYER_EXPORT VK_RESULT VKAPI vkSetMemoryPriority(VK_GPU_MEMORY mem, VK_MEMORY_PRIORITY priority) { // TODO : Update tracking for this alloc // Make sure memory is not pinned, which can't have priority set - XGL_RESULT result = nextTable.SetMemoryPriority(mem, priority); + VK_RESULT result = nextTable.SetMemoryPriority(mem, priority); return result; } -XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglMapMemory(XGL_GPU_MEMORY mem, XGL_FLAGS flags, void** ppData) +VK_LAYER_EXPORT VK_RESULT VKAPI vkMapMemory(VK_GPU_MEMORY mem, VK_FLAGS flags, void** ppData) { // TODO : Track when memory is mapped loader_platform_thread_lock_mutex(&globalLock); MT_MEM_OBJ_INFO *pMemObj = getMemObjInfo(mem); - if ((pMemObj->allocInfo.memProps & XGL_MEMORY_PROPERTY_CPU_VISIBLE_BIT) == 0) { + if ((pMemObj->allocInfo.memProps & VK_MEMORY_PROPERTY_CPU_VISIBLE_BIT) == 0) { char str[1024]; - sprintf(str, "Mapping Memory (%p) without XGL_MEMORY_PROPERTY_CPU_VISIBLE_BIT set", (void*)mem); - layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, mem, 0, MEMTRACK_INVALID_STATE, "MEM", str); + sprintf(str, "Mapping Memory (%p) without VK_MEMORY_PROPERTY_CPU_VISIBLE_BIT set", (void*)mem); + layerCbMsg(VK_DBG_MSG_ERROR, VK_VALIDATION_LEVEL_0, mem, 0, MEMTRACK_INVALID_STATE, "MEM", str); } loader_platform_thread_unlock_mutex(&globalLock); - XGL_RESULT result = nextTable.MapMemory(mem, flags, ppData); + VK_RESULT result = nextTable.MapMemory(mem, flags, ppData); return result; } -XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglUnmapMemory(XGL_GPU_MEMORY mem) +VK_LAYER_EXPORT VK_RESULT VKAPI vkUnmapMemory(VK_GPU_MEMORY mem) { // TODO : Track as memory gets unmapped, do we want to check what changed following map? // Make sure that memory was ever mapped to begin with - XGL_RESULT result = nextTable.UnmapMemory(mem); + VK_RESULT result = nextTable.UnmapMemory(mem); return result; } -XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglPinSystemMemory(XGL_DEVICE device, const void* pSysMem, size_t memSize, XGL_GPU_MEMORY* pMem) +VK_LAYER_EXPORT VK_RESULT VKAPI vkPinSystemMemory(VK_DEVICE device, const void* pSysMem, size_t memSize, VK_GPU_MEMORY* pMem) { // TODO : Track this // Verify that memory is actually pinnable - XGL_RESULT result = nextTable.PinSystemMemory(device, pSysMem, memSize, pMem); + VK_RESULT result = nextTable.PinSystemMemory(device, pSysMem, memSize, pMem); return result; } -XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglOpenSharedMemory(XGL_DEVICE device, const XGL_MEMORY_OPEN_INFO* pOpenInfo, XGL_GPU_MEMORY* pMem) +VK_LAYER_EXPORT VK_RESULT VKAPI vkOpenSharedMemory(VK_DEVICE device, const VK_MEMORY_OPEN_INFO* pOpenInfo, VK_GPU_MEMORY* pMem) { // TODO : Track this - XGL_RESULT result = nextTable.OpenSharedMemory(device, pOpenInfo, pMem); + VK_RESULT result = nextTable.OpenSharedMemory(device, pOpenInfo, pMem); return result; } -XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglOpenPeerMemory(XGL_DEVICE device, const XGL_PEER_MEMORY_OPEN_INFO* pOpenInfo, XGL_GPU_MEMORY* pMem) +VK_LAYER_EXPORT VK_RESULT VKAPI vkOpenPeerMemory(VK_DEVICE device, const VK_PEER_MEMORY_OPEN_INFO* pOpenInfo, VK_GPU_MEMORY* pMem) { // TODO : Track this - XGL_RESULT result = nextTable.OpenPeerMemory(device, pOpenInfo, pMem); + VK_RESULT result = nextTable.OpenPeerMemory(device, pOpenInfo, pMem); return result; } -XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglOpenPeerImage(XGL_DEVICE device, const XGL_PEER_IMAGE_OPEN_INFO* pOpenInfo, XGL_IMAGE* pImage, XGL_GPU_MEMORY* pMem) +VK_LAYER_EXPORT VK_RESULT VKAPI vkOpenPeerImage(VK_DEVICE device, const VK_PEER_IMAGE_OPEN_INFO* pOpenInfo, VK_IMAGE* pImage, VK_GPU_MEMORY* pMem) { // TODO : Track this - XGL_RESULT result = nextTable.OpenPeerImage(device, pOpenInfo, pImage, pMem); + VK_RESULT result = nextTable.OpenPeerImage(device, pOpenInfo, pImage, pMem); return result; } -XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglDestroyObject(XGL_OBJECT object) +VK_LAYER_EXPORT VK_RESULT VKAPI vkDestroyObject(VK_OBJECT object) { loader_platform_thread_lock_mutex(&globalLock); // First check if this is a CmdBuffer - if (NULL != getCBInfo((XGL_CMD_BUFFER)object)) { - deleteCBInfo((XGL_CMD_BUFFER)object); + if (NULL != getCBInfo((VK_CMD_BUFFER)object)) { + deleteCBInfo((VK_CMD_BUFFER)object); } if (objectMap.find(object) != objectMap.end()) { @@ -1104,14 +1104,14 @@ XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglDestroyObject(XGL_OBJECT object) if (pDelInfo->pMemObjInfo) { // Wsi allocated Memory is tied to image object so clear the binding and free that memory automatically if (0 == pDelInfo->pMemObjInfo->allocInfo.allocationSize) { // Wsi allocated memory has NULL allocInfo w/ 0 size - XGL_GPU_MEMORY memToFree = pDelInfo->pMemObjInfo->mem; + VK_GPU_MEMORY memToFree = pDelInfo->pMemObjInfo->mem; clearObjectBinding(object); freeMemObjInfo(memToFree, true); } else { char str[1024]; - sprintf(str, "Destroying obj %p that is still bound to memory object %p\nYou should first clear binding by calling xglBindObjectMemory(%p, 0, XGL_NULL_HANDLE, 0)", object, (void*)pDelInfo->pMemObjInfo->mem, object); - layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, object, 0, MEMTRACK_DESTROY_OBJECT_ERROR, "MEM", str); + sprintf(str, "Destroying obj %p that is still bound to memory object %p\nYou should first clear binding by calling vkBindObjectMemory(%p, 0, VK_NULL_HANDLE, 0)", object, (void*)pDelInfo->pMemObjInfo->mem, object); + layerCbMsg(VK_DBG_MSG_ERROR, VK_VALIDATION_LEVEL_0, object, 0, MEMTRACK_DESTROY_OBJECT_ERROR, "MEM", str); // From the spec : If an object has previous memory binding, it is required to unbind memory from an API object before it is destroyed. clearObjectBinding(object); } @@ -1121,28 +1121,28 @@ XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglDestroyObject(XGL_OBJECT object) } loader_platform_thread_unlock_mutex(&globalLock); - XGL_RESULT result = nextTable.DestroyObject(object); + VK_RESULT result = nextTable.DestroyObject(object); return result; } -XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglGetObjectInfo(XGL_BASE_OBJECT object, XGL_OBJECT_INFO_TYPE infoType, size_t* pDataSize, void* pData) +VK_LAYER_EXPORT VK_RESULT VKAPI vkGetObjectInfo(VK_BASE_OBJECT object, VK_OBJECT_INFO_TYPE infoType, size_t* pDataSize, void* pData) { // TODO : What to track here? // Could potentially save returned mem requirements and validate values passed into BindObjectMemory for this object // From spec : The only objects that are guaranteed to have no external memory requirements are devices, queues, command buffers, shaders and memory objects. - XGL_RESULT result = nextTable.GetObjectInfo(object, infoType, pDataSize, pData); + VK_RESULT result = nextTable.GetObjectInfo(object, infoType, pDataSize, pData); return result; } -XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglBindObjectMemory(XGL_OBJECT object, uint32_t allocationIdx, XGL_GPU_MEMORY mem, XGL_GPU_SIZE offset) +VK_LAYER_EXPORT VK_RESULT VKAPI vkBindObjectMemory(VK_OBJECT object, uint32_t allocationIdx, VK_GPU_MEMORY mem, VK_GPU_SIZE offset) { - XGL_RESULT result = nextTable.BindObjectMemory(object, allocationIdx, mem, offset); + VK_RESULT result = nextTable.BindObjectMemory(object, allocationIdx, mem, offset); loader_platform_thread_lock_mutex(&globalLock); // Track objects tied to memory - if (XGL_FALSE == updateObjectBinding(object, mem)) { + if (VK_FALSE == updateObjectBinding(object, mem)) { char str[1024]; sprintf(str, "Unable to set object %p binding to mem obj %p", (void*)object, (void*)mem); - layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, object, 0, MEMTRACK_MEMORY_BINDING_ERROR, "MEM", str); + layerCbMsg(VK_DBG_MSG_ERROR, VK_VALIDATION_LEVEL_0, object, 0, MEMTRACK_MEMORY_BINDING_ERROR, "MEM", str); } printObjList(); printMemList(); @@ -1150,28 +1150,28 @@ XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglBindObjectMemory(XGL_OBJECT object, uint32 return result; } -XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglCreateFence(XGL_DEVICE device, const XGL_FENCE_CREATE_INFO* pCreateInfo, XGL_FENCE* pFence) +VK_LAYER_EXPORT VK_RESULT VKAPI vkCreateFence(VK_DEVICE device, const VK_FENCE_CREATE_INFO* pCreateInfo, VK_FENCE* pFence) { - XGL_RESULT result = nextTable.CreateFence(device, pCreateInfo, pFence); - if (XGL_SUCCESS == result) { + VK_RESULT result = nextTable.CreateFence(device, pCreateInfo, pFence); + if (VK_SUCCESS == result) { loader_platform_thread_lock_mutex(&globalLock); - addObjectInfo(*pFence, pCreateInfo->sType, pCreateInfo, sizeof(XGL_FENCE_CREATE_INFO), "fence"); + addObjectInfo(*pFence, pCreateInfo->sType, pCreateInfo, sizeof(VK_FENCE_CREATE_INFO), "fence"); loader_platform_thread_unlock_mutex(&globalLock); } return result; } -XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglResetFences(XGL_DEVICE device, uint32_t fenceCount, XGL_FENCE* pFences) +VK_LAYER_EXPORT VK_RESULT VKAPI vkResetFences(VK_DEVICE device, uint32_t fenceCount, VK_FENCE* pFences) { - XGL_RESULT result = nextTable.ResetFences(device, fenceCount, pFences); - if (XGL_SUCCESS == result) { + VK_RESULT result = nextTable.ResetFences(device, fenceCount, pFences); + if (VK_SUCCESS == result) { loader_platform_thread_lock_mutex(&globalLock); // Reset fence state in fenceCreateInfo structure for (uint32_t i = 0; i < fenceCount; i++) { MT_OBJ_INFO* pObjectInfo = getObjectInfo(pFences[i]); if (pObjectInfo != NULL) { pObjectInfo->create_info.fence_create_info.flags = - static_cast<XGL_FENCE_CREATE_FLAGS>(pObjectInfo->create_info.fence_create_info.flags & ~XGL_FENCE_CREATE_SIGNALED_BIT); + static_cast<VK_FENCE_CREATE_FLAGS>(pObjectInfo->create_info.fence_create_info.flags & ~VK_FENCE_CREATE_SIGNALED_BIT); } } loader_platform_thread_unlock_mutex(&globalLock); @@ -1179,10 +1179,10 @@ XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglResetFences(XGL_DEVICE device, uint32_t fe return result; } -XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglGetFenceStatus(XGL_FENCE fence) +VK_LAYER_EXPORT VK_RESULT VKAPI vkGetFenceStatus(VK_FENCE fence) { - XGL_RESULT result = nextTable.GetFenceStatus(fence); - if (XGL_SUCCESS == result) { + VK_RESULT result = nextTable.GetFenceStatus(fence); + if (VK_SUCCESS == result) { loader_platform_thread_lock_mutex(&globalLock); updateFenceTracking(fence); loader_platform_thread_unlock_mutex(&globalLock); @@ -1190,24 +1190,24 @@ XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglGetFenceStatus(XGL_FENCE fence) return result; } -XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglWaitForFences(XGL_DEVICE device, uint32_t fenceCount, const XGL_FENCE* pFences, bool32_t waitAll, uint64_t timeout) +VK_LAYER_EXPORT VK_RESULT VKAPI vkWaitForFences(VK_DEVICE device, uint32_t fenceCount, const VK_FENCE* pFences, bool32_t waitAll, uint64_t timeout) { // Verify fence status of submitted fences for(uint32_t i = 0; i < fenceCount; i++) { MT_OBJ_INFO* pObjectInfo = getObjectInfo(pFences[i]); if (pObjectInfo != NULL) { - if (pObjectInfo->create_info.fence_create_info.flags == XGL_FENCE_CREATE_SIGNALED_BIT) { + if (pObjectInfo->create_info.fence_create_info.flags == VK_FENCE_CREATE_SIGNALED_BIT) { char str[1024]; - sprintf(str, "xglWaitForFences specified signaled-state Fence %p. Fences must be reset before being submitted", pFences[i]); - layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, pFences[i], 0, MEMTRACK_INVALID_FENCE_STATE, "MEM", str); + sprintf(str, "vkWaitForFences specified signaled-state Fence %p. Fences must be reset before being submitted", pFences[i]); + layerCbMsg(VK_DBG_MSG_ERROR, VK_VALIDATION_LEVEL_0, pFences[i], 0, MEMTRACK_INVALID_FENCE_STATE, "MEM", str); } } } - XGL_RESULT result = nextTable.WaitForFences(device, fenceCount, pFences, waitAll, timeout); + VK_RESULT result = nextTable.WaitForFences(device, fenceCount, pFences, waitAll, timeout); loader_platform_thread_lock_mutex(&globalLock); - if (XGL_SUCCESS == result) { + if (VK_SUCCESS == result) { if (waitAll || fenceCount == 1) { // Clear all the fences for(uint32_t i = 0; i < fenceCount; i++) { updateFenceTracking(pFences[i]); @@ -1218,10 +1218,10 @@ XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglWaitForFences(XGL_DEVICE device, uint32_t return result; } -XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglQueueWaitIdle(XGL_QUEUE queue) +VK_LAYER_EXPORT VK_RESULT VKAPI vkQueueWaitIdle(VK_QUEUE queue) { - XGL_RESULT result = nextTable.QueueWaitIdle(queue); - if (XGL_SUCCESS == result) { + VK_RESULT result = nextTable.QueueWaitIdle(queue); + if (VK_SUCCESS == result) { loader_platform_thread_lock_mutex(&globalLock); retireQueueFences(queue); loader_platform_thread_unlock_mutex(&globalLock); @@ -1229,10 +1229,10 @@ XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglQueueWaitIdle(XGL_QUEUE queue) return result; } -XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglDeviceWaitIdle(XGL_DEVICE device) +VK_LAYER_EXPORT VK_RESULT VKAPI vkDeviceWaitIdle(VK_DEVICE device) { - XGL_RESULT result = nextTable.DeviceWaitIdle(device); - if (XGL_SUCCESS == result) { + VK_RESULT result = nextTable.DeviceWaitIdle(device); + if (VK_SUCCESS == result) { loader_platform_thread_lock_mutex(&globalLock); retireDeviceFences(device); loader_platform_thread_unlock_mutex(&globalLock); @@ -1240,200 +1240,200 @@ XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglDeviceWaitIdle(XGL_DEVICE device) return result; } -XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglCreateEvent(XGL_DEVICE device, const XGL_EVENT_CREATE_INFO* pCreateInfo, XGL_EVENT* pEvent) +VK_LAYER_EXPORT VK_RESULT VKAPI vkCreateEvent(VK_DEVICE device, const VK_EVENT_CREATE_INFO* pCreateInfo, VK_EVENT* pEvent) { - XGL_RESULT result = nextTable.CreateEvent(device, pCreateInfo, pEvent); - if (XGL_SUCCESS == result) { + VK_RESULT result = nextTable.CreateEvent(device, pCreateInfo, pEvent); + if (VK_SUCCESS == result) { loader_platform_thread_lock_mutex(&globalLock); - addObjectInfo(*pEvent, pCreateInfo->sType, pCreateInfo, sizeof(XGL_EVENT_CREATE_INFO), "event"); + addObjectInfo(*pEvent, pCreateInfo->sType, pCreateInfo, sizeof(VK_EVENT_CREATE_INFO), "event"); loader_platform_thread_unlock_mutex(&globalLock); } return result; } -XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglCreateQueryPool(XGL_DEVICE device, const XGL_QUERY_POOL_CREATE_INFO* pCreateInfo, XGL_QUERY_POOL* pQueryPool) +VK_LAYER_EXPORT VK_RESULT VKAPI vkCreateQueryPool(VK_DEVICE device, const VK_QUERY_POOL_CREATE_INFO* pCreateInfo, VK_QUERY_POOL* pQueryPool) { - XGL_RESULT result = nextTable.CreateQueryPool(device, pCreateInfo, pQueryPool); - if (XGL_SUCCESS == result) { + VK_RESULT result = nextTable.CreateQueryPool(device, pCreateInfo, pQueryPool); + if (VK_SUCCESS == result) { loader_platform_thread_lock_mutex(&globalLock); - addObjectInfo(*pQueryPool, pCreateInfo->sType, pCreateInfo, sizeof(XGL_QUERY_POOL_CREATE_INFO), "query_pool"); + addObjectInfo(*pQueryPool, pCreateInfo->sType, pCreateInfo, sizeof(VK_QUERY_POOL_CREATE_INFO), "query_pool"); loader_platform_thread_unlock_mutex(&globalLock); } return result; } -XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglCreateBuffer(XGL_DEVICE device, const XGL_BUFFER_CREATE_INFO* pCreateInfo, XGL_BUFFER* pBuffer) +VK_LAYER_EXPORT VK_RESULT VKAPI vkCreateBuffer(VK_DEVICE device, const VK_BUFFER_CREATE_INFO* pCreateInfo, VK_BUFFER* pBuffer) { - XGL_RESULT result = nextTable.CreateBuffer(device, pCreateInfo, pBuffer); - if (XGL_SUCCESS == result) { + VK_RESULT result = nextTable.CreateBuffer(device, pCreateInfo, pBuffer); + if (VK_SUCCESS == result) { loader_platform_thread_lock_mutex(&globalLock); - addObjectInfo(*pBuffer, pCreateInfo->sType, pCreateInfo, sizeof(XGL_BUFFER_CREATE_INFO), "buffer"); + addObjectInfo(*pBuffer, pCreateInfo->sType, pCreateInfo, sizeof(VK_BUFFER_CREATE_INFO), "buffer"); loader_platform_thread_unlock_mutex(&globalLock); } return result; } -XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglCreateBufferView(XGL_DEVICE device, const XGL_BUFFER_VIEW_CREATE_INFO* pCreateInfo, XGL_BUFFER_VIEW* pView) +VK_LAYER_EXPORT VK_RESULT VKAPI vkCreateBufferView(VK_DEVICE device, const VK_BUFFER_VIEW_CREATE_INFO* pCreateInfo, VK_BUFFER_VIEW* pView) { - XGL_RESULT result = nextTable.CreateBufferView(device, pCreateInfo, pView); - if (result == XGL_SUCCESS) { + VK_RESULT result = nextTable.CreateBufferView(device, pCreateInfo, pView); + if (result == VK_SUCCESS) { loader_platform_thread_lock_mutex(&globalLock); - addObjectInfo(*pView, pCreateInfo->sType, pCreateInfo, sizeof(XGL_BUFFER_VIEW_CREATE_INFO), "buffer_view"); + addObjectInfo(*pView, pCreateInfo->sType, pCreateInfo, sizeof(VK_BUFFER_VIEW_CREATE_INFO), "buffer_view"); loader_platform_thread_unlock_mutex(&globalLock); } return result; } -XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglCreateImage(XGL_DEVICE device, const XGL_IMAGE_CREATE_INFO* pCreateInfo, XGL_IMAGE* pImage) +VK_LAYER_EXPORT VK_RESULT VKAPI vkCreateImage(VK_DEVICE device, const VK_IMAGE_CREATE_INFO* pCreateInfo, VK_IMAGE* pImage) { - XGL_RESULT result = nextTable.CreateImage(device, pCreateInfo, pImage); - if (XGL_SUCCESS == result) { + VK_RESULT result = nextTable.CreateImage(device, pCreateInfo, pImage); + if (VK_SUCCESS == result) { loader_platform_thread_lock_mutex(&globalLock); - addObjectInfo(*pImage, pCreateInfo->sType, pCreateInfo, sizeof(XGL_IMAGE_CREATE_INFO), "image"); + addObjectInfo(*pImage, pCreateInfo->sType, pCreateInfo, sizeof(VK_IMAGE_CREATE_INFO), "image"); 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) +VK_LAYER_EXPORT VK_RESULT VKAPI vkCreateImageView(VK_DEVICE device, const VK_IMAGE_VIEW_CREATE_INFO* pCreateInfo, VK_IMAGE_VIEW* pView) { - XGL_RESULT result = nextTable.CreateImageView(device, pCreateInfo, pView); - if (result == XGL_SUCCESS) { + VK_RESULT result = nextTable.CreateImageView(device, pCreateInfo, pView); + if (result == VK_SUCCESS) { loader_platform_thread_lock_mutex(&globalLock); - addObjectInfo(*pView, pCreateInfo->sType, pCreateInfo, sizeof(XGL_IMAGE_VIEW_CREATE_INFO), "image_view"); + addObjectInfo(*pView, pCreateInfo->sType, pCreateInfo, sizeof(VK_IMAGE_VIEW_CREATE_INFO), "image_view"); loader_platform_thread_unlock_mutex(&globalLock); } return result; } -XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglCreateColorAttachmentView(XGL_DEVICE device, const XGL_COLOR_ATTACHMENT_VIEW_CREATE_INFO* pCreateInfo, - XGL_COLOR_ATTACHMENT_VIEW* pView) +VK_LAYER_EXPORT VK_RESULT VKAPI vkCreateColorAttachmentView(VK_DEVICE device, const VK_COLOR_ATTACHMENT_VIEW_CREATE_INFO* pCreateInfo, + VK_COLOR_ATTACHMENT_VIEW* pView) { - XGL_RESULT result = nextTable.CreateColorAttachmentView(device, pCreateInfo, pView); - if (result == XGL_SUCCESS) { + VK_RESULT result = nextTable.CreateColorAttachmentView(device, pCreateInfo, pView); + if (result == VK_SUCCESS) { loader_platform_thread_lock_mutex(&globalLock); - addObjectInfo(*pView, pCreateInfo->sType, pCreateInfo, sizeof(XGL_COLOR_ATTACHMENT_VIEW_CREATE_INFO), "color_attachment_view"); + addObjectInfo(*pView, pCreateInfo->sType, pCreateInfo, sizeof(VK_COLOR_ATTACHMENT_VIEW_CREATE_INFO), "color_attachment_view"); loader_platform_thread_unlock_mutex(&globalLock); } return result; } -XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglCreateDepthStencilView(XGL_DEVICE device, const XGL_DEPTH_STENCIL_VIEW_CREATE_INFO* pCreateInfo, XGL_DEPTH_STENCIL_VIEW* pView) +VK_LAYER_EXPORT VK_RESULT VKAPI vkCreateDepthStencilView(VK_DEVICE device, const VK_DEPTH_STENCIL_VIEW_CREATE_INFO* pCreateInfo, VK_DEPTH_STENCIL_VIEW* pView) { - XGL_RESULT result = nextTable.CreateDepthStencilView(device, pCreateInfo, pView); - if (result == XGL_SUCCESS) { + VK_RESULT result = nextTable.CreateDepthStencilView(device, pCreateInfo, pView); + if (result == VK_SUCCESS) { loader_platform_thread_lock_mutex(&globalLock); - addObjectInfo(*pView, pCreateInfo->sType, pCreateInfo, sizeof(XGL_DEPTH_STENCIL_VIEW_CREATE_INFO), "ds_view"); + addObjectInfo(*pView, pCreateInfo->sType, pCreateInfo, sizeof(VK_DEPTH_STENCIL_VIEW_CREATE_INFO), "ds_view"); loader_platform_thread_unlock_mutex(&globalLock); } return result; } -XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglCreateShader(XGL_DEVICE device, const XGL_SHADER_CREATE_INFO* pCreateInfo, XGL_SHADER* pShader) +VK_LAYER_EXPORT VK_RESULT VKAPI vkCreateShader(VK_DEVICE device, const VK_SHADER_CREATE_INFO* pCreateInfo, VK_SHADER* pShader) { - XGL_RESULT result = nextTable.CreateShader(device, pCreateInfo, pShader); + VK_RESULT result = nextTable.CreateShader(device, pCreateInfo, pShader); return result; } -XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglCreateGraphicsPipeline(XGL_DEVICE device, const XGL_GRAPHICS_PIPELINE_CREATE_INFO* pCreateInfo, XGL_PIPELINE* pPipeline) +VK_LAYER_EXPORT VK_RESULT VKAPI vkCreateGraphicsPipeline(VK_DEVICE device, const VK_GRAPHICS_PIPELINE_CREATE_INFO* pCreateInfo, VK_PIPELINE* pPipeline) { - XGL_RESULT result = nextTable.CreateGraphicsPipeline(device, pCreateInfo, pPipeline); - if (result == XGL_SUCCESS) { + VK_RESULT result = nextTable.CreateGraphicsPipeline(device, pCreateInfo, pPipeline); + if (result == VK_SUCCESS) { loader_platform_thread_lock_mutex(&globalLock); - addObjectInfo(*pPipeline, pCreateInfo->sType, pCreateInfo, sizeof(XGL_GRAPHICS_PIPELINE_CREATE_INFO), "graphics_pipeline"); + addObjectInfo(*pPipeline, pCreateInfo->sType, pCreateInfo, sizeof(VK_GRAPHICS_PIPELINE_CREATE_INFO), "graphics_pipeline"); loader_platform_thread_unlock_mutex(&globalLock); } 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) +VK_LAYER_EXPORT VK_RESULT VKAPI vkCreateGraphicsPipelineDerivative( + VK_DEVICE device, + const VK_GRAPHICS_PIPELINE_CREATE_INFO* pCreateInfo, + VK_PIPELINE basePipeline, + VK_PIPELINE* pPipeline) { - XGL_RESULT result = nextTable.CreateGraphicsPipelineDerivative(device, pCreateInfo, basePipeline, pPipeline); - if (result == XGL_SUCCESS) { + VK_RESULT result = nextTable.CreateGraphicsPipelineDerivative(device, pCreateInfo, basePipeline, pPipeline); + if (result == VK_SUCCESS) { loader_platform_thread_lock_mutex(&globalLock); - addObjectInfo(*pPipeline, pCreateInfo->sType, pCreateInfo, sizeof(XGL_GRAPHICS_PIPELINE_CREATE_INFO), "graphics_pipeline"); + addObjectInfo(*pPipeline, pCreateInfo->sType, pCreateInfo, sizeof(VK_GRAPHICS_PIPELINE_CREATE_INFO), "graphics_pipeline"); loader_platform_thread_unlock_mutex(&globalLock); } return result; } -XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglCreateComputePipeline(XGL_DEVICE device, const XGL_COMPUTE_PIPELINE_CREATE_INFO* pCreateInfo, XGL_PIPELINE* pPipeline) +VK_LAYER_EXPORT VK_RESULT VKAPI vkCreateComputePipeline(VK_DEVICE device, const VK_COMPUTE_PIPELINE_CREATE_INFO* pCreateInfo, VK_PIPELINE* pPipeline) { - XGL_RESULT result = nextTable.CreateComputePipeline(device, pCreateInfo, pPipeline); - if (result == XGL_SUCCESS) { + VK_RESULT result = nextTable.CreateComputePipeline(device, pCreateInfo, pPipeline); + if (result == VK_SUCCESS) { loader_platform_thread_lock_mutex(&globalLock); - addObjectInfo(*pPipeline, pCreateInfo->sType, pCreateInfo, sizeof(XGL_COMPUTE_PIPELINE_CREATE_INFO), "compute_pipeline"); + addObjectInfo(*pPipeline, pCreateInfo->sType, pCreateInfo, sizeof(VK_COMPUTE_PIPELINE_CREATE_INFO), "compute_pipeline"); loader_platform_thread_unlock_mutex(&globalLock); } return result; } -XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglCreateSampler(XGL_DEVICE device, const XGL_SAMPLER_CREATE_INFO* pCreateInfo, XGL_SAMPLER* pSampler) +VK_LAYER_EXPORT VK_RESULT VKAPI vkCreateSampler(VK_DEVICE device, const VK_SAMPLER_CREATE_INFO* pCreateInfo, VK_SAMPLER* pSampler) { - XGL_RESULT result = nextTable.CreateSampler(device, pCreateInfo, pSampler); - if (result == XGL_SUCCESS) { + VK_RESULT result = nextTable.CreateSampler(device, pCreateInfo, pSampler); + if (result == VK_SUCCESS) { loader_platform_thread_lock_mutex(&globalLock); - addObjectInfo(*pSampler, pCreateInfo->sType, pCreateInfo, sizeof(XGL_SAMPLER_CREATE_INFO), "sampler"); + addObjectInfo(*pSampler, pCreateInfo->sType, pCreateInfo, sizeof(VK_SAMPLER_CREATE_INFO), "sampler"); loader_platform_thread_unlock_mutex(&globalLock); } return result; } -XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglCreateDynamicViewportState(XGL_DEVICE device, const XGL_DYNAMIC_VP_STATE_CREATE_INFO* pCreateInfo, - XGL_DYNAMIC_VP_STATE_OBJECT* pState) +VK_LAYER_EXPORT VK_RESULT VKAPI vkCreateDynamicViewportState(VK_DEVICE device, const VK_DYNAMIC_VP_STATE_CREATE_INFO* pCreateInfo, + VK_DYNAMIC_VP_STATE_OBJECT* pState) { - XGL_RESULT result = nextTable.CreateDynamicViewportState(device, pCreateInfo, pState); - if (result == XGL_SUCCESS) { + VK_RESULT result = nextTable.CreateDynamicViewportState(device, pCreateInfo, pState); + if (result == VK_SUCCESS) { loader_platform_thread_lock_mutex(&globalLock); - addObjectInfo(*pState, pCreateInfo->sType, pCreateInfo, sizeof(XGL_DYNAMIC_VP_STATE_CREATE_INFO), "viewport_state"); + addObjectInfo(*pState, pCreateInfo->sType, pCreateInfo, sizeof(VK_DYNAMIC_VP_STATE_CREATE_INFO), "viewport_state"); loader_platform_thread_unlock_mutex(&globalLock); } 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) +VK_LAYER_EXPORT VK_RESULT VKAPI vkCreateDynamicRasterState(VK_DEVICE device, const VK_DYNAMIC_RS_STATE_CREATE_INFO* pCreateInfo, + VK_DYNAMIC_RS_STATE_OBJECT* pState) { - XGL_RESULT result = nextTable.CreateDynamicRasterState(device, pCreateInfo, pState); - if (result == XGL_SUCCESS) { + VK_RESULT result = nextTable.CreateDynamicRasterState(device, pCreateInfo, pState); + if (result == VK_SUCCESS) { loader_platform_thread_lock_mutex(&globalLock); - addObjectInfo(*pState, pCreateInfo->sType, pCreateInfo, sizeof(XGL_DYNAMIC_RS_STATE_CREATE_INFO), "raster_state"); + addObjectInfo(*pState, pCreateInfo->sType, pCreateInfo, sizeof(VK_DYNAMIC_RS_STATE_CREATE_INFO), "raster_state"); loader_platform_thread_unlock_mutex(&globalLock); } 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) +VK_LAYER_EXPORT VK_RESULT VKAPI vkCreateDynamicColorBlendState(VK_DEVICE device, const VK_DYNAMIC_CB_STATE_CREATE_INFO* pCreateInfo, + VK_DYNAMIC_CB_STATE_OBJECT* pState) { - XGL_RESULT result = nextTable.CreateDynamicColorBlendState(device, pCreateInfo, pState); - if (result == XGL_SUCCESS) { + VK_RESULT result = nextTable.CreateDynamicColorBlendState(device, pCreateInfo, pState); + if (result == VK_SUCCESS) { loader_platform_thread_lock_mutex(&globalLock); - addObjectInfo(*pState, pCreateInfo->sType, pCreateInfo, sizeof(XGL_DYNAMIC_CB_STATE_CREATE_INFO), "cb_state"); + addObjectInfo(*pState, pCreateInfo->sType, pCreateInfo, sizeof(VK_DYNAMIC_CB_STATE_CREATE_INFO), "cb_state"); loader_platform_thread_unlock_mutex(&globalLock); } 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) +VK_LAYER_EXPORT VK_RESULT VKAPI vkCreateDynamicDepthStencilState(VK_DEVICE device, const VK_DYNAMIC_DS_STATE_CREATE_INFO* pCreateInfo, + VK_DYNAMIC_DS_STATE_OBJECT* pState) { - XGL_RESULT result = nextTable.CreateDynamicDepthStencilState(device, pCreateInfo, pState); - if (result == XGL_SUCCESS) { + VK_RESULT result = nextTable.CreateDynamicDepthStencilState(device, pCreateInfo, pState); + if (result == VK_SUCCESS) { loader_platform_thread_lock_mutex(&globalLock); - addObjectInfo(*pState, pCreateInfo->sType, pCreateInfo, sizeof(XGL_DYNAMIC_DS_STATE_CREATE_INFO), "ds_state"); + addObjectInfo(*pState, pCreateInfo->sType, pCreateInfo, sizeof(VK_DYNAMIC_DS_STATE_CREATE_INFO), "ds_state"); loader_platform_thread_unlock_mutex(&globalLock); } return result; } -XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglCreateCommandBuffer(XGL_DEVICE device, const XGL_CMD_BUFFER_CREATE_INFO* pCreateInfo, XGL_CMD_BUFFER* pCmdBuffer) +VK_LAYER_EXPORT VK_RESULT VKAPI vkCreateCommandBuffer(VK_DEVICE device, const VK_CMD_BUFFER_CREATE_INFO* pCreateInfo, VK_CMD_BUFFER* pCmdBuffer) { - XGL_RESULT result = nextTable.CreateCommandBuffer(device, pCreateInfo, pCmdBuffer); + VK_RESULT result = nextTable.CreateCommandBuffer(device, pCreateInfo, pCmdBuffer); // At time of cmd buffer creation, create global cmd buffer info for the returned cmd buffer loader_platform_thread_lock_mutex(&globalLock); if (*pCmdBuffer) @@ -1443,54 +1443,54 @@ XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglCreateCommandBuffer(XGL_DEVICE device, con return result; } -XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglBeginCommandBuffer(XGL_CMD_BUFFER cmdBuffer, const XGL_CMD_BUFFER_BEGIN_INFO* pBeginInfo) +VK_LAYER_EXPORT VK_RESULT VKAPI vkBeginCommandBuffer(VK_CMD_BUFFER cmdBuffer, const VK_CMD_BUFFER_BEGIN_INFO* pBeginInfo) { // This implicitly resets the Cmd Buffer so make sure any fence is done and then clear memory references MT_CB_INFO* pCBInfo = getCBInfo(cmdBuffer); if (pCBInfo && (!fenceRetired(pCBInfo->fenceId))) { bool32_t cbDone = checkCBCompleted(cmdBuffer); - if (XGL_FALSE == cbDone) { + if (VK_FALSE == cbDone) { char str[1024]; - sprintf(str, "Calling xglBeginCommandBuffer() on active CB %p before it has completed. You must check CB flag before this call.", cmdBuffer); - layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, cmdBuffer, 0, MEMTRACK_RESET_CB_WHILE_IN_FLIGHT, "MEM", str); + sprintf(str, "Calling vkBeginCommandBuffer() on active CB %p before it has completed. You must check CB flag before this call.", cmdBuffer); + layerCbMsg(VK_DBG_MSG_ERROR, VK_VALIDATION_LEVEL_0, cmdBuffer, 0, MEMTRACK_RESET_CB_WHILE_IN_FLIGHT, "MEM", str); } } - XGL_RESULT result = nextTable.BeginCommandBuffer(cmdBuffer, pBeginInfo); + VK_RESULT result = nextTable.BeginCommandBuffer(cmdBuffer, pBeginInfo); loader_platform_thread_lock_mutex(&globalLock); freeCBBindings(cmdBuffer); loader_platform_thread_unlock_mutex(&globalLock); return result; } -XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglEndCommandBuffer(XGL_CMD_BUFFER cmdBuffer) +VK_LAYER_EXPORT VK_RESULT VKAPI vkEndCommandBuffer(VK_CMD_BUFFER cmdBuffer) { // TODO : Anything to do here? - XGL_RESULT result = nextTable.EndCommandBuffer(cmdBuffer); + VK_RESULT result = nextTable.EndCommandBuffer(cmdBuffer); return result; } -XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglResetCommandBuffer(XGL_CMD_BUFFER cmdBuffer) +VK_LAYER_EXPORT VK_RESULT VKAPI vkResetCommandBuffer(VK_CMD_BUFFER cmdBuffer) { // Verify that CB is complete (not in-flight) MT_CB_INFO* pCBInfo = getCBInfo(cmdBuffer); if (pCBInfo && (!fenceRetired(pCBInfo->fenceId))) { bool32_t cbDone = checkCBCompleted(cmdBuffer); - if (XGL_FALSE == cbDone) { + if (VK_FALSE == cbDone) { char str[1024]; - sprintf(str, "Resetting CB %p before it has completed. You must check CB flag before calling xglResetCommandBuffer().", cmdBuffer); - layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, cmdBuffer, 0, MEMTRACK_RESET_CB_WHILE_IN_FLIGHT, "MEM", str); + sprintf(str, "Resetting CB %p before it has completed. You must check CB flag before calling vkResetCommandBuffer().", cmdBuffer); + layerCbMsg(VK_DBG_MSG_ERROR, VK_VALIDATION_LEVEL_0, cmdBuffer, 0, MEMTRACK_RESET_CB_WHILE_IN_FLIGHT, "MEM", str); } } // Clear memory references as this point. loader_platform_thread_lock_mutex(&globalLock); freeCBBindings(cmdBuffer); loader_platform_thread_unlock_mutex(&globalLock); - XGL_RESULT result = nextTable.ResetCommandBuffer(cmdBuffer); + VK_RESULT result = nextTable.ResetCommandBuffer(cmdBuffer); return result; } -// TODO : For any xglCmdBind* calls that include an object which has mem bound to it, +// TODO : For any vkCmdBind* calls that include an object which has mem bound to it, // need to account for that mem now having binding to given cmdBuffer -XGL_LAYER_EXPORT void XGLAPI xglCmdBindPipeline(XGL_CMD_BUFFER cmdBuffer, XGL_PIPELINE_BIND_POINT pipelineBindPoint, XGL_PIPELINE pipeline) +VK_LAYER_EXPORT void VKAPI vkCmdBindPipeline(VK_CMD_BUFFER cmdBuffer, VK_PIPELINE_BIND_POINT pipelineBindPoint, VK_PIPELINE pipeline) { #if 0 // TODO : If memory bound to pipeline, then need to tie that mem to cmdBuffer @@ -1501,19 +1501,19 @@ XGL_LAYER_EXPORT void XGLAPI xglCmdBindPipeline(XGL_CMD_BUFFER cmdBuffer, XGL_PI } else { char str[1024]; sprintf(str, "Attempt to bind Pipeline %p to non-existant command buffer %p!", (void*)pipeline, cmdBuffer); - layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, cmdBuffer, 0, MEMTRACK_INVALID_CB, (char *) "DS", (char *) str); + layerCbMsg(VK_DBG_MSG_ERROR, VK_VALIDATION_LEVEL_0, cmdBuffer, 0, MEMTRACK_INVALID_CB, (char *) "DS", (char *) str); } } 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, MEMTRACK_INVALID_OBJECT, (char *) "DS", (char *) str); + layerCbMsg(VK_DBG_MSG_ERROR, VK_VALIDATION_LEVEL_0, pipeline, 0, MEMTRACK_INVALID_OBJECT, (char *) "DS", (char *) str); } #endif 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) +VK_LAYER_EXPORT void VKAPI vkCmdBindDynamicStateObject(VK_CMD_BUFFER cmdBuffer, VK_STATE_BIND_POINT stateBindPoint, VK_DYNAMIC_STATE_OBJECT state) { MT_OBJ_INFO *pObjInfo; loader_platform_thread_lock_mutex(&globalLock); @@ -1521,330 +1521,330 @@ XGL_LAYER_EXPORT void XGLAPI xglCmdBindDynamicStateObject(XGL_CMD_BUFFER cmdBuff if (!pCmdBuf) { char str[1024]; sprintf(str, "Unable to find command buffer object %p, was it ever created?", (void*)cmdBuffer); - layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, cmdBuffer, 0, MEMTRACK_INVALID_CB, "DD", str); + layerCbMsg(VK_DBG_MSG_ERROR, VK_VALIDATION_LEVEL_0, cmdBuffer, 0, MEMTRACK_INVALID_CB, "DD", str); } pObjInfo = getObjectInfo(state); if (!pObjInfo) { 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, MEMTRACK_INVALID_OBJECT, "DD", str); + layerCbMsg(VK_DBG_MSG_ERROR, VK_VALIDATION_LEVEL_0, state, 0, MEMTRACK_INVALID_OBJECT, "DD", str); } pCmdBuf->pDynamicState[stateBindPoint] = pObjInfo; loader_platform_thread_unlock_mutex(&globalLock); nextTable.CmdBindDynamicStateObject(cmdBuffer, stateBindPoint, state); } -XGL_LAYER_EXPORT void XGLAPI xglCmdBindDescriptorSets( - XGL_CMD_BUFFER cmdBuffer, - XGL_PIPELINE_BIND_POINT pipelineBindPoint, - XGL_DESCRIPTOR_SET_LAYOUT_CHAIN layoutChain, +VK_LAYER_EXPORT void VKAPI vkCmdBindDescriptorSets( + VK_CMD_BUFFER cmdBuffer, + VK_PIPELINE_BIND_POINT pipelineBindPoint, + VK_DESCRIPTOR_SET_LAYOUT_CHAIN layoutChain, uint32_t layoutChainSlot, uint32_t count, - const XGL_DESCRIPTOR_SET* pDescriptorSets, + const VK_DESCRIPTOR_SET* pDescriptorSets, const uint32_t* pUserData) { // TODO : Somewhere need to verify that all textures referenced by shaders in DS are in some type of *SHADER_READ* state nextTable.CmdBindDescriptorSets(cmdBuffer, pipelineBindPoint, layoutChain, layoutChainSlot, count, pDescriptorSets, pUserData); } -XGL_LAYER_EXPORT void XGLAPI xglCmdBindVertexBuffer(XGL_CMD_BUFFER cmdBuffer, XGL_BUFFER buffer, XGL_GPU_SIZE offset, uint32_t binding) +VK_LAYER_EXPORT void VKAPI vkCmdBindVertexBuffer(VK_CMD_BUFFER cmdBuffer, VK_BUFFER buffer, VK_GPU_SIZE offset, uint32_t binding) { nextTable.CmdBindVertexBuffer(cmdBuffer, buffer, offset, binding); } -XGL_LAYER_EXPORT void XGLAPI xglCmdBindIndexBuffer(XGL_CMD_BUFFER cmdBuffer, XGL_BUFFER buffer, XGL_GPU_SIZE offset, XGL_INDEX_TYPE indexType) +VK_LAYER_EXPORT void VKAPI vkCmdBindIndexBuffer(VK_CMD_BUFFER cmdBuffer, VK_BUFFER buffer, VK_GPU_SIZE offset, VK_INDEX_TYPE indexType) { nextTable.CmdBindIndexBuffer(cmdBuffer, buffer, offset, indexType); } -XGL_LAYER_EXPORT void XGLAPI xglCmdDrawIndirect(XGL_CMD_BUFFER cmdBuffer, XGL_BUFFER buffer, XGL_GPU_SIZE offset, uint32_t count, uint32_t stride) +VK_LAYER_EXPORT void VKAPI vkCmdDrawIndirect(VK_CMD_BUFFER cmdBuffer, VK_BUFFER buffer, VK_GPU_SIZE offset, uint32_t count, uint32_t stride) { loader_platform_thread_lock_mutex(&globalLock); - XGL_GPU_MEMORY mem = getMemBindingFromObject(buffer); - if (XGL_FALSE == updateCBBinding(cmdBuffer, mem)) { + VK_GPU_MEMORY mem = getMemBindingFromObject(buffer); + if (VK_FALSE == updateCBBinding(cmdBuffer, mem)) { char str[1024]; - sprintf(str, "In xglCmdDrawIndirect() call unable to update binding of buffer %p to cmdBuffer %p", buffer, cmdBuffer); - layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, cmdBuffer, 0, MEMTRACK_MEMORY_BINDING_ERROR, "MEM", str); + sprintf(str, "In vkCmdDrawIndirect() call unable to update binding of buffer %p to cmdBuffer %p", buffer, cmdBuffer); + layerCbMsg(VK_DBG_MSG_ERROR, VK_VALIDATION_LEVEL_0, cmdBuffer, 0, MEMTRACK_MEMORY_BINDING_ERROR, "MEM", str); } loader_platform_thread_unlock_mutex(&globalLock); 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) +VK_LAYER_EXPORT void VKAPI vkCmdDrawIndexedIndirect(VK_CMD_BUFFER cmdBuffer, VK_BUFFER buffer, VK_GPU_SIZE offset, uint32_t count, uint32_t stride) { loader_platform_thread_lock_mutex(&globalLock); - XGL_GPU_MEMORY mem = getMemBindingFromObject(buffer); - if (XGL_FALSE == updateCBBinding(cmdBuffer, mem)) { + VK_GPU_MEMORY mem = getMemBindingFromObject(buffer); + if (VK_FALSE == updateCBBinding(cmdBuffer, mem)) { char str[1024]; - sprintf(str, "In xglCmdDrawIndexedIndirect() call unable to update binding of buffer %p to cmdBuffer %p", buffer, cmdBuffer); - layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, cmdBuffer, 0, MEMTRACK_MEMORY_BINDING_ERROR, "MEM", str); + sprintf(str, "In vkCmdDrawIndexedIndirect() call unable to update binding of buffer %p to cmdBuffer %p", buffer, cmdBuffer); + layerCbMsg(VK_DBG_MSG_ERROR, VK_VALIDATION_LEVEL_0, cmdBuffer, 0, MEMTRACK_MEMORY_BINDING_ERROR, "MEM", str); } loader_platform_thread_unlock_mutex(&globalLock); nextTable.CmdDrawIndexedIndirect(cmdBuffer, buffer, offset, count, stride); } -XGL_LAYER_EXPORT void XGLAPI xglCmdDispatchIndirect(XGL_CMD_BUFFER cmdBuffer, XGL_BUFFER buffer, XGL_GPU_SIZE offset) +VK_LAYER_EXPORT void VKAPI vkCmdDispatchIndirect(VK_CMD_BUFFER cmdBuffer, VK_BUFFER buffer, VK_GPU_SIZE offset) { loader_platform_thread_lock_mutex(&globalLock); - XGL_GPU_MEMORY mem = getMemBindingFromObject(buffer); - if (XGL_FALSE == updateCBBinding(cmdBuffer, mem)) { + VK_GPU_MEMORY mem = getMemBindingFromObject(buffer); + if (VK_FALSE == updateCBBinding(cmdBuffer, mem)) { char str[1024]; - sprintf(str, "In xglCmdDispatchIndirect() call unable to update binding of buffer %p to cmdBuffer %p", buffer, cmdBuffer); - layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, cmdBuffer, 0, MEMTRACK_MEMORY_BINDING_ERROR, "MEM", str); + sprintf(str, "In vkCmdDispatchIndirect() call unable to update binding of buffer %p to cmdBuffer %p", buffer, cmdBuffer); + layerCbMsg(VK_DBG_MSG_ERROR, VK_VALIDATION_LEVEL_0, cmdBuffer, 0, MEMTRACK_MEMORY_BINDING_ERROR, "MEM", str); } loader_platform_thread_unlock_mutex(&globalLock); 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) +VK_LAYER_EXPORT void VKAPI vkCmdCopyBuffer(VK_CMD_BUFFER cmdBuffer, VK_BUFFER srcBuffer, VK_BUFFER destBuffer, + uint32_t regionCount, const VK_BUFFER_COPY* pRegions) { loader_platform_thread_lock_mutex(&globalLock); - XGL_GPU_MEMORY mem = getMemBindingFromObject(srcBuffer); - if (XGL_FALSE == updateCBBinding(cmdBuffer, mem)) { + VK_GPU_MEMORY mem = getMemBindingFromObject(srcBuffer); + if (VK_FALSE == updateCBBinding(cmdBuffer, mem)) { char str[1024]; - sprintf(str, "In xglCmdCopyBuffer() call unable to update binding of srcBuffer %p to cmdBuffer %p", srcBuffer, cmdBuffer); - layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, cmdBuffer, 0, MEMTRACK_MEMORY_BINDING_ERROR, "MEM", str); + sprintf(str, "In vkCmdCopyBuffer() call unable to update binding of srcBuffer %p to cmdBuffer %p", srcBuffer, cmdBuffer); + layerCbMsg(VK_DBG_MSG_ERROR, VK_VALIDATION_LEVEL_0, cmdBuffer, 0, MEMTRACK_MEMORY_BINDING_ERROR, "MEM", str); } mem = getMemBindingFromObject(destBuffer); - if (XGL_FALSE == updateCBBinding(cmdBuffer, mem)) { + if (VK_FALSE == updateCBBinding(cmdBuffer, mem)) { char str[1024]; - sprintf(str, "In xglCmdCopyBuffer() call unable to update binding of destBuffer %p to cmdBuffer %p", destBuffer, cmdBuffer); - layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, cmdBuffer, 0, MEMTRACK_MEMORY_BINDING_ERROR, "MEM", str); + sprintf(str, "In vkCmdCopyBuffer() call unable to update binding of destBuffer %p to cmdBuffer %p", destBuffer, cmdBuffer); + layerCbMsg(VK_DBG_MSG_ERROR, VK_VALIDATION_LEVEL_0, cmdBuffer, 0, MEMTRACK_MEMORY_BINDING_ERROR, "MEM", str); } loader_platform_thread_unlock_mutex(&globalLock); 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) +VK_LAYER_EXPORT void VKAPI vkCmdCopyImage(VK_CMD_BUFFER cmdBuffer, + VK_IMAGE srcImage, VK_IMAGE_LAYOUT srcImageLayout, + VK_IMAGE destImage, VK_IMAGE_LAYOUT destImageLayout, + uint32_t regionCount, const VK_IMAGE_COPY* pRegions) { // TODO : Each image will have mem mapping so track them 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) +VK_LAYER_EXPORT void VKAPI vkCmdBlitImage(VK_CMD_BUFFER cmdBuffer, + VK_IMAGE srcImage, VK_IMAGE_LAYOUT srcImageLayout, + VK_IMAGE destImage, VK_IMAGE_LAYOUT destImageLayout, + uint32_t regionCount, const VK_IMAGE_BLIT* pRegions) { // TODO : Each image will have mem mapping so track them 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) +VK_LAYER_EXPORT void VKAPI vkCmdCopyBufferToImage(VK_CMD_BUFFER cmdBuffer, + VK_BUFFER srcBuffer, + VK_IMAGE destImage, VK_IMAGE_LAYOUT destImageLayout, + uint32_t regionCount, const VK_BUFFER_IMAGE_COPY* pRegions) { // TODO : Track this loader_platform_thread_lock_mutex(&globalLock); - XGL_GPU_MEMORY mem = getMemBindingFromObject(destImage); - if (XGL_FALSE == updateCBBinding(cmdBuffer, mem)) { + VK_GPU_MEMORY mem = getMemBindingFromObject(destImage); + if (VK_FALSE == updateCBBinding(cmdBuffer, mem)) { char str[1024]; - sprintf(str, "In xglCmdCopyMemoryToImage() call unable to update binding of destImage buffer %p to cmdBuffer %p", destImage, cmdBuffer); - layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, cmdBuffer, 0, MEMTRACK_MEMORY_BINDING_ERROR, "MEM", str); + sprintf(str, "In vkCmdCopyMemoryToImage() call unable to update binding of destImage buffer %p to cmdBuffer %p", destImage, cmdBuffer); + layerCbMsg(VK_DBG_MSG_ERROR, VK_VALIDATION_LEVEL_0, cmdBuffer, 0, MEMTRACK_MEMORY_BINDING_ERROR, "MEM", str); } mem = getMemBindingFromObject(srcBuffer); - if (XGL_FALSE == updateCBBinding(cmdBuffer, mem)) { + if (VK_FALSE == updateCBBinding(cmdBuffer, mem)) { char str[1024]; - sprintf(str, "In xglCmdCopyMemoryToImage() call unable to update binding of srcBuffer %p to cmdBuffer %p", srcBuffer, cmdBuffer); - layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, cmdBuffer, 0, MEMTRACK_MEMORY_BINDING_ERROR, "MEM", str); + sprintf(str, "In vkCmdCopyMemoryToImage() call unable to update binding of srcBuffer %p to cmdBuffer %p", srcBuffer, cmdBuffer); + layerCbMsg(VK_DBG_MSG_ERROR, VK_VALIDATION_LEVEL_0, cmdBuffer, 0, MEMTRACK_MEMORY_BINDING_ERROR, "MEM", str); } loader_platform_thread_unlock_mutex(&globalLock); 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) +VK_LAYER_EXPORT void VKAPI vkCmdCopyImageToBuffer(VK_CMD_BUFFER cmdBuffer, + VK_IMAGE srcImage, VK_IMAGE_LAYOUT srcImageLayout, + VK_BUFFER destBuffer, + uint32_t regionCount, const VK_BUFFER_IMAGE_COPY* pRegions) { // TODO : Track this loader_platform_thread_lock_mutex(&globalLock); - XGL_GPU_MEMORY mem = getMemBindingFromObject(srcImage); - if (XGL_FALSE == updateCBBinding(cmdBuffer, mem)) { + VK_GPU_MEMORY mem = getMemBindingFromObject(srcImage); + if (VK_FALSE == updateCBBinding(cmdBuffer, mem)) { char str[1024]; - sprintf(str, "In xglCmdCopyImageToMemory() call unable to update binding of srcImage buffer %p to cmdBuffer %p", srcImage, cmdBuffer); - layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, cmdBuffer, 0, MEMTRACK_MEMORY_BINDING_ERROR, "MEM", str); + sprintf(str, "In vkCmdCopyImageToMemory() call unable to update binding of srcImage buffer %p to cmdBuffer %p", srcImage, cmdBuffer); + layerCbMsg(VK_DBG_MSG_ERROR, VK_VALIDATION_LEVEL_0, cmdBuffer, 0, MEMTRACK_MEMORY_BINDING_ERROR, "MEM", str); } mem = getMemBindingFromObject(destBuffer); - if (XGL_FALSE == updateCBBinding(cmdBuffer, mem)) { + if (VK_FALSE == updateCBBinding(cmdBuffer, mem)) { char str[1024]; - sprintf(str, "In xglCmdCopyImageToMemory() call unable to update binding of destBuffer %p to cmdBuffer %p", destBuffer, cmdBuffer); - layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, cmdBuffer, 0, MEMTRACK_MEMORY_BINDING_ERROR, "MEM", str); + sprintf(str, "In vkCmdCopyImageToMemory() call unable to update binding of destBuffer %p to cmdBuffer %p", destBuffer, cmdBuffer); + layerCbMsg(VK_DBG_MSG_ERROR, VK_VALIDATION_LEVEL_0, cmdBuffer, 0, MEMTRACK_MEMORY_BINDING_ERROR, "MEM", str); } loader_platform_thread_unlock_mutex(&globalLock); 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) +VK_LAYER_EXPORT void VKAPI vkCmdCloneImageData(VK_CMD_BUFFER cmdBuffer, VK_IMAGE srcImage, VK_IMAGE_LAYOUT srcImageLayout, + VK_IMAGE destImage, VK_IMAGE_LAYOUT destImageLayout) { // TODO : Each image will have mem mapping so track them loader_platform_thread_lock_mutex(&globalLock); - XGL_GPU_MEMORY mem = getMemBindingFromObject(srcImage); - if (XGL_FALSE == updateCBBinding(cmdBuffer, mem)) { + VK_GPU_MEMORY mem = getMemBindingFromObject(srcImage); + if (VK_FALSE == updateCBBinding(cmdBuffer, mem)) { char str[1024]; - sprintf(str, "In xglCmdCloneImageData() call unable to update binding of srcImage buffer %p to cmdBuffer %p", srcImage, cmdBuffer); - layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, cmdBuffer, 0, MEMTRACK_MEMORY_BINDING_ERROR, "MEM", str); + sprintf(str, "In vkCmdCloneImageData() call unable to update binding of srcImage buffer %p to cmdBuffer %p", srcImage, cmdBuffer); + layerCbMsg(VK_DBG_MSG_ERROR, VK_VALIDATION_LEVEL_0, cmdBuffer, 0, MEMTRACK_MEMORY_BINDING_ERROR, "MEM", str); } mem = getMemBindingFromObject(destImage); - if (XGL_FALSE == updateCBBinding(cmdBuffer, mem)) { + if (VK_FALSE == updateCBBinding(cmdBuffer, mem)) { char str[1024]; - sprintf(str, "In xglCmdCloneImageData() call unable to update binding of destImage buffer %p to cmdBuffer %p", destImage, cmdBuffer); - layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, cmdBuffer, 0, MEMTRACK_MEMORY_BINDING_ERROR, "MEM", str); + sprintf(str, "In vkCmdCloneImageData() call unable to update binding of destImage buffer %p to cmdBuffer %p", destImage, cmdBuffer); + layerCbMsg(VK_DBG_MSG_ERROR, VK_VALIDATION_LEVEL_0, cmdBuffer, 0, MEMTRACK_MEMORY_BINDING_ERROR, "MEM", str); } loader_platform_thread_unlock_mutex(&globalLock); 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) +VK_LAYER_EXPORT void VKAPI vkCmdUpdateBuffer(VK_CMD_BUFFER cmdBuffer, VK_BUFFER destBuffer, VK_GPU_SIZE destOffset, VK_GPU_SIZE dataSize, const uint32_t* pData) { loader_platform_thread_lock_mutex(&globalLock); - XGL_GPU_MEMORY mem = getMemBindingFromObject(destBuffer); - if (XGL_FALSE == updateCBBinding(cmdBuffer, mem)) { + VK_GPU_MEMORY mem = getMemBindingFromObject(destBuffer); + if (VK_FALSE == updateCBBinding(cmdBuffer, mem)) { char str[1024]; - sprintf(str, "In xglCmdUpdateMemory() call unable to update binding of destBuffer %p to cmdBuffer %p", destBuffer, cmdBuffer); - layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, cmdBuffer, 0, MEMTRACK_MEMORY_BINDING_ERROR, "MEM", str); + sprintf(str, "In vkCmdUpdateMemory() call unable to update binding of destBuffer %p to cmdBuffer %p", destBuffer, cmdBuffer); + layerCbMsg(VK_DBG_MSG_ERROR, VK_VALIDATION_LEVEL_0, cmdBuffer, 0, MEMTRACK_MEMORY_BINDING_ERROR, "MEM", str); } loader_platform_thread_unlock_mutex(&globalLock); 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) +VK_LAYER_EXPORT void VKAPI vkCmdFillBuffer(VK_CMD_BUFFER cmdBuffer, VK_BUFFER destBuffer, VK_GPU_SIZE destOffset, VK_GPU_SIZE fillSize, uint32_t data) { loader_platform_thread_lock_mutex(&globalLock); - XGL_GPU_MEMORY mem = getMemBindingFromObject(destBuffer); - if (XGL_FALSE == updateCBBinding(cmdBuffer, mem)) { + VK_GPU_MEMORY mem = getMemBindingFromObject(destBuffer); + if (VK_FALSE == updateCBBinding(cmdBuffer, mem)) { char str[1024]; - sprintf(str, "In xglCmdFillMemory() call unable to update binding of destBuffer %p to cmdBuffer %p", destBuffer, cmdBuffer); - layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, cmdBuffer, 0, MEMTRACK_MEMORY_BINDING_ERROR, "MEM", str); + sprintf(str, "In vkCmdFillMemory() call unable to update binding of destBuffer %p to cmdBuffer %p", destBuffer, cmdBuffer); + layerCbMsg(VK_DBG_MSG_ERROR, VK_VALIDATION_LEVEL_0, cmdBuffer, 0, MEMTRACK_MEMORY_BINDING_ERROR, "MEM", str); } loader_platform_thread_unlock_mutex(&globalLock); 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) +VK_LAYER_EXPORT void VKAPI vkCmdClearColorImage(VK_CMD_BUFFER cmdBuffer, + VK_IMAGE image, VK_IMAGE_LAYOUT imageLayout, + VK_CLEAR_COLOR color, + uint32_t rangeCount, const VK_IMAGE_SUBRESOURCE_RANGE* pRanges) { - // TODO : Verify memory is in XGL_IMAGE_STATE_CLEAR state + // TODO : Verify memory is in VK_IMAGE_STATE_CLEAR state loader_platform_thread_lock_mutex(&globalLock); - XGL_GPU_MEMORY mem = getMemBindingFromObject(image); - if (XGL_FALSE == updateCBBinding(cmdBuffer, mem)) { + VK_GPU_MEMORY mem = getMemBindingFromObject(image); + if (VK_FALSE == updateCBBinding(cmdBuffer, mem)) { char str[1024]; - sprintf(str, "In xglCmdClearColorImage() call unable to update binding of image buffer %p to cmdBuffer %p", image, cmdBuffer); - layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, cmdBuffer, 0, MEMTRACK_MEMORY_BINDING_ERROR, "MEM", str); + sprintf(str, "In vkCmdClearColorImage() call unable to update binding of image buffer %p to cmdBuffer %p", image, cmdBuffer); + layerCbMsg(VK_DBG_MSG_ERROR, VK_VALIDATION_LEVEL_0, cmdBuffer, 0, MEMTRACK_MEMORY_BINDING_ERROR, "MEM", str); } loader_platform_thread_unlock_mutex(&globalLock); 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, +VK_LAYER_EXPORT void VKAPI vkCmdClearDepthStencil(VK_CMD_BUFFER cmdBuffer, + VK_IMAGE image, VK_IMAGE_LAYOUT imageLayout, float depth, uint32_t stencil, - uint32_t rangeCount, const XGL_IMAGE_SUBRESOURCE_RANGE* pRanges) + uint32_t rangeCount, const VK_IMAGE_SUBRESOURCE_RANGE* pRanges) { - // TODO : Verify memory is in XGL_IMAGE_STATE_CLEAR state + // TODO : Verify memory is in VK_IMAGE_STATE_CLEAR state loader_platform_thread_lock_mutex(&globalLock); - XGL_GPU_MEMORY mem = getMemBindingFromObject(image); - if (XGL_FALSE == updateCBBinding(cmdBuffer, mem)) { + VK_GPU_MEMORY mem = getMemBindingFromObject(image); + if (VK_FALSE == updateCBBinding(cmdBuffer, mem)) { char str[1024]; - sprintf(str, "In xglCmdClearDepthStencil() call unable to update binding of image buffer %p to cmdBuffer %p", image, cmdBuffer); - layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, cmdBuffer, 0, MEMTRACK_MEMORY_BINDING_ERROR, "MEM", str); + sprintf(str, "In vkCmdClearDepthStencil() call unable to update binding of image buffer %p to cmdBuffer %p", image, cmdBuffer); + layerCbMsg(VK_DBG_MSG_ERROR, VK_VALIDATION_LEVEL_0, cmdBuffer, 0, MEMTRACK_MEMORY_BINDING_ERROR, "MEM", str); } loader_platform_thread_unlock_mutex(&globalLock); 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) +VK_LAYER_EXPORT void VKAPI vkCmdResolveImage(VK_CMD_BUFFER cmdBuffer, + VK_IMAGE srcImage, VK_IMAGE_LAYOUT srcImageLayout, + VK_IMAGE destImage, VK_IMAGE_LAYOUT destImageLayout, + uint32_t rectCount, const VK_IMAGE_RESOLVE* pRects) { loader_platform_thread_lock_mutex(&globalLock); - XGL_GPU_MEMORY mem = getMemBindingFromObject(srcImage); - if (XGL_FALSE == updateCBBinding(cmdBuffer, mem)) { + VK_GPU_MEMORY mem = getMemBindingFromObject(srcImage); + if (VK_FALSE == updateCBBinding(cmdBuffer, mem)) { char str[1024]; - sprintf(str, "In xglCmdResolveImage() call unable to update binding of srcImage buffer %p to cmdBuffer %p", srcImage, cmdBuffer); - layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, cmdBuffer, 0, MEMTRACK_MEMORY_BINDING_ERROR, "MEM", str); + sprintf(str, "In vkCmdResolveImage() call unable to update binding of srcImage buffer %p to cmdBuffer %p", srcImage, cmdBuffer); + layerCbMsg(VK_DBG_MSG_ERROR, VK_VALIDATION_LEVEL_0, cmdBuffer, 0, MEMTRACK_MEMORY_BINDING_ERROR, "MEM", str); } mem = getMemBindingFromObject(destImage); - if (XGL_FALSE == updateCBBinding(cmdBuffer, mem)) { + if (VK_FALSE == updateCBBinding(cmdBuffer, mem)) { char str[1024]; - sprintf(str, "In xglCmdResolveImage() call unable to update binding of destImage buffer %p to cmdBuffer %p", destImage, cmdBuffer); - layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, cmdBuffer, 0, MEMTRACK_MEMORY_BINDING_ERROR, "MEM", str); + sprintf(str, "In vkCmdResolveImage() call unable to update binding of destImage buffer %p to cmdBuffer %p", destImage, cmdBuffer); + layerCbMsg(VK_DBG_MSG_ERROR, VK_VALIDATION_LEVEL_0, cmdBuffer, 0, MEMTRACK_MEMORY_BINDING_ERROR, "MEM", str); } loader_platform_thread_unlock_mutex(&globalLock); nextTable.CmdResolveImage(cmdBuffer, srcImage, srcImageLayout, destImage, destImageLayout, rectCount, pRects); } -XGL_LAYER_EXPORT void XGLAPI xglCmdBeginQuery(XGL_CMD_BUFFER cmdBuffer, XGL_QUERY_POOL queryPool, uint32_t slot, XGL_FLAGS flags) +VK_LAYER_EXPORT void VKAPI vkCmdBeginQuery(VK_CMD_BUFFER cmdBuffer, VK_QUERY_POOL queryPool, uint32_t slot, VK_FLAGS flags) { loader_platform_thread_lock_mutex(&globalLock); - XGL_GPU_MEMORY mem = getMemBindingFromObject(queryPool); - if (XGL_FALSE == updateCBBinding(cmdBuffer, mem)) { + VK_GPU_MEMORY mem = getMemBindingFromObject(queryPool); + if (VK_FALSE == updateCBBinding(cmdBuffer, mem)) { char str[1024]; - sprintf(str, "In xglCmdBeginQuery() call unable to update binding of queryPool buffer %p to cmdBuffer %p", queryPool, cmdBuffer); - layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, cmdBuffer, 0, MEMTRACK_MEMORY_BINDING_ERROR, "MEM", str); + sprintf(str, "In vkCmdBeginQuery() call unable to update binding of queryPool buffer %p to cmdBuffer %p", queryPool, cmdBuffer); + layerCbMsg(VK_DBG_MSG_ERROR, VK_VALIDATION_LEVEL_0, cmdBuffer, 0, MEMTRACK_MEMORY_BINDING_ERROR, "MEM", str); } loader_platform_thread_unlock_mutex(&globalLock); nextTable.CmdBeginQuery(cmdBuffer, queryPool, slot, flags); } -XGL_LAYER_EXPORT void XGLAPI xglCmdEndQuery(XGL_CMD_BUFFER cmdBuffer, XGL_QUERY_POOL queryPool, uint32_t slot) +VK_LAYER_EXPORT void VKAPI vkCmdEndQuery(VK_CMD_BUFFER cmdBuffer, VK_QUERY_POOL queryPool, uint32_t slot) { loader_platform_thread_lock_mutex(&globalLock); - XGL_GPU_MEMORY mem = getMemBindingFromObject(queryPool); - if (XGL_FALSE == updateCBBinding(cmdBuffer, mem)) { + VK_GPU_MEMORY mem = getMemBindingFromObject(queryPool); + if (VK_FALSE == updateCBBinding(cmdBuffer, mem)) { char str[1024]; - sprintf(str, "In xglCmdEndQuery() call unable to update binding of queryPool buffer %p to cmdBuffer %p", queryPool, cmdBuffer); - layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, cmdBuffer, 0, MEMTRACK_MEMORY_BINDING_ERROR, "MEM", str); + sprintf(str, "In vkCmdEndQuery() call unable to update binding of queryPool buffer %p to cmdBuffer %p", queryPool, cmdBuffer); + layerCbMsg(VK_DBG_MSG_ERROR, VK_VALIDATION_LEVEL_0, cmdBuffer, 0, MEMTRACK_MEMORY_BINDING_ERROR, "MEM", str); } loader_platform_thread_unlock_mutex(&globalLock); 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) +VK_LAYER_EXPORT void VKAPI vkCmdResetQueryPool(VK_CMD_BUFFER cmdBuffer, VK_QUERY_POOL queryPool, uint32_t startQuery, uint32_t queryCount) { loader_platform_thread_lock_mutex(&globalLock); - XGL_GPU_MEMORY mem = getMemBindingFromObject(queryPool); - if (XGL_FALSE == updateCBBinding(cmdBuffer, mem)) { + VK_GPU_MEMORY mem = getMemBindingFromObject(queryPool); + if (VK_FALSE == updateCBBinding(cmdBuffer, mem)) { char str[1024]; - sprintf(str, "In xglCmdResetQueryPool() call unable to update binding of queryPool buffer %p to cmdBuffer %p", queryPool, cmdBuffer); - layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, cmdBuffer, 0, MEMTRACK_MEMORY_BINDING_ERROR, "MEM", str); + sprintf(str, "In vkCmdResetQueryPool() call unable to update binding of queryPool buffer %p to cmdBuffer %p", queryPool, cmdBuffer); + layerCbMsg(VK_DBG_MSG_ERROR, VK_VALIDATION_LEVEL_0, cmdBuffer, 0, MEMTRACK_MEMORY_BINDING_ERROR, "MEM", str); } loader_platform_thread_unlock_mutex(&globalLock); nextTable.CmdResetQueryPool(cmdBuffer, queryPool, startQuery, queryCount); } -XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglDbgRegisterMsgCallback(XGL_INSTANCE instance, XGL_DBG_MSG_CALLBACK_FUNCTION pfnMsgCallback, void* pUserData) +VK_LAYER_EXPORT VK_RESULT VKAPI vkDbgRegisterMsgCallback(VK_INSTANCE instance, VK_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)); + VK_LAYER_DBG_FUNCTION_NODE *pNewDbgFuncNode = (VK_LAYER_DBG_FUNCTION_NODE*)malloc(sizeof(VK_LAYER_DBG_FUNCTION_NODE)); if (!pNewDbgFuncNode) - return XGL_ERROR_OUT_OF_MEMORY; + return VK_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; + g_debugAction = VK_DBG_LAYER_ACTION_CALLBACK; } - XGL_RESULT result = nextTable.DbgRegisterMsgCallback(instance, pfnMsgCallback, pUserData); + VK_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) +VK_LAYER_EXPORT VK_RESULT VKAPI vkDbgUnregisterMsgCallback(VK_INSTANCE instance, VK_DBG_MSG_CALLBACK_FUNCTION pfnMsgCallback) { - XGL_LAYER_DBG_FUNCTION_NODE *pInfo = g_pDbgFunctionHead; - XGL_LAYER_DBG_FUNCTION_NODE *pPrev = pInfo; + VK_LAYER_DBG_FUNCTION_NODE *pInfo = g_pDbgFunctionHead; + VK_LAYER_DBG_FUNCTION_NODE *pPrev = pInfo; while (pInfo) { if (pInfo->pfnMsgCallback == pfnMsgCallback) { pPrev->pNext = pInfo->pNext; @@ -1859,29 +1859,29 @@ XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglDbgUnregisterMsgCallback(XGL_INSTANCE inst if (g_pDbgFunctionHead == NULL) { if (g_actionIsDefault) { - g_debugAction = XGL_DBG_LAYER_ACTION_LOG_MSG; + g_debugAction = VK_DBG_LAYER_ACTION_LOG_MSG; } else { - g_debugAction = (XGL_LAYER_DBG_ACTION)(g_debugAction & ~((uint32_t)XGL_DBG_LAYER_ACTION_CALLBACK)); + g_debugAction = (VK_LAYER_DBG_ACTION)(g_debugAction & ~((uint32_t)VK_DBG_LAYER_ACTION_CALLBACK)); } } - XGL_RESULT result = nextTable.DbgUnregisterMsgCallback(instance, pfnMsgCallback); + VK_RESULT result = nextTable.DbgUnregisterMsgCallback(instance, pfnMsgCallback); return result; } #if !defined(WIN32) -XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglWsiX11CreatePresentableImage(XGL_DEVICE device, const XGL_WSI_X11_PRESENTABLE_IMAGE_CREATE_INFO* pCreateInfo, - XGL_IMAGE* pImage, XGL_GPU_MEMORY* pMem) +VK_LAYER_EXPORT VK_RESULT VKAPI vkWsiX11CreatePresentableImage(VK_DEVICE device, const VK_WSI_X11_PRESENTABLE_IMAGE_CREATE_INFO* pCreateInfo, + VK_IMAGE* pImage, VK_GPU_MEMORY* pMem) { - XGL_RESULT result = nextTable.WsiX11CreatePresentableImage(device, pCreateInfo, pImage, pMem); + VK_RESULT result = nextTable.WsiX11CreatePresentableImage(device, pCreateInfo, pImage, pMem); loader_platform_thread_lock_mutex(&globalLock); - if (XGL_SUCCESS == result) { + if (VK_SUCCESS == result) { // Add image object, then insert the new Mem Object and then bind it to created image - addObjectInfo(*pImage, _XGL_STRUCTURE_TYPE_MAX_ENUM, pCreateInfo, sizeof(XGL_WSI_X11_PRESENTABLE_IMAGE_CREATE_INFO), "wsi_x11_image"); + addObjectInfo(*pImage, _VK_STRUCTURE_TYPE_MAX_ENUM, pCreateInfo, sizeof(VK_WSI_X11_PRESENTABLE_IMAGE_CREATE_INFO), "wsi_x11_image"); addMemObjInfo(*pMem, NULL); - if (XGL_FALSE == updateObjectBinding(*pImage, *pMem)) { + if (VK_FALSE == updateObjectBinding(*pImage, *pMem)) { char str[1024]; - sprintf(str, "In xglWsiX11CreatePresentableImage(), unable to set image %p binding to mem obj %p", (void*)*pImage, (void*)*pMem); - layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, *pImage, 0, MEMTRACK_MEMORY_BINDING_ERROR, "MEM", str); + sprintf(str, "In vkWsiX11CreatePresentableImage(), unable to set image %p binding to mem obj %p", (void*)*pImage, (void*)*pMem); + layerCbMsg(VK_DBG_MSG_ERROR, VK_VALIDATION_LEVEL_0, *pImage, 0, MEMTRACK_MEMORY_BINDING_ERROR, "MEM", str); } } printObjList(); @@ -1890,179 +1890,179 @@ XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglWsiX11CreatePresentableImage(XGL_DEVICE de return result; } -XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglWsiX11QueuePresent(XGL_QUEUE queue, const XGL_WSI_X11_PRESENT_INFO* pPresentInfo, XGL_FENCE fence) +VK_LAYER_EXPORT VK_RESULT VKAPI vkWsiX11QueuePresent(VK_QUEUE queue, const VK_WSI_X11_PRESENT_INFO* pPresentInfo, VK_FENCE fence) { loader_platform_thread_lock_mutex(&globalLock); addFenceInfo(fence, queue); char str[1024]; - sprintf(str, "In xglWsiX11QueuePresent(), checking queue %p for fence %p", queue, fence); - layerCbMsg(XGL_DBG_MSG_UNKNOWN, XGL_VALIDATION_LEVEL_0, queue, 0, MEMTRACK_NONE, "MEM", str); + sprintf(str, "In vkWsiX11QueuePresent(), checking queue %p for fence %p", queue, fence); + layerCbMsg(VK_DBG_MSG_UNKNOWN, VK_VALIDATION_LEVEL_0, queue, 0, MEMTRACK_NONE, "MEM", str); loader_platform_thread_unlock_mutex(&globalLock); - XGL_RESULT result = nextTable.WsiX11QueuePresent(queue, pPresentInfo, fence); + VK_RESULT result = nextTable.WsiX11QueuePresent(queue, pPresentInfo, fence); return result; } #endif // WIN32 -XGL_LAYER_EXPORT void* XGLAPI xglGetProcAddr(XGL_PHYSICAL_GPU gpu, const char* funcName) +VK_LAYER_EXPORT void* VKAPI vkGetProcAddr(VK_PHYSICAL_GPU gpu, const char* funcName) { - XGL_BASE_LAYER_OBJECT* gpuw = (XGL_BASE_LAYER_OBJECT *) gpu; + VK_BASE_LAYER_OBJECT* gpuw = (VK_BASE_LAYER_OBJECT *) gpu; if (gpu == NULL) return NULL; pCurObj = gpuw; loader_platform_thread_once(&g_initOnce, initMemTracker); - if (!strcmp(funcName, "xglGetProcAddr")) - return (void *) xglGetProcAddr; - if (!strcmp(funcName, "xglCreateDevice")) - return (void*) xglCreateDevice; - if (!strcmp(funcName, "xglDestroyDevice")) - return (void*) xglDestroyDevice; - if (!strcmp(funcName, "xglGetExtensionSupport")) - return (void*) xglGetExtensionSupport; - if (!strcmp(funcName, "xglEnumerateLayers")) - return (void*) xglEnumerateLayers; - if (!strcmp(funcName, "xglQueueSubmit")) - return (void*) xglQueueSubmit; - if (!strcmp(funcName, "xglAllocMemory")) - return (void*) xglAllocMemory; - if (!strcmp(funcName, "xglFreeMemory")) - return (void*) xglFreeMemory; - if (!strcmp(funcName, "xglSetMemoryPriority")) - return (void*) xglSetMemoryPriority; - if (!strcmp(funcName, "xglMapMemory")) - return (void*) xglMapMemory; - if (!strcmp(funcName, "xglUnmapMemory")) - return (void*) xglUnmapMemory; - if (!strcmp(funcName, "xglPinSystemMemory")) - return (void*) xglPinSystemMemory; - if (!strcmp(funcName, "xglOpenSharedMemory")) - return (void*) xglOpenSharedMemory; - if (!strcmp(funcName, "xglOpenPeerMemory")) - return (void*) xglOpenPeerMemory; - if (!strcmp(funcName, "xglOpenPeerImage")) - return (void*) xglOpenPeerImage; - if (!strcmp(funcName, "xglDestroyObject")) - return (void*) xglDestroyObject; - if (!strcmp(funcName, "xglGetObjectInfo")) - return (void*) xglGetObjectInfo; - if (!strcmp(funcName, "xglBindObjectMemory")) - return (void*) xglBindObjectMemory; - if (!strcmp(funcName, "xglCreateFence")) - return (void*) xglCreateFence; - if (!strcmp(funcName, "xglGetFenceStatus")) - return (void*) xglGetFenceStatus; - if (!strcmp(funcName, "xglResetFences")) - return (void*) xglResetFences; - if (!strcmp(funcName, "xglWaitForFences")) - return (void*) xglWaitForFences; - if (!strcmp(funcName, "xglQueueWaitIdle")) - return (void*) xglQueueWaitIdle; - if (!strcmp(funcName, "xglDeviceWaitIdle")) - return (void*) xglDeviceWaitIdle; - if (!strcmp(funcName, "xglCreateEvent")) - return (void*) xglCreateEvent; - if (!strcmp(funcName, "xglCreateQueryPool")) - return (void*) xglCreateQueryPool; - if (!strcmp(funcName, "xglCreateBuffer")) - return (void*) xglCreateBuffer; - if (!strcmp(funcName, "xglCreateBufferView")) - return (void*) xglCreateBufferView; - if (!strcmp(funcName, "xglCreateImage")) - return (void*) xglCreateImage; - if (!strcmp(funcName, "xglCreateImageView")) - return (void*) xglCreateImageView; - if (!strcmp(funcName, "xglCreateColorAttachmentView")) - return (void*) xglCreateColorAttachmentView; - if (!strcmp(funcName, "xglCreateDepthStencilView")) - return (void*) xglCreateDepthStencilView; - if (!strcmp(funcName, "xglCreateShader")) - return (void*) xglCreateShader; - if (!strcmp(funcName, "xglCreateGraphicsPipeline")) - return (void*) xglCreateGraphicsPipeline; - if (!strcmp(funcName, "xglCreateGraphicsPipelineDerivative")) - return (void*) xglCreateGraphicsPipelineDerivative; - if (!strcmp(funcName, "xglCreateComputePipeline")) - return (void*) xglCreateComputePipeline; - if (!strcmp(funcName, "xglCreateSampler")) - return (void*) xglCreateSampler; - 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, "xglCmdBindDescriptorSets")) - return (void*) xglCmdBindDescriptorSets; - if (!strcmp(funcName, "xglCmdBindVertexBuffer")) - return (void*) xglCmdBindVertexBuffer; - if (!strcmp(funcName, "xglCmdBindIndexBuffer")) - return (void*) xglCmdBindIndexBuffer; - if (!strcmp(funcName, "xglCmdDrawIndirect")) - return (void*) xglCmdDrawIndirect; - if (!strcmp(funcName, "xglCmdDrawIndexedIndirect")) - return (void*) xglCmdDrawIndexedIndirect; - 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, "xglCmdBeginQuery")) - return (void*) xglCmdBeginQuery; - if (!strcmp(funcName, "xglCmdEndQuery")) - return (void*) xglCmdEndQuery; - if (!strcmp(funcName, "xglCmdResetQueryPool")) - return (void*) xglCmdResetQueryPool; - if (!strcmp(funcName, "xglDbgRegisterMsgCallback")) - return (void*) xglDbgRegisterMsgCallback; - if (!strcmp(funcName, "xglDbgUnregisterMsgCallback")) - return (void*) xglDbgUnregisterMsgCallback; - if (!strcmp(funcName, "xglGetDeviceQueue")) - return (void*) xglGetDeviceQueue; - if (!strcmp(funcName, "xglQueueAddMemReference")) - return (void*) xglQueueAddMemReference; - if (!strcmp(funcName, "xglQueueRemoveMemReference")) - return (void*) xglQueueRemoveMemReference; + if (!strcmp(funcName, "vkGetProcAddr")) + return (void *) vkGetProcAddr; + if (!strcmp(funcName, "vkCreateDevice")) + return (void*) vkCreateDevice; + if (!strcmp(funcName, "vkDestroyDevice")) + return (void*) vkDestroyDevice; + if (!strcmp(funcName, "vkGetExtensionSupport")) + return (void*) vkGetExtensionSupport; + if (!strcmp(funcName, "vkEnumerateLayers")) + return (void*) vkEnumerateLayers; + if (!strcmp(funcName, "vkQueueSubmit")) + return (void*) vkQueueSubmit; + if (!strcmp(funcName, "vkAllocMemory")) + return (void*) vkAllocMemory; + if (!strcmp(funcName, "vkFreeMemory")) + return (void*) vkFreeMemory; + if (!strcmp(funcName, "vkSetMemoryPriority")) + return (void*) vkSetMemoryPriority; + if (!strcmp(funcName, "vkMapMemory")) + return (void*) vkMapMemory; + if (!strcmp(funcName, "vkUnmapMemory")) + return (void*) vkUnmapMemory; + if (!strcmp(funcName, "vkPinSystemMemory")) + return (void*) vkPinSystemMemory; + if (!strcmp(funcName, "vkOpenSharedMemory")) + return (void*) vkOpenSharedMemory; + if (!strcmp(funcName, "vkOpenPeerMemory")) + return (void*) vkOpenPeerMemory; + if (!strcmp(funcName, "vkOpenPeerImage")) + return (void*) vkOpenPeerImage; + if (!strcmp(funcName, "vkDestroyObject")) + return (void*) vkDestroyObject; + if (!strcmp(funcName, "vkGetObjectInfo")) + return (void*) vkGetObjectInfo; + if (!strcmp(funcName, "vkBindObjectMemory")) + return (void*) vkBindObjectMemory; + if (!strcmp(funcName, "vkCreateFence")) + return (void*) vkCreateFence; + if (!strcmp(funcName, "vkGetFenceStatus")) + return (void*) vkGetFenceStatus; + if (!strcmp(funcName, "vkResetFences")) + return (void*) vkResetFences; + if (!strcmp(funcName, "vkWaitForFences")) + return (void*) vkWaitForFences; + if (!strcmp(funcName, "vkQueueWaitIdle")) + return (void*) vkQueueWaitIdle; + if (!strcmp(funcName, "vkDeviceWaitIdle")) + return (void*) vkDeviceWaitIdle; + if (!strcmp(funcName, "vkCreateEvent")) + return (void*) vkCreateEvent; + if (!strcmp(funcName, "vkCreateQueryPool")) + return (void*) vkCreateQueryPool; + if (!strcmp(funcName, "vkCreateBuffer")) + return (void*) vkCreateBuffer; + if (!strcmp(funcName, "vkCreateBufferView")) + return (void*) vkCreateBufferView; + if (!strcmp(funcName, "vkCreateImage")) + return (void*) vkCreateImage; + if (!strcmp(funcName, "vkCreateImageView")) + return (void*) vkCreateImageView; + if (!strcmp(funcName, "vkCreateColorAttachmentView")) + return (void*) vkCreateColorAttachmentView; + if (!strcmp(funcName, "vkCreateDepthStencilView")) + return (void*) vkCreateDepthStencilView; + if (!strcmp(funcName, "vkCreateShader")) + return (void*) vkCreateShader; + if (!strcmp(funcName, "vkCreateGraphicsPipeline")) + return (void*) vkCreateGraphicsPipeline; + if (!strcmp(funcName, "vkCreateGraphicsPipelineDerivative")) + return (void*) vkCreateGraphicsPipelineDerivative; + if (!strcmp(funcName, "vkCreateComputePipeline")) + return (void*) vkCreateComputePipeline; + if (!strcmp(funcName, "vkCreateSampler")) + return (void*) vkCreateSampler; + if (!strcmp(funcName, "vkCreateDynamicViewportState")) + return (void*) vkCreateDynamicViewportState; + if (!strcmp(funcName, "vkCreateDynamicRasterState")) + return (void*) vkCreateDynamicRasterState; + if (!strcmp(funcName, "vkCreateDynamicColorBlendState")) + return (void*) vkCreateDynamicColorBlendState; + if (!strcmp(funcName, "vkCreateDynamicDepthStencilState")) + return (void*) vkCreateDynamicDepthStencilState; + if (!strcmp(funcName, "vkCreateCommandBuffer")) + return (void*) vkCreateCommandBuffer; + if (!strcmp(funcName, "vkBeginCommandBuffer")) + return (void*) vkBeginCommandBuffer; + if (!strcmp(funcName, "vkEndCommandBuffer")) + return (void*) vkEndCommandBuffer; + if (!strcmp(funcName, "vkResetCommandBuffer")) + return (void*) vkResetCommandBuffer; + if (!strcmp(funcName, "vkCmdBindPipeline")) + return (void*) vkCmdBindPipeline; + if (!strcmp(funcName, "vkCmdBindDynamicStateObject")) + return (void*) vkCmdBindDynamicStateObject; + if (!strcmp(funcName, "vkCmdBindDescriptorSets")) + return (void*) vkCmdBindDescriptorSets; + if (!strcmp(funcName, "vkCmdBindVertexBuffer")) + return (void*) vkCmdBindVertexBuffer; + if (!strcmp(funcName, "vkCmdBindIndexBuffer")) + return (void*) vkCmdBindIndexBuffer; + if (!strcmp(funcName, "vkCmdDrawIndirect")) + return (void*) vkCmdDrawIndirect; + if (!strcmp(funcName, "vkCmdDrawIndexedIndirect")) + return (void*) vkCmdDrawIndexedIndirect; + if (!strcmp(funcName, "vkCmdDispatchIndirect")) + return (void*) vkCmdDispatchIndirect; + if (!strcmp(funcName, "vkCmdCopyBuffer")) + return (void*) vkCmdCopyBuffer; + if (!strcmp(funcName, "vkCmdCopyImage")) + return (void*) vkCmdCopyImage; + if (!strcmp(funcName, "vkCmdCopyBufferToImage")) + return (void*) vkCmdCopyBufferToImage; + if (!strcmp(funcName, "vkCmdCopyImageToBuffer")) + return (void*) vkCmdCopyImageToBuffer; + if (!strcmp(funcName, "vkCmdCloneImageData")) + return (void*) vkCmdCloneImageData; + if (!strcmp(funcName, "vkCmdUpdateBuffer")) + return (void*) vkCmdUpdateBuffer; + if (!strcmp(funcName, "vkCmdFillBuffer")) + return (void*) vkCmdFillBuffer; + if (!strcmp(funcName, "vkCmdClearColorImage")) + return (void*) vkCmdClearColorImage; + if (!strcmp(funcName, "vkCmdClearDepthStencil")) + return (void*) vkCmdClearDepthStencil; + if (!strcmp(funcName, "vkCmdResolveImage")) + return (void*) vkCmdResolveImage; + if (!strcmp(funcName, "vkCmdBeginQuery")) + return (void*) vkCmdBeginQuery; + if (!strcmp(funcName, "vkCmdEndQuery")) + return (void*) vkCmdEndQuery; + if (!strcmp(funcName, "vkCmdResetQueryPool")) + return (void*) vkCmdResetQueryPool; + if (!strcmp(funcName, "vkDbgRegisterMsgCallback")) + return (void*) vkDbgRegisterMsgCallback; + if (!strcmp(funcName, "vkDbgUnregisterMsgCallback")) + return (void*) vkDbgUnregisterMsgCallback; + if (!strcmp(funcName, "vkGetDeviceQueue")) + return (void*) vkGetDeviceQueue; + if (!strcmp(funcName, "vkQueueAddMemReference")) + return (void*) vkQueueAddMemReference; + if (!strcmp(funcName, "vkQueueRemoveMemReference")) + return (void*) vkQueueRemoveMemReference; #if !defined(WIN32) - if (!strcmp(funcName, "xglWsiX11CreatePresentableImage")) - return (void*) xglWsiX11CreatePresentableImage; - if (!strcmp(funcName, "xglWsiX11QueuePresent")) - return (void*) xglWsiX11QueuePresent; + if (!strcmp(funcName, "vkWsiX11CreatePresentableImage")) + return (void*) vkWsiX11CreatePresentableImage; + if (!strcmp(funcName, "vkWsiX11QueuePresent")) + return (void*) vkWsiX11QueuePresent; #endif else { if (gpuw->pGPA == NULL) return NULL; - return gpuw->pGPA((XGL_PHYSICAL_GPU)gpuw->nextObject, funcName); + return gpuw->pGPA((VK_PHYSICAL_GPU)gpuw->nextObject, funcName); } } |