mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-08-02 07:22:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

vk_scheduler: Silly merge conflict

Browse Source
This commit is contained in:
IndecisiveTurtle 2024-07-25 17:50:44 +03:00
parent 1f60b3d3d2
commit c9a13955a1
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/video_core/renderer_vulkan/vk_scheduler.h
View File

@ -94,16 +94,12 @@ public:
return &master_semaphore; return &master_semaphore;
} }
<<<<<<< HEAD
/// Defers an operation until the gpu has reached the current cpu tick. /// Defers an operation until the gpu has reached the current cpu tick.
void DeferOperation(auto&& func) { void DeferOperation(auto&& func) {
pending_ops.emplace(func, CurrentTick()); pending_ops.emplace(func, CurrentTick());
} }
std::mutex submit_mutex;
=======
static std::mutex submit_mutex; static std::mutex submit_mutex;
>>>>>>> 06b0f04 (liverpool: Better sync for CPU flips)
private: private:
void AllocateWorkerCommandBuffers(); void AllocateWorkerCommandBuffers();