From 374553cbc2d26d8a523cef7dd5b11150a09129d0 Mon Sep 17 00:00:00 2001 From: Courtney Goeltzenleuchter Date: Fri, 3 Apr 2015 16:35:32 -0600 Subject: xgl: combine xglCmdClearColor* into one function combined the two xglCmdClearColorImage* functions into one, with the XGL_CLEAR_COLOR struct bug # 13172 alpha header: r29626 --- layers/draw_state.c | 19 +------------------ layers/draw_state.cpp | 19 +------------------ layers/mem_tracker.cpp | 23 ++--------------------- 3 files changed, 4 insertions(+), 57 deletions(-) (limited to 'layers') diff --git a/layers/draw_state.c b/layers/draw_state.c index b79a015c..96f15a79 100644 --- a/layers/draw_state.c +++ b/layers/draw_state.c @@ -2415,7 +2415,7 @@ XGL_LAYER_EXPORT void XGLAPI xglCmdFillBuffer(XGL_CMD_BUFFER cmdBuffer, XGL_BUFF nextTable.CmdFillBuffer(cmdBuffer, destBuffer, destOffset, fillSize, data); } -XGL_LAYER_EXPORT void XGLAPI xglCmdClearColorImage(XGL_CMD_BUFFER cmdBuffer, XGL_IMAGE image, const float color[4], uint32_t rangeCount, const XGL_IMAGE_SUBRESOURCE_RANGE* pRanges) +XGL_LAYER_EXPORT void XGLAPI xglCmdClearColorImage(XGL_CMD_BUFFER cmdBuffer, XGL_IMAGE image, XGL_CLEAR_COLOR color, uint32_t rangeCount, const XGL_IMAGE_SUBRESOURCE_RANGE* pRanges) { GLOBAL_CB_NODE* pCB = getCBNode(cmdBuffer); if (pCB) { @@ -2430,21 +2430,6 @@ XGL_LAYER_EXPORT void XGLAPI xglCmdClearColorImage(XGL_CMD_BUFFER cmdBuffer, XGL nextTable.CmdClearColorImage(cmdBuffer, image, color, rangeCount, pRanges); } -XGL_LAYER_EXPORT void XGLAPI xglCmdClearColorImageRaw(XGL_CMD_BUFFER cmdBuffer, XGL_IMAGE image, const uint32_t color[4], uint32_t rangeCount, const XGL_IMAGE_SUBRESOURCE_RANGE* pRanges) -{ - GLOBAL_CB_NODE* pCB = getCBNode(cmdBuffer); - if (pCB) { - updateCBTracking(cmdBuffer); - addCmd(pCB, CMD_CLEARCOLORIMAGERAW); - } - else { - char str[1024]; - sprintf(str, "Attempt to use CmdBuffer %p that doesn't exist!", (void*)cmdBuffer); - layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, cmdBuffer, 0, DRAWSTATE_INVALID_CMD_BUFFER, "DS", str); - } - nextTable.CmdClearColorImageRaw(cmdBuffer, image, color, rangeCount, pRanges); -} - XGL_LAYER_EXPORT void XGLAPI xglCmdClearDepthStencil(XGL_CMD_BUFFER cmdBuffer, XGL_IMAGE image, float depth, uint32_t stencil, uint32_t rangeCount, const XGL_IMAGE_SUBRESOURCE_RANGE* pRanges) { GLOBAL_CB_NODE* pCB = getCBNode(cmdBuffer); @@ -2888,8 +2873,6 @@ XGL_LAYER_EXPORT void* XGLAPI xglGetProcAddr(XGL_PHYSICAL_GPU gpu, const char* f return (void*) xglCmdFillBuffer; if (!strcmp(funcName, "xglCmdClearColorImage")) return (void*) xglCmdClearColorImage; - if (!strcmp(funcName, "xglCmdClearColorImageRaw")) - return (void*) xglCmdClearColorImageRaw; if (!strcmp(funcName, "xglCmdClearDepthStencil")) return (void*) xglCmdClearDepthStencil; if (!strcmp(funcName, "xglCmdResolveImage")) diff --git a/layers/draw_state.cpp b/layers/draw_state.cpp index 97e31fe5..415634b7 100644 --- a/layers/draw_state.cpp +++ b/layers/draw_state.cpp @@ -2274,7 +2274,7 @@ XGL_LAYER_EXPORT void XGLAPI xglCmdFillBuffer(XGL_CMD_BUFFER cmdBuffer, XGL_BUFF nextTable.CmdFillBuffer(cmdBuffer, destBuffer, destOffset, fillSize, data); } -XGL_LAYER_EXPORT void XGLAPI xglCmdClearColorImage(XGL_CMD_BUFFER cmdBuffer, XGL_IMAGE image, const float color[4], uint32_t rangeCount, const XGL_IMAGE_SUBRESOURCE_RANGE* pRanges) +XGL_LAYER_EXPORT void XGLAPI xglCmdClearColorImage(XGL_CMD_BUFFER cmdBuffer, XGL_IMAGE image, XGL_CLEAR_COLOR color, uint32_t rangeCount, const XGL_IMAGE_SUBRESOURCE_RANGE* pRanges) { GLOBAL_CB_NODE* pCB = getCBNode(cmdBuffer); if (pCB) { @@ -2289,21 +2289,6 @@ XGL_LAYER_EXPORT void XGLAPI xglCmdClearColorImage(XGL_CMD_BUFFER cmdBuffer, XGL nextTable.CmdClearColorImage(cmdBuffer, image, color, rangeCount, pRanges); } -XGL_LAYER_EXPORT void XGLAPI xglCmdClearColorImageRaw(XGL_CMD_BUFFER cmdBuffer, XGL_IMAGE image, const uint32_t color[4], uint32_t rangeCount, const XGL_IMAGE_SUBRESOURCE_RANGE* pRanges) -{ - GLOBAL_CB_NODE* pCB = getCBNode(cmdBuffer); - if (pCB) { - updateCBTracking(cmdBuffer); - addCmd(pCB, CMD_CLEARCOLORIMAGERAW); - } - else { - char str[1024]; - sprintf(str, "Attempt to use CmdBuffer %p that doesn't exist!", (void*)cmdBuffer); - layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, cmdBuffer, 0, DRAWSTATE_INVALID_CMD_BUFFER, "DS", str); - } - nextTable.CmdClearColorImageRaw(cmdBuffer, image, color, rangeCount, pRanges); -} - XGL_LAYER_EXPORT void XGLAPI xglCmdClearDepthStencil(XGL_CMD_BUFFER cmdBuffer, XGL_IMAGE image, float depth, uint32_t stencil, uint32_t rangeCount, const XGL_IMAGE_SUBRESOURCE_RANGE* pRanges) { GLOBAL_CB_NODE* pCB = getCBNode(cmdBuffer); @@ -2792,8 +2777,6 @@ XGL_LAYER_EXPORT void* XGLAPI xglGetProcAddr(XGL_PHYSICAL_GPU gpu, const char* f return (void*) xglCmdFillBuffer; if (!strcmp(funcName, "xglCmdClearColorImage")) return (void*) xglCmdClearColorImage; - if (!strcmp(funcName, "xglCmdClearColorImageRaw")) - return (void*) xglCmdClearColorImageRaw; if (!strcmp(funcName, "xglCmdClearDepthStencil")) return (void*) xglCmdClearDepthStencil; if (!strcmp(funcName, "xglCmdResolveImage")) diff --git a/layers/mem_tracker.cpp b/layers/mem_tracker.cpp index 9b75d503..3c2dec09 100644 --- a/layers/mem_tracker.cpp +++ b/layers/mem_tracker.cpp @@ -1563,8 +1563,7 @@ XGL_LAYER_EXPORT void XGLAPI xglCmdFillBuffer(XGL_CMD_BUFFER cmdBuffer, XGL_BUFF nextTable.CmdFillBuffer(cmdBuffer, destBuffer, destOffset, fillSize, data); } -XGL_LAYER_EXPORT void XGLAPI xglCmdClearColorImage(XGL_CMD_BUFFER cmdBuffer, XGL_IMAGE image, const float color[4], - uint32_t rangeCount, const XGL_IMAGE_SUBRESOURCE_RANGE* pRanges) +XGL_LAYER_EXPORT void XGLAPI xglCmdClearColorImage(XGL_CMD_BUFFER cmdBuffer, XGL_IMAGE image, XGL_CLEAR_COLOR color, uint32_t rangeCount, const XGL_IMAGE_SUBRESOURCE_RANGE* pRanges) { // TODO : Verify memory is in XGL_IMAGE_STATE_CLEAR state loader_platform_thread_lock_mutex(&globalLock); @@ -1578,23 +1577,7 @@ XGL_LAYER_EXPORT void XGLAPI xglCmdClearColorImage(XGL_CMD_BUFFER cmdBuffer, XGL nextTable.CmdClearColorImage(cmdBuffer, image, color, rangeCount, pRanges); } -XGL_LAYER_EXPORT void XGLAPI xglCmdClearColorImageRaw(XGL_CMD_BUFFER cmdBuffer, XGL_IMAGE image, const uint32_t color[4], - uint32_t rangeCount, const XGL_IMAGE_SUBRESOURCE_RANGE* pRanges) -{ - // TODO : Verify memory is in XGL_IMAGE_STATE_CLEAR state - loader_platform_thread_lock_mutex(&globalLock); - XGL_GPU_MEMORY mem = getMemBindingFromObject(image); - if (XGL_FALSE == updateCBBinding(cmdBuffer, mem)) { - char str[1024]; - sprintf(str, "In xglCmdClearColorImageRaw() 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); - } - loader_platform_thread_unlock_mutex(&globalLock); - nextTable.CmdClearColorImageRaw(cmdBuffer, image, color, rangeCount, pRanges); -} - -XGL_LAYER_EXPORT void XGLAPI xglCmdClearDepthStencil(XGL_CMD_BUFFER cmdBuffer, XGL_IMAGE image, float depth, - uint32_t stencil, uint32_t rangeCount, const XGL_IMAGE_SUBRESOURCE_RANGE* pRanges) +XGL_LAYER_EXPORT void XGLAPI xglCmdClearDepthStencil(XGL_CMD_BUFFER cmdBuffer, XGL_IMAGE image, float depth, uint32_t stencil, uint32_t rangeCount, const XGL_IMAGE_SUBRESOURCE_RANGE* pRanges) { // TODO : Verify memory is in XGL_IMAGE_STATE_CLEAR state loader_platform_thread_lock_mutex(&globalLock); @@ -1874,8 +1857,6 @@ XGL_LAYER_EXPORT void* XGLAPI xglGetProcAddr(XGL_PHYSICAL_GPU gpu, const char* f return (void*) xglCmdFillBuffer; if (!strcmp(funcName, "xglCmdClearColorImage")) return (void*) xglCmdClearColorImage; - if (!strcmp(funcName, "xglCmdClearColorImageRaw")) - return (void*) xglCmdClearColorImageRaw; if (!strcmp(funcName, "xglCmdClearDepthStencil")) return (void*) xglCmdClearDepthStencil; if (!strcmp(funcName, "xglCmdResolveImage")) -- cgit v1.2.3