Skip to content
This repository was archived by the owner on Dec 11, 2025. It is now read-only.

Fix validation issues related to screenshot image barriers #513

Merged
apanteleev merged 1 commit into from
Dec 10, 2025
Merged

Fix validation issues related to screenshot image barriers #513

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
8 changes: 6 additions & 2 deletions src/refresh/vkpt/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4016,7 +4016,9 @@ IMG_ReadPixels_RTX(screenshot_t *s)
.newLayout = VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL
);

IMAGE_BARRIER(cmd_buf,
IMAGE_BARRIER_STAGES(cmd_buf,
VK_PIPELINE_STAGE_HOST_BIT,
VK_PIPELINE_STAGE_ALL_COMMANDS_BIT,
.image = qvk.screenshot_image,
.subresourceRange = subresource_range,
.srcAccessMask = VK_ACCESS_HOST_READ_BIT,
Expand Down Expand Up @@ -4045,7 +4047,9 @@ IMG_ReadPixels_RTX(screenshot_t *s)
.newLayout = VK_IMAGE_LAYOUT_PRESENT_SRC_KHR
);

IMAGE_BARRIER(cmd_buf,
IMAGE_BARRIER_STAGES(cmd_buf,
VK_PIPELINE_STAGE_ALL_COMMANDS_BIT,
VK_PIPELINE_STAGE_HOST_BIT,
.image = qvk.screenshot_image,
.subresourceRange = subresource_range,
.srcAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT,
Expand Down
8 changes: 6 additions & 2 deletions src/refresh/vkpt/textures.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2364,7 +2364,9 @@ LIST_IMAGES_A_B

}

IMAGE_BARRIER(cmd_buf,
IMAGE_BARRIER_STAGES(cmd_buf,
VK_PIPELINE_STAGE_ALL_COMMANDS_BIT,
VK_PIPELINE_STAGE_HOST_BIT,
.image = qvk.screenshot_image,
.subresourceRange = subresource_range,
.srcAccessMask = 0,
Expand All @@ -2374,7 +2376,9 @@ LIST_IMAGES_A_B
);

#ifdef VKPT_IMAGE_DUMPS
IMAGE_BARRIER(cmd_buf,
IMAGE_BARRIER_STAGES(cmd_buf,
VK_PIPELINE_STAGE_ALL_COMMANDS_BIT,
VK_PIPELINE_STAGE_HOST_BIT,
.image = qvk.dump_image,
.subresourceRange = subresource_range,
.srcAccessMask = 0,
Expand Down
9 changes: 6 additions & 3 deletions src/refresh/vkpt/vk_util.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,19 +55,22 @@ void buffer_attach_name(const BufferResource_t *buf, const char *name);
uint32_t get_memory_type(uint32_t mem_req_type_bits, VkMemoryPropertyFlags mem_prop);


#define IMAGE_BARRIER(cmd_buf, ...) \
#define IMAGE_BARRIER_STAGES(cmd_buf, src_stage, dst_stage, ...) \
do { \
VkImageMemoryBarrier img_mem_barrier = { \
.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER, \
.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED, \
.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED, \
__VA_ARGS__ \
}; \
vkCmdPipelineBarrier(cmd_buf, VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, \
VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, 0, 0, NULL, 0, NULL, \
vkCmdPipelineBarrier(cmd_buf, (src_stage), \
(dst_stage), 0, 0, NULL, 0, NULL, \
1, &img_mem_barrier); \
} while(0)

#define IMAGE_BARRIER(cmd_buf, ...) \
IMAGE_BARRIER_STAGES((cmd_buf), VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, __VA_ARGS__)

#define BUFFER_BARRIER(cmd_buf, ...) \
do { \
VkBufferMemoryBarrier buf_mem_barrier = { \
Expand Down