archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-11 01:08:39 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix linux build

Browse source
This commit is contained in:
kd-11 2022-02-11 20:57:19 +03:00 • committed by kd-11
parent cef512a123
commit 44cc254620
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
rpcs3/Emu/RSX/VK/VKCommandStream.cpp
View file

@ -26,7 +26,7 @@ namespace vk
FORCE_INLINE FORCE_INLINE
static void queue_submit_impl(const queue_submit_t& submit_info) static void queue_submit_impl(const queue_submit_t& submit_info)
{ {
ensure(submit_info.fence); ensure(submit_info.pfence);
acquire_global_submit_lock(); acquire_global_submit_lock();
VkSubmitInfo info VkSubmitInfo info
{ {
@ -41,11 +41,11 @@ namespace vk
.pSignalSemaphores = submit_info.signal_semaphores.data() .pSignalSemaphores = submit_info.signal_semaphores.data()
}; };
vkQueueSubmit(submit_info.queue, 1, &info, submit_info.fence->handle); vkQueueSubmit(submit_info.queue, 1, &info, submit_info.pfence->handle);
release_global_submit_lock(); release_global_submit_lock();
// Signal fence // Signal fence
submit_info.fence->signal_flushed(); submit_info.pfence->signal_flushed();
} }
void queue_submit(const queue_submit_t& submit_info, VkBool32 flush) void queue_submit(const queue_submit_t& submit_info, VkBool32 flush)

6
rpcs3/Emu/RSX/VK/vkutils/commands.cpp
View file

@ -123,10 +123,10 @@ namespace vk
// Check for hanging queries to avoid driver hang // Check for hanging queries to avoid driver hang
ensure((flags & cb_has_open_query) == 0); // "close and submit of commandbuffer with a hanging query!" ensure((flags & cb_has_open_query) == 0); // "close and submit of commandbuffer with a hanging query!"
if (!submit_info.fence) if (!submit_info.pfence)
{ {
submit_info.fence = m_submit_fence; submit_info.pfence = m_submit_fence;
is_pending = bool(submit_info.fence); is_pending = bool(submit_info.pfence);
} }
submit_info.commands = this->commands; submit_info.commands = this->commands;

4
rpcs3/Emu/RSX/VK/vkutils/commands.h
View file

@ -28,7 +28,7 @@ namespace vk
struct queue_submit_t struct queue_submit_t
{ {
VkQueue queue = VK_NULL_HANDLE; VkQueue queue = VK_NULL_HANDLE;
fence* fence = nullptr; fence* pfence = nullptr;
VkCommandBuffer commands = VK_NULL_HANDLE; VkCommandBuffer commands = VK_NULL_HANDLE;
std::array<VkSemaphore, 4> wait_semaphores; std::array<VkSemaphore, 4> wait_semaphores;
std::array<VkSemaphore, 4> signal_semaphores; std::array<VkSemaphore, 4> signal_semaphores;
@ -38,7 +38,7 @@ namespace vk
queue_submit_t() = default; queue_submit_t() = default;
queue_submit_t(VkQueue queue_, vk::fence* fence_) queue_submit_t(VkQueue queue_, vk::fence* fence_)
: queue(queue_), fence(fence_) {} : queue(queue_), pfence(fence_) {}
queue_submit_t(const queue_submit_t& other) queue_submit_t(const queue_submit_t& other)
{ {