From 2dff5df7c4be2cebbf896e0093e391de2f926d17 Mon Sep 17 00:00:00 2001 From: Courtney Goeltzenleuchter Date: Fri, 10 Jul 2015 19:50:17 -0600 Subject: tests: Integrate command pools into tests --- layers/CMakeLists.txt | 2 +- layers/param_checker.cpp | 116 ++--------------------------------------------- 2 files changed, 4 insertions(+), 114 deletions(-) (limited to 'layers') diff --git a/layers/CMakeLists.txt b/layers/CMakeLists.txt index 98b3fc61..ea08e4d8 100644 --- a/layers/CMakeLists.txt +++ b/layers/CMakeLists.txt @@ -138,7 +138,7 @@ add_vk_layer(MemTracker mem_tracker.cpp vk_layer_table.cpp) add_vk_layer(ShaderChecker shader_checker.cpp vk_layer_table.cpp) add_vk_layer(Image image.cpp vk_layer_table.cpp) # TODO: Re-enable after ParamChecker updated -#add_vk_layer(ParamChecker param_checker.cpp vk_layer_debug_marker_table.cpp vk_layer_table.cpp) +add_vk_layer(ParamChecker param_checker.cpp vk_layer_debug_marker_table.cpp vk_layer_table.cpp) #add_vk_layer(ScreenShot screenshot.cpp vk_layer_table.cpp) # generated add_vk_layer(Generic generic_layer.cpp vk_layer_table.cpp) diff --git a/layers/param_checker.cpp b/layers/param_checker.cpp index 17ccad40..8a7c672e 100644 --- a/layers/param_checker.cpp +++ b/layers/param_checker.cpp @@ -4665,20 +4665,8 @@ bool PreCreateGraphicsPipeline( "vkCreateGraphicsPipeline parameter, VkStructureType pCreateInfo->pDsState->sType, is unrecognized enumerator"); return false; } -<<<<<<< HEAD - if(pCreateInfo->pDsState->depthCompareOp < VK_COMPARE_OP_BEGIN_RANGE || - pCreateInfo->pDsState->depthCompareOp > VK_COMPARE_OP_END_RANGE) -======= - if(pCreateInfo->pDepthStencilState->format < VK_FORMAT_BEGIN_RANGE || - pCreateInfo->pDepthStencilState->format > VK_FORMAT_END_RANGE) - { - log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", - "vkCreateGraphicsPipeline parameter, VkFormat pCreateInfo->pDsState->format, is unrecognized enumerator"); - return false; - } if(pCreateInfo->pDepthStencilState->depthCompareOp < VK_COMPARE_OP_BEGIN_RANGE || pCreateInfo->pDepthStencilState->depthCompareOp > VK_COMPARE_OP_END_RANGE) ->>>>>>> fd61c93... Bug 14224: Remove abbreviations on some API symbols { log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", "vkCreateGraphicsPipeline parameter, VkCompareOp pCreateInfo->pDsState->depthCompareOp, is unrecognized enumerator"); @@ -4817,24 +4805,13 @@ bool PreCreateGraphicsPipeline( } if(!ValidateEnumerator((VkChannelFlagBits)pCreateInfo->pColorBlendState->pAttachments->channelWriteMask)) { -<<<<<<< HEAD - std::string reason = "vkCreateGraphicsPipeline parameter, VkChannelFlags pCreateInfo->pCbState->pAttachments->channelWriteMask, is " + EnumeratorString((VkChannelFlagBits)pCreateInfo->pCbState->pAttachments->channelWriteMask); - log_msg(mdd(device), VK_DBG_REPORT_WARN_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", reason.c_str()); -======= std::string reason = "vkCreateGraphicsPipeline parameter, VkChannelFlags pCreateInfo->pCbState->pAttachments->channelWriteMask, is " + EnumeratorString((VkChannelFlagBits)pCreateInfo->pColorBlendState->pAttachments->channelWriteMask); log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", reason.c_str()); ->>>>>>> fd61c93... Bug 14224: Remove abbreviations on some API symbols return false; } if(!ValidateEnumerator((VkPipelineCreateFlagBits)pCreateInfo->flags)) { std::string reason = "vkCreateGraphicsPipeline parameter, VkPipelineCreateFlags pCreateInfo->flags, is " + EnumeratorString((VkPipelineCreateFlagBits)pCreateInfo->flags); -<<<<<<< HEAD - log_msg(mdd(device), VK_DBG_REPORT_WARN_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", reason.c_str()); - return false; - } - if(pCreateInfo->layout.handle == 0) -======= log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", reason.c_str()); return false; } @@ -4865,27 +4842,11 @@ bool PostCreateGraphicsPipeline( return true; } -VK_LAYER_EXPORT VkResult VKAPI vkCreateGraphicsPipeline( - VkDevice device, - const VkGraphicsPipelineCreateInfo* pCreateInfo, - VkPipeline* pPipeline) -{ - PreCreateGraphicsPipeline(device, pCreateInfo); - - VkResult result = get_dispatch_table(pc_device_table_map, device)->CreateGraphicsPipeline(device, pCreateInfo, pPipeline); - - PostCreateGraphicsPipeline(device, pPipeline, result); - - return result; -} - bool PostDestroyPipeline( VkDevice device, VkPipeline pipeline, VkResult result) { - - if(result != VK_SUCCESS) { std::string reason = "vkDestroyPipeline parameter, VkResult result, is " + EnumeratorString(result); @@ -4896,17 +4857,6 @@ bool PostDestroyPipeline( return true; } -VK_LAYER_EXPORT VkResult VKAPI vkDestroyPipeline( - VkDevice device, - VkPipeline pipeline) -{ - VkResult result = get_dispatch_table(pc_device_table_map, device)->DestroyPipeline(device, pipeline); - - PostDestroyPipeline(device, pipeline, result); - - return result; -} - bool PreCreateGraphicsPipelineDerivative( VkDevice device, const VkGraphicsPipelineCreateInfo* pCreateInfo) @@ -5135,13 +5085,6 @@ bool PreCreateGraphicsPipelineDerivative( "vkCreateGraphicsPipelineDerivative parameter, VkStructureType pCreateInfo->pDsState->sType, is unrecognized enumerator"); return false; } - if(pCreateInfo->pDepthStencilState->format < VK_FORMAT_BEGIN_RANGE || - pCreateInfo->pDepthStencilState->format > VK_FORMAT_END_RANGE) - { - log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", - "vkCreateGraphicsPipelineDerivative parameter, VkFormat pCreateInfo->pDsState->format, is unrecognized enumerator"); - return false; - } if(pCreateInfo->pDepthStencilState->depthCompareOp < VK_COMPARE_OP_BEGIN_RANGE || pCreateInfo->pDepthStencilState->depthCompareOp > VK_COMPARE_OP_END_RANGE) { @@ -5321,21 +5264,6 @@ bool PostCreateGraphicsPipelineDerivative( return true; } -VK_LAYER_EXPORT VkResult VKAPI vkCreateGraphicsPipelineDerivative( - VkDevice device, - const VkGraphicsPipelineCreateInfo* pCreateInfo, - VkPipeline basePipeline, - VkPipeline* pPipeline) -{ - PreCreateGraphicsPipelineDerivative(device, pCreateInfo); - - VkResult result = get_dispatch_table(pc_device_table_map, device)->CreateGraphicsPipelineDerivative(device, pCreateInfo, basePipeline, pPipeline); - - PostCreateGraphicsPipelineDerivative(device, basePipeline, pPipeline, result); - - return result; -} - bool PreCreateComputePipeline( VkDevice device, const VkComputePipelineCreateInfo* pCreateInfo) @@ -5409,7 +5337,6 @@ bool PostCreateComputePipeline( } if(result != VK_SUCCESS) ->>>>>>> fd61c93... Bug 14224: Remove abbreviations on some API symbols { log_msg(mdd(device), VK_DBG_REPORT_WARN_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", "vkCreateGraphicsPipeline parameter, VkPipelineLayout pCreateInfo->layout, is null pointer"); @@ -5419,21 +5346,6 @@ bool PostCreateComputePipeline( return true; } -bool PostDestroyPipeline( - VkDevice device, - VkPipeline pipeline, - VkResult result) -{ - if(result != VK_SUCCESS) - { - std::string reason = "vkDestroyPipeline parameter, VkResult result, is " + EnumeratorString(result); - log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", reason.c_str()); - return false; - } - - return true; -} - VK_LAYER_EXPORT VkResult VKAPI vkDestroyPipeline( VkDevice device, VkPipeline pipeline) @@ -5445,29 +5357,6 @@ VK_LAYER_EXPORT VkResult VKAPI vkDestroyPipeline( return result; } -bool PostCreateGraphicsPipeline( - VkDevice device, - VkPipeline* pPipeline, - VkResult result) -{ - - if(pPipeline == nullptr) - { - log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", - "vkCreateGraphicsPipeline parameter, VkPipeline* pPipeline, is null pointer"); - return false; - } - - if(result != VK_SUCCESS) - { - std::string reason = "vkCreateGraphicsPipeline parameter, VkResult result, is " + EnumeratorString(result); - log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", reason.c_str()); - return false; - } - - return true; -} - //TODO handle count > 1 void PostCreateGraphicsPipeline( VkDevice device, @@ -6854,9 +6743,10 @@ bool PostResetCommandBuffer( } VK_LAYER_EXPORT VkResult VKAPI vkResetCommandBuffer( - VkCmdBuffer cmdBuffer) + VkCmdBuffer cmdBuffer, + VkCmdBufferResetFlags flags) { - VkResult result = get_dispatch_table(pc_device_table_map, cmdBuffer)->ResetCommandBuffer(cmdBuffer); + VkResult result = get_dispatch_table(pc_device_table_map, cmdBuffer)->ResetCommandBuffer(cmdBuffer, flags); PostResetCommandBuffer(cmdBuffer, result); -- cgit v1.2.3