summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2014-11-14 17:47:06 +0100
committerLioncash <mathew1800@gmail.com>2014-11-14 18:08:26 +0100
commitac58b76e712cb6211b6aa6eec0d3b012ebfd7a56 (patch)
treede7fc6fb4bcc0e8e72e11891490f83028d8a3578
parentMerge pull request #183 from archshift/lowpath (diff)
downloadyuzu-ac58b76e712cb6211b6aa6eec0d3b012ebfd7a56.tar
yuzu-ac58b76e712cb6211b6aa6eec0d3b012ebfd7a56.tar.gz
yuzu-ac58b76e712cb6211b6aa6eec0d3b012ebfd7a56.tar.bz2
yuzu-ac58b76e712cb6211b6aa6eec0d3b012ebfd7a56.tar.lz
yuzu-ac58b76e712cb6211b6aa6eec0d3b012ebfd7a56.tar.xz
yuzu-ac58b76e712cb6211b6aa6eec0d3b012ebfd7a56.tar.zst
yuzu-ac58b76e712cb6211b6aa6eec0d3b012ebfd7a56.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(),