From 57ebc4066ed65bc285a6e2e534ff44074eea7b55 Mon Sep 17 00:00:00 2001 From: Tobin Ehlis Date: Thu, 2 Jul 2015 10:45:16 -0600 Subject: tests: Fix some failing layer validation tests MemTracker was changing an API return value during an error case which caused ParamChecker to complain, flagging unexpected error. ParamChecker was no allowing NULL fence on Queue Submit or NULL pDynamicOffsets on when binding Descriptor Sets. Both of these values can be NULL. --- layers/mem_tracker.cpp | 1 - layers/param_checker.cpp | 15 --------------- 2 files changed, 16 deletions(-) diff --git a/layers/mem_tracker.cpp b/layers/mem_tracker.cpp index 83192587..7fe5e672 100644 --- a/layers/mem_tracker.cpp +++ b/layers/mem_tracker.cpp @@ -1276,7 +1276,6 @@ VK_LAYER_EXPORT VkResult VKAPI vkResetFences( if (!(pObjectInfo->create_info.fence_create_info.flags & VK_FENCE_CREATE_SIGNALED_BIT)) { log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_FENCE, pFences[i], 0, MEMTRACK_INVALID_FENCE_STATE, "MEM", "Fence %p submitted to VkResetFences in UNSIGNALED STATE", pFences[i]); - result = VK_ERROR_INVALID_VALUE; } else { pObjectInfo->create_info.fence_create_info.flags = diff --git a/layers/param_checker.cpp b/layers/param_checker.cpp index f894fdda..94915884 100644 --- a/layers/param_checker.cpp +++ b/layers/param_checker.cpp @@ -2206,14 +2206,6 @@ void PostQueueSubmit( return; } - - if(fence == nullptr) - { - log_msg(mdd(queue), VK_DBG_REPORT_WARN_BIT, (VkObjectType)0, NULL, 0, 1, "PARAMCHECK", - "vkQueueSubmit parameter, VkFence fence, is null pointer"); - return; - } - if(result != VK_SUCCESS) { std::string reason = "vkQueueSubmit parameter, VkResult result, is " + EnumeratorString(result); @@ -7449,13 +7441,6 @@ void PreCmdBindDescriptorSets( "vkCmdBindDescriptorSets parameter, const VkDescriptorSet* pDescriptorSets, is null pointer"); return; } - - if(pDynamicOffsets == nullptr) - { - log_msg(mdd(cmdBuffer), VK_DBG_REPORT_WARN_BIT, (VkObjectType)0, NULL, 0, 1, "PARAMCHECK", - "vkCmdBindDescriptorSets parameter, const uint32_t* pDynamicOffsets, is null pointer"); - return; - } } void PostCmdBindDescriptorSets( -- cgit v1.2.3