diff options
| author | Jeremy Kniager <jeremyk@lunarg.com> | 2018-01-25 11:41:20 -0700 |
|---|---|---|
| committer | jeremyk-lunarg <jeremyk@lunarg.com> | 2018-02-14 11:18:57 -0700 |
| commit | 1e453294945821bb1ef75b1192d5b1afd60243d2 (patch) | |
| tree | ba5405e19fa2ce91f440c41d495a60ed164359af /layers/parameter_validation_utils.cpp | |
| parent | 0229cf0c98ae625686e7c36694fca2abb8eeefc8 (diff) | |
| download | usermoji-1e453294945821bb1ef75b1192d5b1afd60243d2.tar.xz | |
layers: fix unexpected errors in layer tests
Adjusted to not conflict with PR #2387
Change-Id: I7afc90577cb269070beda4f33bb04ab2a2c28f40
Diffstat (limited to 'layers/parameter_validation_utils.cpp')
| -rw-r--r-- | layers/parameter_validation_utils.cpp | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/layers/parameter_validation_utils.cpp b/layers/parameter_validation_utils.cpp index 2c29d711..c3e76061 100644 --- a/layers/parameter_validation_utils.cpp +++ b/layers/parameter_validation_utils.cpp @@ -2064,9 +2064,6 @@ bool pv_vkCmdSetViewport(VkCommandBuffer commandBuffer, uint32_t firstViewport, bool skip = false; layer_data *device_data = GetLayerDataPtr(get_dispatch_key(commandBuffer), layer_data_map); - skip |= validate_array(device_data->report_data, "vkCmdSetViewport", "viewportCount", "pViewports", viewportCount, pViewports, - true, true, VALIDATION_ERROR_UNDEFINED, VALIDATION_ERROR_UNDEFINED); - if (viewportCount > 0 && pViewports != nullptr) { const VkPhysicalDeviceLimits &limits = device_data->device_limits; for (uint32_t viewportIndex = 0; viewportIndex < viewportCount; ++viewportIndex) { @@ -2075,17 +2072,17 @@ bool pv_vkCmdSetViewport(VkCommandBuffer commandBuffer, uint32_t firstViewport, if (device_data->physical_device_features.multiViewport == false) { if (viewportCount != 1) { skip |= log_msg( - device_data->report_data, VK_DEBUG_REPORT_ERROR_BIT_EXT, VK_DEBUG_REPORT_OBJECT_TYPE_UNKNOWN_EXT, 0, - __LINE__, DEVICE_FEATURE, LayerName, - "vkCmdSetViewport(): The multiViewport feature is not enabled, so viewportCount must be 1 but is %d.", - viewportCount); + device_data->report_data, VK_DEBUG_REPORT_ERROR_BIT_EXT, VK_DEBUG_REPORT_OBJECT_TYPE_UNKNOWN_EXT, + VALIDATION_ERROR_1e000992, __LINE__, DEVICE_FEATURE, LayerName, + "vkCmdSetViewport(): The multiViewport feature is not enabled, so viewportCount must be 1 but is %d. %s", + viewportCount, validation_error_map[VALIDATION_ERROR_1e000992]); } if (firstViewport != 0) { skip |= log_msg( - device_data->report_data, VK_DEBUG_REPORT_ERROR_BIT_EXT, VK_DEBUG_REPORT_OBJECT_TYPE_UNKNOWN_EXT, 0, - __LINE__, DEVICE_FEATURE, LayerName, - "vkCmdSetViewport(): The multiViewport feature is not enabled, so firstViewport must be 0 but is %d.", - firstViewport); + device_data->report_data, VK_DEBUG_REPORT_ERROR_BIT_EXT, VK_DEBUG_REPORT_OBJECT_TYPE_UNKNOWN_EXT, + VALIDATION_ERROR_1e000990, __LINE__, DEVICE_FEATURE, LayerName, + "vkCmdSetViewport(): The multiViewport feature is not enabled, so firstViewport must be 0 but is %d. %s", + firstViewport, validation_error_map[VALIDATION_ERROR_1e000990]); } } |