Skip to content
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

Jump to bottom

layers: Fix Layout Set Compatible check #8647

Merged
merged 1 commit into from
Oct 3, 2024
+42 −13
Merged

layers: Fix Layout Set Compatible check #8647

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
7 changes: 4 additions & 3 deletions layers/core_checks/cc_descriptor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3660,16 +3660,17 @@ bool CoreChecks::ValidateCmdPushDescriptorSetWithTemplate(VkCommandBuffer comman
FormatHandle(descriptorUpdateTemplate).c_str(), template_ci.set, set);
}
auto template_layout = Get<vvl::PipelineLayout>(template_ci.pipelineLayout);
if (!IsPipelineLayoutSetCompat(set, layout_data.get(), template_layout.get())) {
if (!IsPipelineLayoutSetCompatible(set, layout_data.get(), template_layout.get())) {
const LogObjectList objlist(commandBuffer, descriptorUpdateTemplate, template_ci.pipelineLayout, layout);
const char *vuid = is_2 ? "VUID-VkPushDescriptorSetWithTemplateInfoKHR-layout-07993"
: "VUID-vkCmdPushDescriptorSetWithTemplateKHR-layout-07993";
skip |= LogError(vuid, objlist, loc.dot(Field::descriptorUpdateTemplate),
"%s created with %s is incompatible "
"with command parameter "
"%s for set %" PRIu32,
"%s for set %" PRIu32 ".\n%s",
FormatHandle(descriptorUpdateTemplate).c_str(), FormatHandle(template_ci.pipelineLayout).c_str(),
FormatHandle(layout).c_str(), set);
FormatHandle(layout).c_str(), set,
DescribePipelineLayoutSetNonCompatible(set, layout_data.get(), template_layout.get()).c_str());
}
}

Expand Down
10 changes: 9 additions & 1 deletion layers/state_tracker/descriptor_sets.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,11 @@ bool operator==(const DescriptorSetLayoutDef &lhs, const DescriptorSetLayoutDef
for (size_t i = 0; i < lhs_bindings.size(); i++) {
const auto &l = lhs_bindings[i];
const auto &r = rhs_bindings[i];
// For things where we are comparing with the bound pipeline, the binding will always be right, but when comparing two
// arbitrary layouts (ex. templates, Device Generated Commands, etc) the bindings might be different
if (l.binding != r.binding) {
return false;
}
if (l.descriptorType != r.descriptorType || l.descriptorCount != r.descriptorCount || l.stageFlags != r.stageFlags) {
return false;
}
Expand Down Expand Up @@ -247,7 +252,10 @@ std::string DescriptorSetLayoutDef::DescribeDifference(uint32_t index, const Des
for (size_t i = 0; i < lhs_bindings.size(); i++) {
const auto &l = lhs_bindings[i];
const auto &r = rhs_bindings[i];
if (l.descriptorType != r.descriptorType) {
if (l.binding != r.binding) {
ss << "VkDescriptorSetLayoutBinding::binding " << l.binding << " doesn't match " << r.binding;
break;
} else if (l.descriptorType != r.descriptorType) {
ss << "binding " << i << " descriptorType " << string_VkDescriptorType(l.descriptorType) << " doesn't match "
<< string_VkDescriptorType(r.descriptorType);
break;
Expand Down
26 changes: 26 additions & 0 deletions layers/state_tracker/pipeline_state.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1350,6 +1350,32 @@ std::string LastBound::DescribeNonCompatibleSet(uint32_t set, const vvl::ShaderO
return ss.str();
}

bool IsPipelineLayoutSetCompatible(uint32_t set, const vvl::PipelineLayout *a, const vvl::PipelineLayout *b) {
if (!a || !b) {
return false;
}
if ((set >= a->set_compat_ids.size()) || (set >= b->set_compat_ids.size())) {
return false;
}
return *(a->set_compat_ids[set]) == *(b->set_compat_ids[set]);
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was return a->set_compat_ids[set] == b->set_compat_ids[set]; before which was wrong, it was only checking the shared pointers were different, not that they had different contents

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(plenty of Device Generated Commands tests are coming, they were failing for this reason I learned)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was return a->set_compat_ids[set] == b->set_compat_ids[set]; before which was wrong, it was only checking the shared pointers were different, not that they had different contents

I have dejavu we fixed this some time ago.

}

std::string DescribePipelineLayoutSetNonCompatible(uint32_t set, const vvl::PipelineLayout *a, const vvl::PipelineLayout *b) {
std::ostringstream ss;
if (!a || !b) {
ss << "The set (" << set << ") has a null VkPipelineLayout object\n";
} else if (set >= a->set_compat_ids.size()) {
ss << "The set (" << set << ") is out of bounds for the number of sets in the non-compatible VkDescriptorSetLayout ("
<< a->set_compat_ids.size() << ")\n";
} else if (set >= b->set_compat_ids.size()) {
ss << "The set (" << set << ") is out of bounds for the number of sets in the non-compatible VkDescriptorSetLayout ("
<< b->set_compat_ids.size() << ")\n";
} else {
return a->set_compat_ids[set]->DescribeDifference(*(b->set_compat_ids[set]));
}
return ss.str();
}

const spirv::EntryPoint *LastBound::GetFragmentEntryPoint() const {
if (pipeline_state && pipeline_state->fragment_shader_state) {
return pipeline_state->fragment_shader_state->fragment_entry_point.get();
Expand Down
12 changes: 3 additions & 9 deletions layers/state_tracker/pipeline_state.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -751,15 +751,9 @@ struct LastBound {
const spirv::EntryPoint *GetFragmentEntryPoint() const;
};

static inline bool IsPipelineLayoutSetCompat(uint32_t set, const vvl::PipelineLayout *a, const vvl::PipelineLayout *b) {
if (!a || !b) {
return false;
}
if ((set >= a->set_compat_ids.size()) || (set >= b->set_compat_ids.size())) {
return false;
}
return a->set_compat_ids[set] == b->set_compat_ids[set];
}
// Used to compare 2 layouts independently when not tied to the last bound object
bool IsPipelineLayoutSetCompatible(uint32_t set, const vvl::PipelineLayout *a, const vvl::PipelineLayout *b);
std::string DescribePipelineLayoutSetNonCompatible(uint32_t set, const vvl::PipelineLayout *a, const vvl::PipelineLayout *b);

enum LvlBindPoint {
BindPoint_Graphics = VK_PIPELINE_BIND_POINT_GRAPHICS,
Expand Down
Loading