diff options
| author | Tobin Ehlis <tobin@lunarg.com> | 2015-05-26 16:06:50 -0600 |
|---|---|---|
| committer | Tobin Ehlis <tobin@lunarg.com> | 2015-05-27 14:36:21 -0600 |
| commit | 325beb052d167b26ed659bc3f6c1348d2bcb06d2 (patch) | |
| tree | 6564b23e83d633f26982fdfe10433702d214a59a /layers/draw_state.cpp | |
| parent | 60e1939dd1e64dcbe39f036a45ab1c4b5ce5eded (diff) | |
| download | usermoji-325beb052d167b26ed659bc3f6c1348d2bcb06d2.tar.xz | |
layers: Fix drawState lock bug and don't call driver w/ bad pipeline
Diffstat (limited to 'layers/draw_state.cpp')
| -rwxr-xr-x | layers/draw_state.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/layers/draw_state.cpp b/layers/draw_state.cpp index 21345600..39b12b17 100755 --- a/layers/draw_state.cpp +++ b/layers/draw_state.cpp @@ -1575,6 +1575,7 @@ VK_LAYER_EXPORT VkResult VKAPI vkQueueSubmit(VkQueue queue, uint32_t cmdBufferCo sprintf(str, "You must call vkEndCommandBuffer() on CB %p before this call to vkQueueSubmit()!", pCB->cmdBuffer); layerCbMsg(VK_DBG_MSG_ERROR, VK_VALIDATION_LEVEL_0, pCB->cmdBuffer, 0, DRAWSTATE_NO_END_CMD_BUFFER, "DS", str); } + loader_platform_thread_unlock_mutex(&globalLock); for (auto ii=pCB->boundDescriptorSets.begin(); ii != pCB->boundDescriptorSets.end(); ++ii) { if (dsUpdateActive(*ii)) { char str[1024]; @@ -1582,7 +1583,6 @@ VK_LAYER_EXPORT VkResult VKAPI vkQueueSubmit(VkQueue queue, uint32_t cmdBufferCo layerCbMsg(VK_DBG_MSG_ERROR, VK_VALIDATION_LEVEL_0, *ii, 0, DRAWSTATE_BINDING_DS_NO_END_UPDATE, "DS", str); } } - loader_platform_thread_unlock_mutex(&globalLock); } VkResult result = nextTable.QueueSubmit(queue, cmdBufferCount, pCmdBuffers, fence); return result; @@ -2018,6 +2018,7 @@ VK_LAYER_EXPORT void VKAPI vkCmdBindPipeline(VkCmdBuffer cmdBuffer, VkPipelineBi g_lastBoundPipeline = pPN; loader_platform_thread_unlock_mutex(&globalLock); validatePipelineState(pCB, pipelineBindPoint, pipeline); + nextTable.CmdBindPipeline(cmdBuffer, pipelineBindPoint, pipeline); } else { char str[1024]; @@ -2030,7 +2031,6 @@ VK_LAYER_EXPORT void VKAPI vkCmdBindPipeline(VkCmdBuffer cmdBuffer, VkPipelineBi sprintf(str, "Attempt to use CmdBuffer %p that doesn't exist!", (void*)cmdBuffer); layerCbMsg(VK_DBG_MSG_ERROR, VK_VALIDATION_LEVEL_0, cmdBuffer, 0, DRAWSTATE_INVALID_CMD_BUFFER, "DS", str); } - nextTable.CmdBindPipeline(cmdBuffer, pipelineBindPoint, pipeline); } VK_LAYER_EXPORT void VKAPI vkCmdBindDynamicStateObject(VkCmdBuffer cmdBuffer, VkStateBindPoint stateBindPoint, VkDynamicStateObject state) |