mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-12-09 05:08:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: Fix a few warnings (#3581)

Browse Source
This commit is contained in:
squidbus
2025-09-12 09:31:59 -07:00
committed by GitHub
parent 374c2194d4
commit dc6bfbeb12
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/devtools/widget/memory_map.cpp
View File

@@ -26,7 +26,7 @@ bool MemoryMapViewer::Iterator::DrawLine() {
TableNextColumn(); TableNextColumn();
Text("%" PRIXPTR, m.base); Text("%" PRIXPTR, m.base);
TableNextColumn(); TableNextColumn();
Text("%zX", m.size); Text("%llX", m.size);
TableNextColumn(); TableNextColumn();
Text("%s", magic_enum::enum_name(m.type).data()); Text("%s", magic_enum::enum_name(m.type).data());
TableNextColumn(); TableNextColumn();
@@ -51,7 +51,7 @@ bool MemoryMapViewer::Iterator::DrawLine() {
TableNextColumn(); TableNextColumn();
Text("%" PRIXPTR, m.base); Text("%" PRIXPTR, m.base);
TableNextColumn(); TableNextColumn();
Text("%zX", m.size); Text("%llX", m.size);
TableNextColumn(); TableNextColumn();
auto type = static_cast<::Libraries::Kernel::MemoryTypes>(m.memory_type); auto type = static_cast<::Libraries::Kernel::MemoryTypes>(m.memory_type);
Text("%s", magic_enum::enum_name(type).data()); Text("%s", magic_enum::enum_name(type).data());

4
src/video_core/renderer_vulkan/vk_presenter.cpp
View File

@@ -461,7 +461,9 @@ void Presenter::Present(Frame* frame, bool is_reusing_frame) {
// Reset fence for queue submission. Do it here instead of GetRenderFrame() because we may // Reset fence for queue submission. Do it here instead of GetRenderFrame() because we may
// skip frame because of slow swapchain recreation. If a frame skip occurs, we skip signal // skip frame because of slow swapchain recreation. If a frame skip occurs, we skip signal
// the frame's present fence and future GetRenderFrame() call will hang waiting for this frame. // the frame's present fence and future GetRenderFrame() call will hang waiting for this frame.
instance.GetDevice().resetFences(frame->present_done); const auto reset_result = instance.GetDevice().resetFences(frame->present_done);
ASSERT_MSG(reset_result == vk::Result::eSuccess,
"Unexpected error resetting present done fence: {}", vk::to_string(reset_result));
ImGuiID dockId = ImGui::Core::NewFrame(is_reusing_frame); ImGuiID dockId = ImGui::Core::NewFrame(is_reusing_frame);

7
src/video_core/renderer_vulkan/vk_resource_pool.cpp
View File

@@ -151,12 +151,15 @@ vk::DescriptorSet DescriptorHeap::Commit(vk::DescriptorSetLayout set_layout) {
// The pool has run out. Record current tick and place it in pending list. // The pool has run out. Record current tick and place it in pending list.
ASSERT_MSG(result == vk::Result::eErrorOutOfPoolMemory || ASSERT_MSG(result == vk::Result::eErrorOutOfPoolMemory ||
result == vk::Result::eErrorFragmentedPool, result == vk::Result::eErrorFragmentedPool,
"Unexpected error during descriptor set allocation {}", vk::to_string(result)); "Unexpected error during descriptor set allocation: {}", vk::to_string(result));
pending_pools.emplace_back(curr_pool, master_semaphore->CurrentTick()); pending_pools.emplace_back(curr_pool, master_semaphore->CurrentTick());
if (const auto [pool, tick] = pending_pools.front(); master_semaphore->IsFree(tick)) { if (const auto [pool, tick] = pending_pools.front(); master_semaphore->IsFree(tick)) {
curr_pool = pool; curr_pool = pool;
pending_pools.pop_front(); pending_pools.pop_front();
device.resetDescriptorPool(curr_pool);
const auto reset_result = device.resetDescriptorPool(curr_pool);
ASSERT_MSG(reset_result == vk::Result::eSuccess,
"Unexpected error resetting descriptor pool: {}", vk::to_string(reset_result));
} else { } else {
CreateDescriptorPool(); CreateDescriptorPool();
} }