Skip to content

Commit

Permalink
layers: Cleanup to some variable names
Browse files Browse the repository at this point in the history
  • Loading branch information
@spencer-lunarg
spencer-lunarg committed Nov 27, 2024
1 parent b0c7d96 commit 5fbde48
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 16 deletions.
21 changes: 11 additions & 10 deletions layers/core_checks/cc_image_layout.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -161,9 +161,9 @@ void CoreChecks::TransitionFinalSubpassLayouts(vvl::CommandBuffer &cb_state) {
}
}

static GlobalImageLayoutRangeMap *GetLayoutRangeMap(GlobalImageLayoutMap &map, const vvl::Image &image_state) {
static GlobalImageLayoutRangeMap *GetLayoutRangeMap(GlobalImageLayoutMap &global_image_layout_map, const vvl::Image &image_state) {
// This approach allows for a single hash lookup or/create new
auto &layout_map = map[&image_state];
auto &layout_map = global_image_layout_map[&image_state];
if (!layout_map) {
layout_map.emplace(image_state.subresource_encoder.SubresourceCount());
}
Expand Down Expand Up @@ -191,7 +191,7 @@ struct GlobalLayoutUpdater {

// This validates that the initial layout specified in the command buffer for the IMAGE is the same as the global IMAGE layout
bool CoreChecks::ValidateCmdBufImageLayouts(const Location &loc, const vvl::CommandBuffer &cb_state,
GlobalImageLayoutMap &overlayLayoutMap) const {
GlobalImageLayoutMap &global_image_layout_map) const {
if (disabled[image_layout_validation]) return false;
bool skip = false;
// Iterate over the layout maps for each referenced image
Expand All @@ -205,17 +205,17 @@ bool CoreChecks::ValidateCmdBufImageLayouts(const Location &loc, const vvl::Comm
// Validate the initial_uses for each subresource referenced
if (layout_map.empty()) continue;

auto *overlay_map = GetLayoutRangeMap(overlayLayoutMap, *image_state);
const auto *global_map = image_state->layout_range_map.get();
ASSERT_AND_CONTINUE(global_map);
auto global_map_guard = global_map->ReadLock();
auto *overlay_map = GetLayoutRangeMap(global_image_layout_map, *image_state);
const auto *global_range_map = image_state->layout_range_map.get();
ASSERT_AND_CONTINUE(global_range_map);
auto global_range_map_guard = global_range_map->ReadLock();

// Note: don't know if it would matter
// if (global_map->empty() && overlay_map->empty()) // skip this next loop...;
// if (global_range_map->empty() && overlay_map->empty()) // skip this next loop...;

auto pos = layout_map.begin();
const auto end = layout_map.end();
sparse_container::parallel_iterator<const GlobalImageLayoutRangeMap> current_layout(*overlay_map, *global_map,
sparse_container::parallel_iterator<const GlobalImageLayoutRangeMap> current_layout(*overlay_map, *global_range_map,
pos->first.begin);
while (pos != end) {
VkImageLayout initial_layout = pos->second.initial_layout;
Expand Down Expand Up @@ -963,8 +963,9 @@ bool CoreChecks::IsCompliantSubresourceRange(const VkImageSubresourceRange &subr
}
if (!VerifyAspectsPresent(subres_range.aspectMask, image_state.create_info.format)) return false;
if (((vkuFormatPlaneCount(image_state.create_info.format) < 3) && (subres_range.aspectMask & VK_IMAGE_ASPECT_PLANE_2_BIT)) ||
((vkuFormatPlaneCount(image_state.create_info.format) < 2) && (subres_range.aspectMask & VK_IMAGE_ASPECT_PLANE_1_BIT)))
((vkuFormatPlaneCount(image_state.create_info.format) < 2) && (subres_range.aspectMask & VK_IMAGE_ASPECT_PLANE_1_BIT))) {
return false;
}
if (subres_range.aspectMask & VK_IMAGE_ASPECT_METADATA_BIT ||
subres_range.aspectMask & VK_IMAGE_ASPECT_MEMORY_PLANE_0_BIT_EXT ||
subres_range.aspectMask & VK_IMAGE_ASPECT_MEMORY_PLANE_1_BIT_EXT ||
Expand Down
4 changes: 2 additions & 2 deletions layers/core_checks/cc_queue.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ struct CommandBufferSubmitState {
QFOTransferCBScoreboards<QFOImageTransferBarrier> qfo_image_scoreboards;
QFOTransferCBScoreboards<QFOBufferTransferBarrier> qfo_buffer_scoreboards;
std::vector<VkCommandBuffer> current_cmds;
GlobalImageLayoutMap overlay_image_layout_map;
GlobalImageLayoutMap global_image_layout_map;
std::vector<std::string> cmdbuf_label_stack;
std::string last_closed_cmdbuf_label;
bool found_unbalanced_cmdbuf_label;
Expand All @@ -58,7 +58,7 @@ struct CommandBufferSubmitState {

bool Validate(const Location &loc, const vvl::CommandBuffer &cb_state, uint32_t perf_pass) {
bool skip = false;
skip |= core.ValidateCmdBufImageLayouts(loc, cb_state, overlay_image_layout_map);
skip |= core.ValidateCmdBufImageLayouts(loc, cb_state, global_image_layout_map);
const VkCommandBuffer cmd = cb_state.VkHandle();
current_cmds.push_back(cmd);
skip |= core.ValidatePrimaryCommandBufferState(
Expand Down
9 changes: 5 additions & 4 deletions layers/gpu/descriptor_validation/gpuav_image_layout.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,14 +162,15 @@ static bool VerifyImageLayoutRange(const Validator &gpuav, const vvl::CommandBuf
return skip;
}
const auto &layout_map = subresource_map->GetLayoutMap();
const auto *global_map = image_state.layout_range_map.get();
const auto *global_range_map = image_state.layout_range_map.get();
GlobalImageLayoutRangeMap empty_map(1);
assert(global_map);
auto global_map_guard = global_map->ReadLock();
assert(global_range_map);
auto global_range_map_guard = global_range_map->ReadLock();

auto pos = layout_map.begin();
const auto end = layout_map.end();
sparse_container::parallel_iterator<const GlobalImageLayoutRangeMap> current_layout(empty_map, *global_map, pos->first.begin);
sparse_container::parallel_iterator<const GlobalImageLayoutRangeMap> current_layout(empty_map, *global_range_map,
pos->first.begin);
while (pos != end) {
VkImageLayout initial_layout = pos->second.initial_layout;
assert(initial_layout != image_layout_map::kInvalidLayout);
Expand Down

0 comments on commit 5fbde48

Please sign in to comment.