summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2014-11-15 07:41:28 +0100
committerbunnei <bunneidev@gmail.com>2014-11-15 07:41:28 +0100
commit26622818aea65134812fb0055f38b9b9ab5a2672 (patch)
tree297458a20a380d070c6f7e39c68a8c2fce38c3c6
parentMerge pull request #194 from lioncash/virt (diff)
parentFix two format strings. (diff)
downloadyuzu-26622818aea65134812fb0055f38b9b9ab5a2672.tar
yuzu-26622818aea65134812fb0055f38b9b9ab5a2672.tar.gz
yuzu-26622818aea65134812fb0055f38b9b9ab5a2672.tar.bz2
yuzu-26622818aea65134812fb0055f38b9b9ab5a2672.tar.lz
yuzu-26622818aea65134812fb0055f38b9b9ab5a2672.tar.xz
yuzu-26622818aea65134812fb0055f38b9b9ab5a2672.tar.zst
yuzu-26622818aea65134812fb0055f38b9b9ab5a2672.zip
-rw-r--r--src/core/hle/kernel/shared_memory.cpp2
-rw-r--r--src/video_core/clipper.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/core/hle/kernel/shared_memory.cpp b/src/core/hle/kernel/shared_memory.cpp
index 6bd5e2728..f538c6550 100644
--- a/src/core/hle/kernel/shared_memory.cpp
+++ b/src/core/hle/kernel/shared_memory.cpp
@@ -72,7 +72,7 @@ Result MapSharedMemory(u32 handle, u32 address, MemoryPermission permissions,
if (address < Memory::SHARED_MEMORY_VADDR || address >= Memory::SHARED_MEMORY_VADDR_END) {
ERROR_LOG(KERNEL, "cannot map handle=0x%08X, address=0x%08X outside of shared mem bounds!",
- handle);
+ handle, address);
return -1;
}
SharedMemory* shared_memory = Kernel::g_object_pool.GetFast<SharedMemory>(handle);
diff --git a/src/video_core/clipper.cpp b/src/video_core/clipper.cpp
index 96d3dabe2..fbe4047ce 100644
--- a/src/video_core/clipper.cpp
+++ b/src/video_core/clipper.cpp
@@ -159,10 +159,10 @@ void ProcessTriangle(OutputVertex &v0, OutputVertex &v1, OutputVertex &v2) {
DEBUG_LOG(GPU,
"Triangle %lu/%lu (%lu buffer vertices) at position (%.3f, %.3f, %.3f, %.3f), "
- "(%.3lu, %.3f, %.3f, %.3f), (%.3f, %.3f, %.3f, %.3f) and "
+ "(%.3f, %.3f, %.3f, %.3f), (%.3f, %.3f, %.3f, %.3f) and "
"screen position (%.2f, %.2f, %.2f), (%.2f, %.2f, %.2f), (%.2f, %.2f, %.2f)",
i,output_list.size(), buffer_vertices.size(),
- vtx0.pos.x.ToFloat32(), vtx0.pos.y.ToFloat32(), vtx0.pos.z.ToFloat32(), vtx0.pos.w.ToFloat32(),output_list.size(),
+ vtx0.pos.x.ToFloat32(), vtx0.pos.y.ToFloat32(), vtx0.pos.z.ToFloat32(), vtx0.pos.w.ToFloat32(),
vtx1.pos.x.ToFloat32(), vtx1.pos.y.ToFloat32(), vtx1.pos.z.ToFloat32(), vtx1.pos.w.ToFloat32(),
vtx2.pos.x.ToFloat32(), vtx2.pos.y.ToFloat32(), vtx2.pos.z.ToFloat32(), vtx2.pos.w.ToFloat32(),
vtx0.screenpos.x.ToFloat32(), vtx0.screenpos.y.ToFloat32(), vtx0.screenpos.z.ToFloat32(),