From 647ac90145513ef75a01570fd3d39907135471c1 Mon Sep 17 00:00:00 2001 From: Mark Lobodzinski Date: Mon, 6 Feb 2017 15:34:43 -0700 Subject: [PATCH] layers: Remove helper routine dead parameters Change-Id: I9fa9456cd228dd3636002c5f59e60d7f7e1909fa --- layers/core_validation.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/layers/core_validation.cpp b/layers/core_validation.cpp index ff84729..19a9812 100644 --- a/layers/core_validation.cpp +++ b/layers/core_validation.cpp @@ -6292,8 +6292,7 @@ static bool ValidateImageAspectMask(layer_data *dev_data, VkImage image, VkForma } static bool ValidateImageSubrangeLevelLayerCounts(layer_data *dev_data, const VkImageSubresourceRange &subresourceRange, - const char *func_name, UNIQUE_VALIDATION_ERROR_CODE layer_msg_code, - UNIQUE_VALIDATION_ERROR_CODE level_msg_code) { + const char *func_name) { bool skip = false; if (subresourceRange.levelCount == 0) { skip |= log_msg(dev_data->report_data, VK_DEBUG_REPORT_ERROR_BIT_EXT, (VkDebugReportObjectTypeEXT)0, 0, __LINE__, @@ -6337,8 +6336,7 @@ static bool PreCallValidateCreateImageView(layer_data *dev_data, const VkImageVi VALIDATION_ERROR_00769, "IMAGE", "%s %s", ss.str().c_str(), validation_error_map[VALIDATION_ERROR_00769]); } // TODO: Need new valid usage language for levelCount == 0 & layerCount == 0 - skip |= ValidateImageSubrangeLevelLayerCounts(dev_data, create_info->subresourceRange, "vkCreateImageView()", - VALIDATION_ERROR_00768, VALIDATION_ERROR_00769); + skip |= ValidateImageSubrangeLevelLayerCounts(dev_data, create_info->subresourceRange, "vkCreateImageView()"); VkImageCreateFlags image_flags = image_state->createInfo.flags; VkFormat image_format = image_state->createInfo.format; @@ -8761,8 +8759,7 @@ static bool ValidateBarriers(const char *funcName, VkCommandBuffer cmdBuffer, ui } } if (imageFound) { - skip |= ValidateImageSubrangeLevelLayerCounts(dev_data, mem_barrier->subresourceRange, funcName, - VALIDATION_ERROR_00768, VALIDATION_ERROR_00769); + skip |= ValidateImageSubrangeLevelLayerCounts(dev_data, mem_barrier->subresourceRange, funcName); auto aspect_mask = mem_barrier->subresourceRange.aspectMask; skip |= ValidateImageAspectMask(dev_data, image_data->image, format, aspect_mask, funcName); int layerCount = (mem_barrier->subresourceRange.layerCount == VK_REMAINING_ARRAY_LAYERS) -- 2.7.4