|
|
|
@ -270,12 +270,8 @@ void Scheduler::EndPendingOperations() { |
|
|
|
EndRenderPass(); |
|
|
|
} |
|
|
|
|
|
|
|
void Scheduler::EndPendingOperations() { |
|
|
|
query_cache->CounterReset(VideoCommon::QueryType::ZPassPixelCount64); |
|
|
|
EndRenderPass(); |
|
|
|
} |
|
|
|
|
|
|
|
void Scheduler::EndRenderPass() { |
|
|
|
void Scheduler::EndRenderPass() |
|
|
|
{ |
|
|
|
if (!state.renderpass) { |
|
|
|
return; |
|
|
|
} |
|
|
|
@ -292,8 +288,9 @@ void Scheduler::EndRenderPass() { |
|
|
|
for (size_t i = 0; i < num_images; ++i) { |
|
|
|
const VkImageSubresourceRange& range = ranges[i]; |
|
|
|
const bool is_color = (range.aspectMask & VK_IMAGE_ASPECT_COLOR_BIT) != 0; |
|
|
|
const bool is_depth_stencil = (range.aspectMask & |
|
|
|
(VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT)) != 0; |
|
|
|
const bool is_depth_stencil = (range.aspectMask |
|
|
|
& (VK_IMAGE_ASPECT_DEPTH_BIT |
|
|
|
| VK_IMAGE_ASPECT_STENCIL_BIT)) !=0; |
|
|
|
|
|
|
|
VkAccessFlags src_access = 0; |
|
|
|
VkPipelineStageFlags this_stage = 0; |
|
|
|
@ -305,8 +302,8 @@ void Scheduler::EndRenderPass() { |
|
|
|
|
|
|
|
if (is_depth_stencil) { |
|
|
|
src_access |= VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT; |
|
|
|
this_stage |= VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT | |
|
|
|
VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT; |
|
|
|
this_stage |= VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT |
|
|
|
| VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT; |
|
|
|
} |
|
|
|
|
|
|
|
src_stages |= this_stage; |
|
|
|
@ -315,9 +312,11 @@ void Scheduler::EndRenderPass() { |
|
|
|
.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER, |
|
|
|
.pNext = nullptr, |
|
|
|
.srcAccessMask = src_access, |
|
|
|
.dstAccessMask = VK_ACCESS_SHADER_READ_BIT | VK_ACCESS_SHADER_WRITE_BIT | |
|
|
|
VK_ACCESS_COLOR_ATTACHMENT_READ_BIT | VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT | |
|
|
|
VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_READ_BIT | VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT, |
|
|
|
.dstAccessMask = VK_ACCESS_SHADER_READ_BIT | VK_ACCESS_SHADER_WRITE_BIT |
|
|
|
| VK_ACCESS_COLOR_ATTACHMENT_READ_BIT |
|
|
|
| VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT |
|
|
|
| VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_READ_BIT |
|
|
|
| VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT, |
|
|
|
.oldLayout = VK_IMAGE_LAYOUT_GENERAL, |
|
|
|
.newLayout = VK_IMAGE_LAYOUT_GENERAL, |
|
|
|
.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED, |
|
|
|
@ -334,8 +333,7 @@ void Scheduler::EndRenderPass() { |
|
|
|
|
|
|
|
cmdbuf.EndRenderPass(); |
|
|
|
|
|
|
|
cmdbuf.PipelineBarrier( |
|
|
|
src_stages, |
|
|
|
cmdbuf.PipelineBarrier(src_stages, |
|
|
|
VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, |
|
|
|
0, |
|
|
|
nullptr, |
|
|
|
@ -346,7 +344,7 @@ void Scheduler::EndRenderPass() { |
|
|
|
|
|
|
|
state.renderpass = nullptr; |
|
|
|
num_renderpass_images = 0; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
void Scheduler::AcquireNewChunk() { |
|
|
|
|