diff options
| author | Tobin Ehlis <tobine@google.com> | 2016-07-06 11:32:12 -0600 |
|---|---|---|
| committer | Tobin Ehlis <tobine@google.com> | 2016-07-06 21:52:35 -0600 |
| commit | 282ee3527fe15e66ebefd28d1a6617dbed5fb6c5 (patch) | |
| tree | 99e6db5e7e0f32165b6691ed8e880688e2b130d5 | |
| parent | ab227e71de79b89820fdf4453e2ebc36a9c95b2e (diff) | |
| download | usermoji-282ee3527fe15e66ebefd28d1a6617dbed5fb6c5.tar.xz | |
layers: GH689 Disable perf warning for linear tiled textures
Linear tiled textures should use GENERAL layout so perf warning doesn't apply.
| -rw-r--r-- | layers/core_validation.cpp | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/layers/core_validation.cpp b/layers/core_validation.cpp index 081a9df6..918afe8d 100644 --- a/layers/core_validation.cpp +++ b/layers/core_validation.cpp @@ -7162,10 +7162,14 @@ static bool VerifySourceImageLayout(layer_data *dev_data, GLOBAL_CB_NODE *cb_nod } if (srcImageLayout != VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL) { if (srcImageLayout == VK_IMAGE_LAYOUT_GENERAL) { - // LAYOUT_GENERAL is allowed, but may not be performance optimal, flag as perf warning. - skip_call |= log_msg(dev_data->report_data, VK_DEBUG_REPORT_PERFORMANCE_WARNING_BIT_EXT, (VkDebugReportObjectTypeEXT)0, - 0, __LINE__, DRAWSTATE_INVALID_IMAGE_LAYOUT, "DS", - "Layout for input image should be TRANSFER_SRC_OPTIMAL instead of GENERAL."); + // TODO : Can we deal with image node from the top of call tree and avoid map look-up here? + auto image_node = getImageNode(dev_data, srcImage); + if (image_node->createInfo.tiling != VK_IMAGE_TILING_LINEAR) { + // LAYOUT_GENERAL is allowed, but may not be performance optimal, flag as perf warning. + skip_call |= log_msg(dev_data->report_data, VK_DEBUG_REPORT_PERFORMANCE_WARNING_BIT_EXT, + (VkDebugReportObjectTypeEXT)0, 0, __LINE__, DRAWSTATE_INVALID_IMAGE_LAYOUT, "DS", + "Layout for input image should be TRANSFER_SRC_OPTIMAL instead of GENERAL."); + } } else { skip_call |= log_msg(dev_data->report_data, VK_DEBUG_REPORT_ERROR_BIT_EXT, (VkDebugReportObjectTypeEXT)0, 0, __LINE__, DRAWSTATE_INVALID_IMAGE_LAYOUT, "DS", "Layout for input image is %s but can only be " @@ -7198,10 +7202,13 @@ static bool VerifyDestImageLayout(layer_data *dev_data, GLOBAL_CB_NODE *cb_node, } if (destImageLayout != VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL) { if (destImageLayout == VK_IMAGE_LAYOUT_GENERAL) { - // LAYOUT_GENERAL is allowed, but may not be performance optimal, flag as perf warning. - skip_call |= log_msg(dev_data->report_data, VK_DEBUG_REPORT_PERFORMANCE_WARNING_BIT_EXT, (VkDebugReportObjectTypeEXT)0, - 0, __LINE__, DRAWSTATE_INVALID_IMAGE_LAYOUT, "DS", - "Layout for output image should be TRANSFER_DST_OPTIMAL instead of GENERAL."); + auto image_node = getImageNode(dev_data, destImage); + if (image_node->createInfo.tiling != VK_IMAGE_TILING_LINEAR) { + // LAYOUT_GENERAL is allowed, but may not be performance optimal, flag as perf warning. + skip_call |= log_msg(dev_data->report_data, VK_DEBUG_REPORT_PERFORMANCE_WARNING_BIT_EXT, + (VkDebugReportObjectTypeEXT)0, 0, __LINE__, DRAWSTATE_INVALID_IMAGE_LAYOUT, "DS", + "Layout for output image should be TRANSFER_DST_OPTIMAL instead of GENERAL."); + } } else { skip_call |= log_msg(dev_data->report_data, VK_DEBUG_REPORT_ERROR_BIT_EXT, (VkDebugReportObjectTypeEXT)0, 0, __LINE__, DRAWSTATE_INVALID_IMAGE_LAYOUT, "DS", "Layout for output image is %s but can only be " |