aboutsummaryrefslogtreecommitdiff
path: root/layers/descriptor_sets.cpp
diff options
context:
space:
mode:
authorDave Houlton <daveh@lunarg.com>2018-02-07 10:51:23 -0700
committerDave Houlton <daveh@lunarg.com>2018-02-16 09:31:58 -0700
commitb575cecc062ea5ff65df8002017f81fb05854622 (patch)
treef2499673da4609d8bdf67b6ca6f4041fef823a00 /layers/descriptor_sets.cpp
parent6ecf456fdf8132a38d8b599e7cf2756a7c09dddf (diff)
downloadusermoji-b575cecc062ea5ff65df8002017f81fb05854622.tar.xz
layers: clang-format only
Whole-file clang-format of layers .h and .cpp files Change-Id: I683ad38fa9bced371a923b86d8cc916f2c2aa947
Diffstat (limited to 'layers/descriptor_sets.cpp')
-rw-r--r--layers/descriptor_sets.cpp39
1 files changed, 20 insertions, 19 deletions
diff --git a/layers/descriptor_sets.cpp b/layers/descriptor_sets.cpp
index c14ae034..9294dde9 100644
--- a/layers/descriptor_sets.cpp
+++ b/layers/descriptor_sets.cpp
@@ -333,8 +333,9 @@ bool cvdescriptorset::DescriptorSetLayout::VerifyUpdateConsistency(uint32_t curr
if (!IsNextBindingConsistent(current_binding++)) {
std::stringstream error_str;
error_str << "Attempting " << type << " descriptor set " << set << " binding #" << orig_binding << " with #"
- << update_count << " descriptors being updated but this update oversteps the bounds of this binding and the "
- "next binding is not consistent with current binding so this update is invalid.";
+ << update_count
+ << " descriptors being updated but this update oversteps the bounds of this binding and the next binding is "
+ "not consistent with current binding so this update is invalid.";
*error_msg = error_str.str();
return false;
}
@@ -564,8 +565,8 @@ bool cvdescriptorset::DescriptorSet::ValidateDrawState(const std::map<uint32_t,
caller, VALIDATION_ERROR_046002b0, &hit_error);
if (hit_error) {
*error =
- "Image layout specified at vkUpdateDescriptorSets() time doesn't match actual image layout at "
- "time descriptor is used. See previous error callback for specific details.";
+ "Image layout specified at vkUpdateDescriptorSets() time doesn't match actual image layout at time "
+ "descriptor is used. See previous error callback for specific details.";
return false;
}
}
@@ -942,8 +943,9 @@ bool cvdescriptorset::ValidateImageUpdate(VkImageView image_view, VkImageLayout
// Only Color bit must be set
if ((aspect_mask & VK_IMAGE_ASPECT_COLOR_BIT) != VK_IMAGE_ASPECT_COLOR_BIT) {
std::stringstream error_str;
- error_str << "ImageView (" << image_view << ") uses layout VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL but does "
- "not have VK_IMAGE_ASPECT_COLOR_BIT set.";
+ error_str
+ << "ImageView (" << image_view
+ << ") uses layout VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL but does not have VK_IMAGE_ASPECT_COLOR_BIT set.";
*error_msg = error_str.str();
return false;
}
@@ -1028,23 +1030,22 @@ bool cvdescriptorset::ValidateImageUpdate(VkImageView image_view, VkImageLayout
// TODO : Need to create custom enum error codes for these cases
if (image_node->shared_presentable) {
if (VK_IMAGE_LAYOUT_SHARED_PRESENT_KHR != image_layout) {
- error_str
- << "ImageView (" << image_view
- << ") of VK_DESCRIPTOR_TYPE_STORAGE_IMAGE type with a front-buffered image is being updated with "
- "layout "
- << string_VkImageLayout(image_layout)
- << " but according to spec section 13.1 Descriptor Types, 'Front-buffered images that report support "
- "for "
- "VK_FORMAT_FEATURE_STORAGE_IMAGE_BIT must be in the VK_IMAGE_LAYOUT_SHARED_PRESENT_KHR layout.'";
+ error_str << "ImageView (" << image_view
+ << ") of VK_DESCRIPTOR_TYPE_STORAGE_IMAGE type with a front-buffered image is being updated with "
+ "layout "
+ << string_VkImageLayout(image_layout)
+ << " but according to spec section 13.1 Descriptor Types, 'Front-buffered images that report "
+ "support for VK_FORMAT_FEATURE_STORAGE_IMAGE_BIT must be in the "
+ "VK_IMAGE_LAYOUT_SHARED_PRESENT_KHR layout.'";
*error_msg = error_str.str();
return false;
}
} else if (VK_IMAGE_LAYOUT_GENERAL != image_layout) {
- error_str
- << "ImageView (" << image_view << ") of VK_DESCRIPTOR_TYPE_STORAGE_IMAGE type is being updated with layout "
- << string_VkImageLayout(image_layout)
- << " but according to spec section 13.1 Descriptor Types, 'Load and store operations on storage images can "
- "only be done on images in VK_IMAGE_LAYOUT_GENERAL layout.'";
+ error_str << "ImageView (" << image_view
+ << ") of VK_DESCRIPTOR_TYPE_STORAGE_IMAGE type is being updated with layout "
+ << string_VkImageLayout(image_layout)
+ << " but according to spec section 13.1 Descriptor Types, 'Load and store operations on storage "
+ "images can only be done on images in VK_IMAGE_LAYOUT_GENERAL layout.'";
*error_msg = error_str.str();
return false;
}