ShuriZma
/
xenia
mirror of https://github.com/xenia-project/xenia.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Also track batch fences in the CP properly

This commit is contained in:
Dr. Chat 2016-11-08 19:41:35 -06:00
parent 48f6ba747c
commit 1afb899b7d
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/xenia/gpu/vulkan/vulkan_command_processor.cc
View File

@ -264,9 +264,8 @@ void VulkanCommandProcessor::PerformSwap(uint32_t frontbuffer_ptr,
copy_commands = command_buffer_pool_->AcquireEntry(); copy_commands = command_buffer_pool_->AcquireEntry();
opened_batch = false; opened_batch = false;
} else { } else {
command_buffer_pool_->BeginBatch(); current_batch_fence_ = command_buffer_pool_->BeginBatch();
copy_commands = command_buffer_pool_->AcquireEntry(); copy_commands = command_buffer_pool_->AcquireEntry();
current_batch_fence_.reset(new ui::vulkan::Fence(*device_));
opened_batch = true; opened_batch = true;
} }
@ -399,10 +398,10 @@ void VulkanCommandProcessor::PerformSwap(uint32_t frontbuffer_ptr,
if (queue_mutex_) { if (queue_mutex_) {
std::lock_guard<std::mutex> lock(*queue_mutex_); std::lock_guard<std::mutex> lock(*queue_mutex_);
status = vkQueueSubmit(queue_, 1, &submit_info, *current_batch_fence_); status = vkQueueSubmit(queue_, 1, &submit_info, current_batch_fence_);
CheckResult(status, "vkQueueSubmit"); CheckResult(status, "vkQueueSubmit");
} else { } else {
status = vkQueueSubmit(queue_, 1, &submit_info, *current_batch_fence_); status = vkQueueSubmit(queue_, 1, &submit_info, current_batch_fence_);
CheckResult(status, "vkQueueSubmit"); CheckResult(status, "vkQueueSubmit");
} }
@ -415,12 +414,11 @@ void VulkanCommandProcessor::PerformSwap(uint32_t frontbuffer_ptr,
} }
} }
command_buffer_pool_->EndBatch(current_batch_fence_); command_buffer_pool_->EndBatch();
if (cache_clear_requested_) { if (cache_clear_requested_) {
cache_clear_requested_ = false; cache_clear_requested_ = false;
VkFence fences[] = {*current_batch_fence_}; vkWaitForFences(*device_, 1, &current_batch_fence_, VK_TRUE, -1);
vkWaitForFences(*device_, 1, fences, VK_TRUE, -1);
buffer_cache_->ClearCache(); buffer_cache_->ClearCache();
pipeline_cache_->ClearCache(); pipeline_cache_->ClearCache();
@ -435,6 +433,9 @@ void VulkanCommandProcessor::PerformSwap(uint32_t frontbuffer_ptr,
"gpu", "gpu",
"xe::gpu::vulkan::VulkanCommandProcessor::PerformSwap Scavenging"); "xe::gpu::vulkan::VulkanCommandProcessor::PerformSwap Scavenging");
#endif // FINE_GRAINED_DRAW_SCOPES #endif // FINE_GRAINED_DRAW_SCOPES
// Command buffers must be scavenged first to avoid a race condition.
// We don't want to reuse a batch when the caches haven't yet cleared old
// resources!
command_buffer_pool_->Scavenge(); command_buffer_pool_->Scavenge();
texture_cache_->Scavenge(); texture_cache_->Scavenge();
@ -497,10 +498,9 @@ bool VulkanCommandProcessor::IssueDraw(PrimitiveType primitive_type,
if (!current_command_buffer_) { if (!current_command_buffer_) {
// TODO(benvanik): bigger batches. // TODO(benvanik): bigger batches.
// TODO(DrChat): Decouple setup buffer from current batch. // TODO(DrChat): Decouple setup buffer from current batch.
command_buffer_pool_->BeginBatch(); current_batch_fence_ = command_buffer_pool_->BeginBatch();
current_command_buffer_ = command_buffer_pool_->AcquireEntry(); current_command_buffer_ = command_buffer_pool_->AcquireEntry();
current_setup_buffer_ = command_buffer_pool_->AcquireEntry(); current_setup_buffer_ = command_buffer_pool_->AcquireEntry();
current_batch_fence_.reset(new ui::vulkan::Fence(*device_));
VkCommandBufferBeginInfo command_buffer_begin_info; VkCommandBufferBeginInfo command_buffer_begin_info;
command_buffer_begin_info.sType = command_buffer_begin_info.sType =
@ -974,10 +974,9 @@ bool VulkanCommandProcessor::IssueCopy() {
last_copy_base_ = texture->texture_info.guest_address; last_copy_base_ = texture->texture_info.guest_address;
if (!current_command_buffer_) { if (!current_command_buffer_) {
command_buffer_pool_->BeginBatch(); current_batch_fence_ = command_buffer_pool_->BeginBatch();
current_command_buffer_ = command_buffer_pool_->AcquireEntry(); current_command_buffer_ = command_buffer_pool_->AcquireEntry();
current_setup_buffer_ = command_buffer_pool_->AcquireEntry(); current_setup_buffer_ = command_buffer_pool_->AcquireEntry();
current_batch_fence_.reset(new ui::vulkan::Fence(*device_));
VkCommandBufferBeginInfo command_buffer_begin_info; VkCommandBufferBeginInfo command_buffer_begin_info;
command_buffer_begin_info.sType = command_buffer_begin_info.sType =

2
src/xenia/gpu/vulkan/vulkan_command_processor.h
View File

@ -126,7 +126,7 @@ class VulkanCommandProcessor : public CommandProcessor {
const RenderState* current_render_state_ = nullptr; const RenderState* current_render_state_ = nullptr;
VkCommandBuffer current_command_buffer_ = nullptr; VkCommandBuffer current_command_buffer_ = nullptr;
VkCommandBuffer current_setup_buffer_ = nullptr; VkCommandBuffer current_setup_buffer_ = nullptr;
std::shared_ptr<ui::vulkan::Fence> current_batch_fence_; VkFence current_batch_fence_;
}; };
} // namespace vulkan } // namespace vulkan