Skip to content

Commit 6693c15

Browse files
ziga-lunargziga-lunarg
committed
layers: Fix typos
1 parent 3de8bf8 commit 6693c15

File tree

9 files changed

+25
-31
lines changed

9 files changed

+25
-31
lines changed

‎layers/stateless/sl_buffer.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ bool Device::manual_PreCallValidateCreateBufferView(VkDevice device, const VkBuf
128128
}
129129

130130
if (range != VK_WHOLE_SIZE) {
131-
// will be 1 because block-compressed format are not supported for Texe l Buffer
131+
// will be 1 because block-compressed format are not supported for Texel Buffer
132132
const VkDeviceSize texels_per_block = static_cast<VkDeviceSize>(vkuFormatTexelsPerBlock(format));
133133
const VkDeviceSize texel_block_size = static_cast<VkDeviceSize>(GetTexelBufferFormatSize(format));
134134

@@ -174,7 +174,7 @@ bool Device::ValidateCreateBufferFlags(const VkBufferCreateFlags flags, const Lo
174174
if ((flags & VK_BUFFER_CREATE_SPARSE_ALIASED_BIT) && (!enabled_features.sparseResidencyAliased)) {
175175
skip |= LogError("VUID-VkBufferCreateInfo-flags-00917", device, flag_loc,
176176
"includes VK_BUFFER_CREATE_SPARSE_ALIASED_BIT, but the sparseResidencyAliased feature is not enabled.");
177-
};
177+
}
178178

179179
if (((flags & (VK_BUFFER_CREATE_SPARSE_RESIDENCY_BIT | VK_BUFFER_CREATE_SPARSE_ALIASED_BIT)) != 0) &&
180180
((flags & VK_BUFFER_CREATE_SPARSE_BINDING_BIT) != VK_BUFFER_CREATE_SPARSE_BINDING_BIT)) {

‎layers/stateless/sl_cmd_buffer_dynamic.cpp

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -61,26 +61,16 @@ bool Device::manual_PreCallValidateCmdSetScissorWithCount(VkCommandBuffer comman
6161
if (scissorCount != 1) {
6262
skip |= LogError("VUID-vkCmdSetScissorWithCount-scissorCount-03398", commandBuffer,
6363
error_obj.location.dot(Field::scissorCount),
64-
"(%" PRIu32
65-
") must "
66-
"be 1 when the multiViewport feature is disabled.",
67-
scissorCount);
64+
"(%" PRIu32 ") must be 1 when the multiViewport feature is disabled.", scissorCount);
6865
}
6966
} else { // multiViewport enabled
7067
if (scissorCount == 0) {
7168
skip |= LogError("VUID-vkCmdSetScissorWithCount-scissorCount-03397", commandBuffer,
72-
error_obj.location.dot(Field::scissorCount),
73-
"(%" PRIu32
74-
") must "
75-
"be great than zero.",
76-
scissorCount);
69+
error_obj.location.dot(Field::scissorCount), "(%" PRIu32 ") must be greater than zero.", scissorCount);
7770
} else if (scissorCount > device_limits.maxViewports) {
78-
skip |= LogError("VUID-vkCmdSetScissorWithCount-scissorCount-03397", commandBuffer,
79-
error_obj.location.dot(Field::scissorCount),
80-
"(%" PRIu32
81-
") must "
82-
"not be greater than maxViewports (%" PRIu32 ").",
83-
scissorCount, device_limits.maxViewports);
71+
skip |= LogError(
72+
"VUID-vkCmdSetScissorWithCount-scissorCount-03397", commandBuffer, error_obj.location.dot(Field::scissorCount),
73+
"(%" PRIu32 ") must not be greater than maxViewports (%" PRIu32 ").", scissorCount, device_limits.maxViewports);
8474
}
8575
}
8676

@@ -406,7 +396,7 @@ bool Device::manual_PreCallValidateCmdSetViewportWScalingNV(VkCommandBuffer comm
406396
if ((sum < 1) || (sum > device_limits.maxViewports)) {
407397
skip |= LogError("VUID-vkCmdSetViewportWScalingNV-firstViewport-01324", commandBuffer, error_obj.location,
408398
"firstViewport (%" PRIu32 ") + viewportCount (%" PRIu32 ") is %" PRIu64
409-
", which must be between 1 and VkPhysicalDeviceLimits::maxViewports (%" PRIu32 "), inculsive.",
399+
", which must be between 1 and VkPhysicalDeviceLimits::maxViewports (%" PRIu32 "), inclusive.",
410400
firstViewport, viewportCount, sum, device_limits.maxViewports);
411401
}
412402

‎layers/stateless/sl_descriptor.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ bool Device::ValidateSamplerFilterMinMax(const VkSamplerCreateInfo &create_info,
186186
}
187187

188188
// VK_EXT_custom_border_color
189-
bool Device::ValidateSamplerCustomBoarderColor(const VkSamplerCreateInfo &create_info, const Location &create_info_loc) const {
189+
bool Device::ValidateSamplerCustomBorderColor(const VkSamplerCreateInfo &create_info, const Location &create_info_loc) const {
190190
bool skip = false;
191191

192192
if (create_info.borderColor == VK_BORDER_COLOR_INT_CUSTOM_EXT || create_info.borderColor == VK_BORDER_COLOR_FLOAT_CUSTOM_EXT) {
@@ -502,7 +502,7 @@ bool Device::ValidateSamplerCreateInfo(const VkSamplerCreateInfo &create_info, c
502502
}
503503

504504
skip |= ValidateSamplerFilterMinMax(create_info, create_info_loc);
505-
skip |= ValidateSamplerCustomBoarderColor(create_info, create_info_loc);
505+
skip |= ValidateSamplerCustomBorderColor(create_info, create_info_loc);
506506
skip |= ValidateSamplerSubsampled(create_info, create_info_loc);
507507
skip |= ValidateSamplerImageProcessingQCOM(create_info, create_info_loc);
508508

‎layers/stateless/sl_image.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -784,7 +784,7 @@ bool Device::ValidateCreateImageMetalObject(const VkImageCreateInfo &create_info
784784
skip |=
785785
LogError("VUID-VkImageCreateInfo-pNext-06785", device, texture_info_loc,
786786
"is %s, but only VK_IMAGE_ASPECT_PLANE_0_BIT is allowed for an image created with format %s, "
787-
"which is not multiplaner",
787+
"which is not multiplanar",
788788
string_VkImageAspectFlags(import_metal_texture_info->plane).c_str(), string_VkFormat(create_info.format));
789789
}
790790
if ((format_plane_count == 2) && (import_metal_texture_info->plane == VK_IMAGE_ASPECT_PLANE_2_BIT)) {

‎layers/stateless/sl_pipeline.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -170,10 +170,10 @@ bool Device::ValidatePipelineBinaryInfo(const void *next, VkPipelineCreateFlags
170170

171171
if (binary_info && (binary_info->binaryCount > 0)) {
172172
if (pipelineCache != VK_NULL_HANDLE) {
173-
skip |= LogError(GetPipelineBinaryInfoVUID(flag_loc, vvl::PipelineBinaryInfoError::PNext_09616), device, loc.pNext(Struct::VkPipelineBinaryInfoKHR, Field::binaryCount),
174-
"(%" PRIu32 ") is greated than zero while "
175-
"pipelineCache is not VK_NULL_HANDLE.",
176-
binary_info->binaryCount);
173+
skip |=
174+
LogError(GetPipelineBinaryInfoVUID(flag_loc, vvl::PipelineBinaryInfoError::PNext_09616), device,
175+
loc.pNext(Struct::VkPipelineBinaryInfoKHR, Field::binaryCount),
176+
"(%" PRIu32 ") is greater than zero while pipelineCache is not VK_NULL_HANDLE.", binary_info->binaryCount);
177177
}
178178

179179
const auto creation_feedback = vku::FindStructInPNextChain<VkPipelineCreationFeedbackCreateInfo>(next);

‎layers/stateless/sl_render_pass.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -644,7 +644,11 @@ bool Device::manual_PreCallValidateCmdBeginRendering(VkCommandBuffer commandBuff
644644
skip |= LogError("VUID-VkRenderingInfo-fragmentDensityMapLayered-10827", commandBuffer,
645645
rendering_info_loc.dot(Field::flags),
646646
"contains VK_RENDERING_PER_LAYER_FRAGMENT_DENSITY_BIT_VALVE, but fragmentDensityMapLayered feature "
647+
<<<<<<< Updated upstream
647648
"were not enabled.");
649+
=======
650+
"was not enabled.");
651+
>>>>>>> Stashed changes
648652
} else if (pRenderingInfo->layerCount > phys_dev_ext_props.fragment_density_map_layered_props.maxFragmentDensityMapLayers) {
649653
skip |= LogError("VUID-VkRenderingInfo-flags-10826", commandBuffer, rendering_info_loc.dot(Field::layerCount),
650654
"is %" PRIu32 " but the maxFragmentDensityMapLayers is %" PRIu32 ".", pRenderingInfo->layerCount,

‎layers/stateless/sl_spirv.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@ bool SpirvValidator::ValidateAtomicsTypes(const spirv::Module &module_state, con
350350
} else if ((atomic.bit_width == 64) && (valid_64_float == false)) {
351351
skip |= LogError(
352352
"VUID-RuntimeSpirv-None-06339", module_state.handle(), loc,
353-
"SPIR-V is using 64-bit float atomics operations but snone of the required features were enabled.\n%s\n",
353+
"SPIR-V is using 64-bit float atomics operations but none of the required features were enabled.\n%s\n",
354354
module_state.DescribeInstruction(atomic_def).c_str());
355355
}
356356
}

‎layers/stateless/sl_utils.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,13 @@ bool Instance::CheckPromotedApiAgainstVulkanVersion(VkPhysicalDevice pdev, const
5151
return skip;
5252
}
5353

54-
bool Instance::OutputExtensionError(const Location &loc, const vvl::Extensions &exentsions) const {
54+
bool Instance::OutputExtensionError(const Location &loc, const vvl::Extensions &extensions) const {
5555
return LogError("UNASSIGNED-GeneralParameterError-ExtensionNotEnabled", instance, loc,
56-
"function required extension %s which has not been enabled.\n", String(exentsions).c_str());
56+
"function required extension %s which has not been enabled.\n", String(extensions).c_str());
5757
}
58-
bool Device::OutputExtensionError(const Location &loc, const vvl::Extensions &exentsions) const {
58+
bool Device::OutputExtensionError(const Location &loc, const vvl::Extensions &extensions) const {
5959
return LogError("UNASSIGNED-GeneralParameterError-ExtensionNotEnabled", device, loc,
60-
"function required extension %s which has not been enabled.\n", String(exentsions).c_str());
60+
"function required extension %s which has not been enabled.\n", String(extensions).c_str());
6161
}
6262

6363
static const uint8_t kUtF8OneByteCode = 0xC0;

‎layers/stateless/stateless_validation.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -570,7 +570,7 @@ class Device : public vvl::base::Device {
570570
const Context &context) const;
571571

572572
bool ValidateSamplerFilterMinMax(const VkSamplerCreateInfo &create_info, const Location &create_info_loc) const;
573-
bool ValidateSamplerCustomBoarderColor(const VkSamplerCreateInfo &create_info, const Location &create_info_loc) const;
573+
bool ValidateSamplerCustomBorderColor(const VkSamplerCreateInfo &create_info, const Location &create_info_loc) const;
574574
bool ValidateSamplerSubsampled(const VkSamplerCreateInfo &create_info, const Location &create_info_loc) const;
575575
bool ValidateSamplerImageProcessingQCOM(const VkSamplerCreateInfo &create_info, const Location &create_info_loc) const;
576576
bool ValidateSamplerCreateInfo(const VkSamplerCreateInfo &create_info, const Location &create_info_loc,

0 commit comments

Comments
 (0)