summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/core/core.cpp3
-rw-r--r--src/core/hle/kernel/server_session.cpp3
-rw-r--r--src/core/hle/kernel/shared_memory.cpp7
-rw-r--r--src/core/hle/service/nvdrv/devices/nvdisp_disp0.cpp4
-rw-r--r--src/video_core/engines/maxwell_3d.cpp3
5 files changed, 11 insertions, 9 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp
index 5a80d03dc..d55621de8 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -99,7 +99,8 @@ System::ResultStatus System::Load(EmuWindow* emu_window, const std::string& file
99 99
100 ResultStatus init_result{Init(emu_window, system_mode.first.get())}; 100 ResultStatus init_result{Init(emu_window, system_mode.first.get())};
101 if (init_result != ResultStatus::Success) { 101 if (init_result != ResultStatus::Success) {
102 LOG_CRITICAL(Core, "Failed to initialize system (Error %i)!", static_cast<int>(init_result)); 102 LOG_CRITICAL(Core, "Failed to initialize system (Error %i)!",
103 static_cast<int>(init_result));
103 System::Shutdown(); 104 System::Shutdown();
104 return init_result; 105 return init_result;
105 } 106 }
diff --git a/src/core/hle/kernel/server_session.cpp b/src/core/hle/kernel/server_session.cpp
index 9d6fe0cf2..33397d84f 100644
--- a/src/core/hle/kernel/server_session.cpp
+++ b/src/core/hle/kernel/server_session.cpp
@@ -78,7 +78,8 @@ ResultCode ServerSession::HandleDomainSyncRequest(Kernel::HLERequestContext& con
78 } 78 }
79 } 79 }
80 80
81 LOG_CRITICAL(IPC, "Unknown domain command=%d", static_cast<int>(domain_message_header->command.Value())); 81 LOG_CRITICAL(IPC, "Unknown domain command=%d",
82 static_cast<int>(domain_message_header->command.Value()));
82 ASSERT(false); 83 ASSERT(false);
83 } 84 }
84 85
diff --git a/src/core/hle/kernel/shared_memory.cpp b/src/core/hle/kernel/shared_memory.cpp
index c8bda8494..88230bdd9 100644
--- a/src/core/hle/kernel/shared_memory.cpp
+++ b/src/core/hle/kernel/shared_memory.cpp
@@ -143,10 +143,9 @@ ResultCode SharedMemory::Map(Process* target_process, VAddr address, MemoryPermi
143 auto result = target_process->vm_manager.MapMemoryBlock( 143 auto result = target_process->vm_manager.MapMemoryBlock(
144 target_address, backing_block, backing_block_offset, size, MemoryState::Shared); 144 target_address, backing_block, backing_block_offset, size, MemoryState::Shared);
145 if (result.Failed()) { 145 if (result.Failed()) {
146 LOG_ERROR( 146 LOG_ERROR(Kernel,
147 Kernel, 147 "cannot map id=%u, target_address=0x%lx name=%s, error mapping to virtual memory",
148 "cannot map id=%u, target_address=0x%lx name=%s, error mapping to virtual memory", 148 GetObjectId(), target_address, name.c_str());
149 GetObjectId(), target_address, name.c_str());
150 return result.Code(); 149 return result.Code();
151 } 150 }
152 151
diff --git a/src/core/hle/service/nvdrv/devices/nvdisp_disp0.cpp b/src/core/hle/service/nvdrv/devices/nvdisp_disp0.cpp
index e48f13fa1..94530724e 100644
--- a/src/core/hle/service/nvdrv/devices/nvdisp_disp0.cpp
+++ b/src/core/hle/service/nvdrv/devices/nvdisp_disp0.cpp
@@ -23,8 +23,8 @@ void nvdisp_disp0::flip(u32 buffer_handle, u32 offset, u32 format, u32 width, u3
23 u32 stride, NVFlinger::BufferQueue::BufferTransformFlags transform) { 23 u32 stride, NVFlinger::BufferQueue::BufferTransformFlags transform) {
24 VAddr addr = nvmap_dev->GetObjectAddress(buffer_handle); 24 VAddr addr = nvmap_dev->GetObjectAddress(buffer_handle);
25 LOG_WARNING(Service, 25 LOG_WARNING(Service,
26 "Drawing from address %lx offset %08X Width %u Height %u Stride %u Format %u", 26 "Drawing from address %lx offset %08X Width %u Height %u Stride %u Format %u", addr,
27 addr, offset, width, height, stride, format); 27 offset, width, height, stride, format);
28 28
29 using PixelFormat = RendererBase::FramebufferInfo::PixelFormat; 29 using PixelFormat = RendererBase::FramebufferInfo::PixelFormat;
30 using Flags = NVFlinger::BufferQueue::BufferTransformFlags; 30 using Flags = NVFlinger::BufferQueue::BufferTransformFlags;
diff --git a/src/video_core/engines/maxwell_3d.cpp b/src/video_core/engines/maxwell_3d.cpp
index cf402f93d..4d9745e48 100644
--- a/src/video_core/engines/maxwell_3d.cpp
+++ b/src/video_core/engines/maxwell_3d.cpp
@@ -153,7 +153,8 @@ void Maxwell3D::ProcessQueryGet() {
153 break; 153 break;
154 } 154 }
155 default: 155 default:
156 UNIMPLEMENTED_MSG("Query mode %u not implemented", static_cast<u32>(regs.query.query_get.mode.Value())); 156 UNIMPLEMENTED_MSG("Query mode %u not implemented",
157 static_cast<u32>(regs.query.query_get.mode.Value()));
157 } 158 }
158} 159}
159 160