Skip to content

Commit 7bdb79f

Browse files
spencer-lunargspencer-lunarg
authored
layers: Update Heaps VUID from 342 (#11594)
1 parent e627275 commit 7bdb79f

File tree

2 files changed

+12
-17
lines changed

2 files changed

+12
-17
lines changed

‎layers/stateless/sl_descriptor.cpp‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1563,8 +1563,7 @@ bool Device::ValidateHeapTexelBufferAlignment(const VkTexelBufferDescriptorInfoE
15631563
<< phys_dev_props_core13.uniformTexelBufferOffsetAlignmentBytes;
15641564
}
15651565

1566-
// NEW VUID - https://gitlab.khronos.org/vulkan/vulkan/-/merge_requests/8019
1567-
skip |= LogError("VUID-VkResourceDescriptorInfoEXT-type-11214", device,
1566+
skip |= LogError("VUID-VkResourceDescriptorInfoEXT-type-12349", device,
15681567
loc.dot(Field::addressRange).dot(Field::address).dot(Field::address), "%s", ss.str().c_str());
15691568
}
15701569
} else if (type == VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER) {
@@ -1591,14 +1590,12 @@ bool Device::ValidateHeapTexelBufferAlignment(const VkTexelBufferDescriptorInfoE
15911590
<< phys_dev_props_core13.storageTexelBufferOffsetAlignmentBytes;
15921591
}
15931592

1594-
// NEW VUID - https://gitlab.khronos.org/vulkan/vulkan/-/merge_requests/8019
1595-
skip |= LogError("VUID-VkResourceDescriptorInfoEXT-type-11215", device,
1593+
skip |= LogError("VUID-VkResourceDescriptorInfoEXT-type-12349", device,
15961594
loc.dot(Field::addressRange).dot(Field::address).dot(Field::address), "%s", ss.str().c_str());
15971595
}
15981596
}
15991597
} else if (!IsPointerAligned(info.addressRange.address, phys_dev_props.limits.minTexelBufferOffsetAlignment)) {
1600-
// NEW VUID - https://gitlab.khronos.org/vulkan/vulkan/-/merge_requests/8019
1601-
skip |= LogError("VUID-VkTexelBufferDescriptorInfoEXT-None-11218", device, loc.dot(Field::addressRange).dot(Field::address),
1598+
skip |= LogError("VUID-VkTexelBufferDescriptorInfoEXT-None-12349", device, loc.dot(Field::addressRange).dot(Field::address),
16021599
"(0x%" PRIx64 ") is not aligned to minTexelBufferOffsetAlignment (%" PRIu64 ")", info.addressRange.address,
16031600
phys_dev_props.limits.minTexelBufferOffsetAlignment);
16041601
}
@@ -1660,19 +1657,17 @@ bool Device::manual_PreCallValidateWriteResourceDescriptorsEXT(VkDevice device,
16601657
if (resource.type == VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER) {
16611658
if (!IsPointerAligned(resource.data.pAddressRange->address,
16621659
phys_dev_props.limits.minUniformBufferOffsetAlignment)) {
1663-
// NEW VUID - https://gitlab.khronos.org/vulkan/vulkan/-/merge_requests/8019
16641660
skip |=
1665-
LogError("VUID-VkResourceDescriptorInfoEXT-type-11452", device,
1661+
LogError("VUID-VkResourceDescriptorInfoEXT-type-12350", device,
16661662
data_loc.dot(Field::pAddressRange).dot(Field::address),
16671663
"(0x%" PRIx64 ") is not aligned to minUniformBufferOffsetAlignment (%" PRIu64 ")",
16681664
resource.data.pAddressRange->address, phys_dev_props.limits.minUniformBufferOffsetAlignment);
16691665
}
16701666
} else if (resource.type == VK_DESCRIPTOR_TYPE_STORAGE_BUFFER) {
16711667
if (!IsPointerAligned(resource.data.pAddressRange->address,
16721668
phys_dev_props.limits.minStorageBufferOffsetAlignment)) {
1673-
// NEW VUID - https://gitlab.khronos.org/vulkan/vulkan/-/merge_requests/8019
16741669
skip |=
1675-
LogError("VUID-VkResourceDescriptorInfoEXT-type-11453", device,
1670+
LogError("VUID-VkResourceDescriptorInfoEXT-type-12351", device,
16761671
data_loc.dot(Field::pAddressRange).dot(Field::address),
16771672
"(0x%" PRIx64 ") is not aligned to minStorageBufferOffsetAlignment (%" PRIu64 ")",
16781673
resource.data.pAddressRange->address, phys_dev_props.limits.minStorageBufferOffsetAlignment);

‎tests/unit/descriptor_heap.cpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -643,7 +643,7 @@ TEST_F(NegativeDescriptorHeap, ResourceParameterUniformAlign) {
643643
invalid_device_address_range.address = buffer.Address() + 1;
644644
invalid_device_address_range.size = align;
645645

646-
m_errorMonitor->SetDesiredError("VUID-VkResourceDescriptorInfoEXT-type-11452");
646+
m_errorMonitor->SetDesiredError("VUID-VkResourceDescriptorInfoEXT-type-12350");
647647
vk::WriteResourceDescriptorsEXT(device(), 1u, &desc_info, &descriptors);
648648
m_errorMonitor->VerifyFound();
649649
}
@@ -676,7 +676,7 @@ TEST_F(NegativeDescriptorHeap, ResourceParameterStorageAlign) {
676676
invalid_device_address_range.address = buffer.Address() + 1;
677677
invalid_device_address_range.size = align;
678678

679-
m_errorMonitor->SetDesiredError("VUID-VkResourceDescriptorInfoEXT-type-11453");
679+
m_errorMonitor->SetDesiredError("VUID-VkResourceDescriptorInfoEXT-type-12351");
680680
vk::WriteResourceDescriptorsEXT(device(), 1u, &desc_info, &descriptors);
681681
m_errorMonitor->VerifyFound();
682682
}
@@ -748,7 +748,7 @@ TEST_F(NegativeDescriptorHeap, UniformTexelBufferOffsetSingleTexelAlignmentFalse
748748
texel_buffer_info.addressRange.address = buffer.Address() + 1;
749749
texel_buffer_info.addressRange.size = align;
750750

751-
m_errorMonitor->SetDesiredError("VUID-VkResourceDescriptorInfoEXT-type-11214");
751+
m_errorMonitor->SetDesiredError("VUID-VkResourceDescriptorInfoEXT-type-12349");
752752
vk::WriteResourceDescriptorsEXT(device(), 1u, &desc_info, &descriptors);
753753
m_errorMonitor->VerifyFound();
754754
}
@@ -791,7 +791,7 @@ TEST_F(NegativeDescriptorHeap, UniformTexelBufferOffsetSingleTexelAlignmentTrue)
791791
texel_buffer_info.addressRange.address = buffer.Address() + 1;
792792
texel_buffer_info.addressRange.size = align;
793793

794-
m_errorMonitor->SetDesiredError("VUID-VkResourceDescriptorInfoEXT-type-11214");
794+
m_errorMonitor->SetDesiredError("VUID-VkResourceDescriptorInfoEXT-type-12349");
795795
vk::WriteResourceDescriptorsEXT(device(), 1u, &desc_info, &descriptors);
796796
m_errorMonitor->VerifyFound();
797797
}
@@ -832,7 +832,7 @@ TEST_F(NegativeDescriptorHeap, StorageTexelBufferOffsetSingleTexelAlignmentFalse
832832
texel_buffer_info.addressRange.address = buffer.Address() + 1;
833833
texel_buffer_info.addressRange.size = align;
834834

835-
m_errorMonitor->SetDesiredError("VUID-VkResourceDescriptorInfoEXT-type-11215");
835+
m_errorMonitor->SetDesiredError("VUID-VkResourceDescriptorInfoEXT-type-12349");
836836
vk::WriteResourceDescriptorsEXT(device(), 1u, &desc_info, &descriptors);
837837
m_errorMonitor->VerifyFound();
838838
}
@@ -875,7 +875,7 @@ TEST_F(NegativeDescriptorHeap, StorageTexelBufferOffsetSingleTexelAlignmentTrue)
875875
texel_buffer_info.addressRange.address = buffer.Address() + 1;
876876
texel_buffer_info.addressRange.size = align;
877877

878-
m_errorMonitor->SetDesiredError("VUID-VkResourceDescriptorInfoEXT-type-11215");
878+
m_errorMonitor->SetDesiredError("VUID-VkResourceDescriptorInfoEXT-type-12349");
879879
vk::WriteResourceDescriptorsEXT(device(), 1u, &desc_info, &descriptors);
880880
m_errorMonitor->VerifyFound();
881881
}
@@ -914,7 +914,7 @@ TEST_F(NegativeDescriptorHeap, MinTexelBufferOffsetAlignment) {
914914
texel_buffer_info.addressRange.address = buffer.Address() + 1;
915915
texel_buffer_info.addressRange.size = align;
916916

917-
m_errorMonitor->SetDesiredError("VUID-VkTexelBufferDescriptorInfoEXT-None-11218");
917+
m_errorMonitor->SetDesiredError("VUID-VkTexelBufferDescriptorInfoEXT-None-12349");
918918
vk::WriteResourceDescriptorsEXT(device(), 1u, &desc_info, &descriptors);
919919
m_errorMonitor->VerifyFound();
920920
}

0 commit comments

Comments
 (0)