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

BaseFencedPool::has_open_batch (and other uncommitted changes)

This commit is contained in:
Dr. Chat 2016-05-07 19:17:56 -05:00
parent 79f1193130
commit c06a7cdf81
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/xenia/ui/vulkan/fenced_pools.h
View File

@ -14,6 +14,7 @@
#include "xenia/base/assert.h" #include "xenia/base/assert.h"
#include "xenia/ui/vulkan/vulkan.h" #include "xenia/ui/vulkan/vulkan.h"
#include "xenia/ui/vulkan/vulkan_util.h"
namespace xe { namespace xe {
namespace ui { namespace ui {
@ -40,13 +41,15 @@ class BaseFencedPool {
// True if one or more batches are still pending on the GPU. // True if one or more batches are still pending on the GPU.
bool has_pending() const { return pending_batch_list_head_ != nullptr; } bool has_pending() const { return pending_batch_list_head_ != nullptr; }
// True if a batch is open.
bool has_open_batch() const { return open_batch_ != nullptr; }
// Checks all pending batches for completion and scavenges their entries. // Checks all pending batches for completion and scavenges their entries.
// This should be called as frequently as reasonable. // This should be called as frequently as reasonable.
void Scavenge() { void Scavenge() {
while (pending_batch_list_head_) { while (pending_batch_list_head_) {
auto batch = pending_batch_list_head_; auto batch = pending_batch_list_head_;
if (vkGetFenceStatus(device_, batch->fence) == VK_SUCCESS) { if (vkGetFenceStatus(device_, *batch->fence) == VK_SUCCESS) {
// Batch has completed. Reclaim. // Batch has completed. Reclaim.
pending_batch_list_head_ = batch->next; pending_batch_list_head_ = batch->next;
if (batch == pending_batch_list_tail_) { if (batch == pending_batch_list_tail_) {
@ -132,7 +135,7 @@ class BaseFencedPool {
// Ends the current batch using the given fence to indicate when the batch // Ends the current batch using the given fence to indicate when the batch
// has completed execution on the GPU. // has completed execution on the GPU.
void EndBatch(VkFence fence) { void EndBatch(std::shared_ptr<Fence> fence) {
assert_not_null(open_batch_); assert_not_null(open_batch_);
// Close and see if we have anything. // Close and see if we have anything.
@ -194,7 +197,7 @@ class BaseFencedPool {
Batch* next; Batch* next;
Entry* entry_list_head; Entry* entry_list_head;
Entry* entry_list_tail; Entry* entry_list_tail;
VkFence fence; std::shared_ptr<Fence> fence;
}; };
Batch* free_batch_list_head_ = nullptr; Batch* free_batch_list_head_ = nullptr;