From 38e2b6c8d82a4212cf865d61cbb84450e3fb939c Mon Sep 17 00:00:00 2001 From: Daniel Lim Wee Soong Date: Sun, 25 Mar 2018 00:54:40 +0800 Subject: [PATCH] Undo changes to unrelated files and fix formatting --- src/audio_core/hle/source.cpp | 3 +-- src/citra_qt/debugger/graphics/graphics_vertex_shader.cpp | 8 +++----- src/common/string_util.cpp | 2 +- src/core/hle/kernel/svc.cpp | 2 +- src/core/hle/service/ldr_ro/ldr_ro.cpp | 2 +- 5 files changed, 7 insertions(+), 10 deletions(-) diff --git a/src/audio_core/hle/source.cpp b/src/audio_core/hle/source.cpp index f2ac73cb5..e8435acd8 100644 --- a/src/audio_core/hle/source.cpp +++ b/src/audio_core/hle/source.cpp @@ -323,8 +323,7 @@ bool Source::DequeueBuffer() { } NGLOG_TRACE(Audio_DSP, "source_id={} buffer_id={} from_queue={} current_buffer.size()={}", - source_id, buf.buffer_id, buf.from_queue, - state.current_buffer.size()); + source_id, buf.buffer_id, buf.from_queue, state.current_buffer.size()); return true; } diff --git a/src/citra_qt/debugger/graphics/graphics_vertex_shader.cpp b/src/citra_qt/debugger/graphics/graphics_vertex_shader.cpp index d5fff857c..b02cdfe2b 100644 --- a/src/citra_qt/debugger/graphics/graphics_vertex_shader.cpp +++ b/src/citra_qt/debugger/graphics/graphics_vertex_shader.cpp @@ -591,15 +591,13 @@ void GraphicsVertexShaderWidget::OnCycleIndexChanged(int index) { .arg(record.address_registers[1]); if (record.mask & Pica::Shader::DebugDataRecord::CMP_RESULT) text += tr("Compare Result: %1, %2\n") - .arg(record.conditional_code[0]) - .arg(record.conditional_code[1]); + .arg(record.conditional_code[0] ? "true" : "false") + .arg(record.conditional_code[1] ? "true" : "false"); if (record.mask & Pica::Shader::DebugDataRecord::COND_BOOL_IN) text += tr("Static Condition: %1\n").arg(record.cond_bool); if (record.mask & Pica::Shader::DebugDataRecord::COND_CMP_IN) - text += tr("Dynamic Conditions: %1, %2\n") - .arg(record.cond_cmp[0]) - .arg(record.cond_cmp[1]); + text += tr("Dynamic Conditions: %1, %2\n").arg(record.cond_cmp[0]).arg(record.cond_cmp[1]); if (record.mask & Pica::Shader::DebugDataRecord::LOOP_INT_IN) text += tr("Loop Parameters: %1 (repeats), %2 (initializer), %3 (increment), %4\n") .arg(record.loop_int.x) diff --git a/src/common/string_util.cpp b/src/common/string_util.cpp index a7eccd689..124a8937f 100644 --- a/src/common/string_util.cpp +++ b/src/common/string_util.cpp @@ -189,7 +189,7 @@ bool TryParse(const std::string& str, bool* const output) { } std::string StringFromBool(bool value) { - return value; + return value ? "True" : "False"; } bool SplitPath(const std::string& full_path, std::string* _pPath, std::string* _pFilename, diff --git a/src/core/hle/kernel/svc.cpp b/src/core/hle/kernel/svc.cpp index 60cd3a41b..fc645cede 100644 --- a/src/core/hle/kernel/svc.cpp +++ b/src/core/hle/kernel/svc.cpp @@ -827,7 +827,7 @@ static ResultCode CreateMutex(Handle* out_handle, u32 initial_locked) { CASCADE_RESULT(*out_handle, g_handle_table.Create(std::move(mutex))); LOG_TRACE(Kernel_SVC, "called initial_locked=%s : created handle=0x%08X", - initial_locked, *out_handle); + initial_locked ? "true" : "false", *out_handle); return RESULT_SUCCESS; } diff --git a/src/core/hle/service/ldr_ro/ldr_ro.cpp b/src/core/hle/service/ldr_ro/ldr_ro.cpp index 5ac9a37c7..c73292087 100644 --- a/src/core/hle/service/ldr_ro/ldr_ro.cpp +++ b/src/core/hle/service/ldr_ro/ldr_ro.cpp @@ -202,7 +202,7 @@ void RO::LoadCRO(Kernel::HLERequestContext& ctx, bool link_on_load_bug_fix) { "fix_level=%d, crr_address=0x%08X", link_on_load_bug_fix ? "new" : "old", cro_buffer_ptr, cro_address, cro_size, data_segment_address, zero, data_segment_size, bss_segment_address, bss_segment_size, - auto_link, fix_level, crr_address); + auto_link ? "true" : "false", fix_level, crr_address); IPC::RequestBuilder rb = rp.MakeBuilder(2, 0);