diff options
| author | Mark Lobodzinski <mark@lunarg.com> | 2016-12-15 13:06:55 -0700 |
|---|---|---|
| committer | Tobin Ehlis <tobine@google.com> | 2016-12-20 09:34:10 -0700 |
| commit | afeb3a68bf13f59b9fd4514e25e0bfda8587fae0 (patch) | |
| tree | 3dfb4e7095c1cf3f441cf3e9d26475b07ba89579 | |
| parent | c8fe3b5994bf46b0a3d8bd2b27de643da7da8ee8 (diff) | |
| download | usermoji-afeb3a68bf13f59b9fd4514e25e0bfda8587fae0.tar.xz | |
layers: Remove enum_validate_helper from PV
A single call was used, replaced with an internal generated function
call and removed the old include. Added note with validation error
ID.
Change-Id: Ied88daf5bab003269c44ef2bef8b2eb81a9e9094
| -rw-r--r-- | layers/parameter_validation.cpp | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/layers/parameter_validation.cpp b/layers/parameter_validation.cpp index b3c70e3b..4b1870e6 100644 --- a/layers/parameter_validation.cpp +++ b/layers/parameter_validation.cpp @@ -41,7 +41,6 @@ #include "vulkan/vk_layer.h" #include "vk_layer_config.h" #include "vk_dispatch_table_helper.h" -#include "vk_enum_validate_helper.h" #include "vk_struct_validate_helper.h" #include "vk_layer_table.h" @@ -3869,15 +3868,10 @@ bool PreBeginCommandBuffer(layer_data *dev_data, VkCommandBuffer commandBuffer, "Cannot set inherited occlusionQueryEnable in vkBeginCommandBuffer() when device does not support " "inheritedQueries."); } - - if ((dev_data->physical_device_features.inheritedQueries != VK_FALSE) && (pInfo->occlusionQueryEnable != VK_FALSE) && - (!validate_VkQueryControlFlagBits(VkQueryControlFlagBits(pInfo->queryFlags)))) { - skip |= - log_msg(dev_data->report_data, VK_DEBUG_REPORT_ERROR_BIT_EXT, VK_DEBUG_REPORT_OBJECT_TYPE_COMMAND_BUFFER_EXT, - reinterpret_cast<uint64_t>(commandBuffer), __LINE__, DEVICE_FEATURE, LayerName, - "Cannot enable in occlusion queries in vkBeginCommandBuffer() and set queryFlags to %d which is not a " - "valid combination of VkQueryControlFlagBits.", - pInfo->queryFlags); + // VALIDATION_ERROR_00117 check + if ((dev_data->physical_device_features.inheritedQueries != VK_FALSE) && (pInfo->occlusionQueryEnable != VK_FALSE)) { + skip |= validate_flags(dev_data->report_data, "vkBeginCommandBuffer", "pBeginInfo->pInheritanceInfo->queryFlags", + "VkQueryControlFlagBits", AllVkQueryControlFlagBits, pInfo->queryFlags, false); } } return skip; |