Skip to content

layers: VUID Churn 349 #12070

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
spencer-lunarg merged 1 commit into from
Apr 10, 2026
+6 −37
Merged

layers: VUID Churn 349 #12070

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions layers/core_checks/cc_data_graph.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,11 +165,13 @@ bool CoreChecks::PreCallValidateCreateDataGraphPipelinesARM(VkDevice device, VkD
const auto* dg_pipeline_identifier_ci =
vku::FindStructInPNextChain<VkDataGraphPipelineIdentifierCreateInfoARM>(create_info.pNext);
const auto* qcom_model_ci = vku::FindStructInPNextChain<VkDataGraphPipelineBuiltinModelCreateInfoQCOM>(create_info.pNext);
const auto* single_node_ci = vku::FindStructInPNextChain<VkDataGraphPipelineSingleNodeCreateInfoARM>(create_info.pNext);

// 1 and ONLY 1 of them MUST be present
uint32_t defined_structs = (qcom_model_ci ? 1 : 0) + (dg_pipeline_identifier_ci ? 1 : 0) + (dg_shader_ci ? 1 : 0);
uint32_t defined_structs =
(qcom_model_ci ? 1 : 0) + (dg_pipeline_identifier_ci ? 1 : 0) + (dg_shader_ci ? 1 : 0) + (single_node_ci ? 1 : 0);
if (defined_structs != 1) {
skip |= LogError("VUID-VkDataGraphPipelineCreateInfoARM-pNext-09763", device, create_info_loc,
skip |= LogError("VUID-VkDataGraphPipelineCreateInfoARM-pNext-09977", device, create_info_loc,
"%" PRIu32 " of the possible required structures are included in the pNext chain%s.\n%s",
defined_structs, (defined_structs > 1) ? " (only 1 is allowed)" : "",
PrintPNextChain(Struct::VkDataGraphPipelineCreateInfoARM, create_info.pNext).c_str());
Expand Down
13 changes: 0 additions & 13 deletions layers/stateless/sl_instance_device.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -825,19 +825,6 @@ bool Instance::manual_PreCallValidateCreateDevice(VkPhysicalDevice physicalDevic
}
}

if (const auto* device_address_commands_features =
vku::FindStructInPNextChain<VkPhysicalDeviceDeviceAddressCommandsFeaturesKHR>(pCreateInfo->pNext)) {
if (const auto* acceleration_structure_features =
vku::FindStructInPNextChain<VkPhysicalDeviceAccelerationStructureFeaturesKHR>(pCreateInfo->pNext)) {
if (device_address_commands_features->deviceAddressCommands &&
acceleration_structure_features->accelerationStructureHostCommands) {
skip |= LogError("VUID-VkDeviceCreateInfo-deviceAddressCommands-13048", physicalDevice, error_obj.location,
"Cannot enable deviceAddressCommands and accelerationStructureHostCommands features "
"simultaneously.");
}
}
}

if (const auto* shader_image_atomic_int64_features =
vku::FindStructInPNextChain<VkPhysicalDeviceShaderImageAtomicInt64FeaturesEXT>(pCreateInfo->pNext)) {
if (shader_image_atomic_int64_features->sparseImageInt64Atomics &&
Expand Down
1 change: 0 additions & 1 deletion scripts/vk_validation_stats.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,6 @@ def __init__(self, val_json, val_source, val_tests, spirv_val):
"11446" : ["02596", "02597", "06685", "06686", "08456", "08457", "08459"],
"11447" : ["01245", "01282", "01293", "10285"],
"11448" : ["00065", "03867"],
"11451" : ["07474"],
"11452" : ["00740", "04331", "04332", "04335", "04487", "04488", "04489", "06264", "07045", "07051", "07057", "10595", "10596", "10597", "12333", "12335", "12336", "12337", "07106", "07108", "07109", "07110", "07111"],
"11453" : ["06022", "06533", "06534", "06535", "06536", "09299", "09300"],
"11481" : ["02532", "02533", "03049", "03050", "09044", "09045", "09046"],
Expand Down
4 changes: 2 additions & 2 deletions tests/unit/data_graph.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1876,7 +1876,7 @@ TEST_F(NegativeDataGraph, DataGraphWrongCreateInfoStructs) {
{
vkt::dg::DataGraphPipelineHelper pipeline(*this);
pipeline.pipeline_ci_.pNext = nullptr;
m_errorMonitor->SetDesiredError("VUID-VkDataGraphPipelineCreateInfoARM-pNext-09763");
m_errorMonitor->SetDesiredError("VUID-VkDataGraphPipelineCreateInfoARM-pNext-09977");
pipeline.CreateDataGraphPipeline();
m_errorMonitor->VerifyFound();
}
Expand All @@ -1901,7 +1901,7 @@ TEST_F(NegativeDataGraph, DataGraphWrongCreateInfoStructs) {
VkResult err = vk::CreatePipelineCache(device(), &cache_create_info, nullptr, &pipeline_cache);
ASSERT_EQ(VK_SUCCESS, err);

m_errorMonitor->SetDesiredError("VUID-VkDataGraphPipelineCreateInfoARM-pNext-09763");
m_errorMonitor->SetDesiredError("VUID-VkDataGraphPipelineCreateInfoARM-pNext-09977");
pipeline.CreateDataGraphPipeline(pipeline_cache);
m_errorMonitor->VerifyFound();
vk::DestroyPipelineCache(device(), pipeline_cache, nullptr);
Expand Down
19 changes: 0 additions & 19 deletions tests/unit/device_feature_property.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -558,22 +558,3 @@ TEST_F(NegativeDeviceFeatureProperty, Create14DeviceDuplicatedFeatures) {
vk::CreateDevice(Gpu(), &m_second_device_ci, nullptr, &m_second_device);
m_errorMonitor->VerifyFound();
}

TEST_F(NegativeDeviceFeatureProperty, DeviceAddressCommandsHostAccelerationStructure) {
SetTargetApiVersion(VK_API_VERSION_1_3);
AddRequiredExtensions(VK_KHR_DEVICE_ADDRESS_COMMANDS_EXTENSION_NAME);
AddRequiredExtensions(VK_KHR_ACCELERATION_STRUCTURE_EXTENSION_NAME);
RETURN_IF_SKIP(InitDeviceFeatureProperty());

VkPhysicalDeviceDeviceAddressCommandsFeaturesKHR dac_features = vku::InitStructHelper();
VkPhysicalDeviceAccelerationStructureFeaturesKHR as_features = vku::InitStructHelper(&dac_features);
GetPhysicalDeviceFeatures2(as_features);
if (!dac_features.deviceAddressCommands || !as_features.accelerationStructureHostCommands) {
GTEST_SKIP() << "Features not supported";
}
m_second_device_ci.pNext = &as_features;

m_errorMonitor->SetDesiredError("VUID-VkDeviceCreateInfo-deviceAddressCommands-13048");
vk::CreateDevice(Gpu(), &m_second_device_ci, nullptr, &m_second_device);
m_errorMonitor->VerifyFound();
}