citra-emu
/
citra-nightly
Archived
1
0
Fork 0
Code

Undo changes to unrelated files and fix formatting

This commit is contained in:
Daniel Lim Wee Soong 2018-03-25 00:54:40 +08:00
parent df816b5eaf
commit 38e2b6c8d8
5 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/audio_core/hle/source.cpp
View File

@ -323,8 +323,7 @@ bool Source::DequeueBuffer() {
} }
NGLOG_TRACE(Audio_DSP, "source_id={} buffer_id={} from_queue={} current_buffer.size()={}", NGLOG_TRACE(Audio_DSP, "source_id={} buffer_id={} from_queue={} current_buffer.size()={}",
source_id, buf.buffer_id, buf.from_queue, source_id, buf.buffer_id, buf.from_queue, state.current_buffer.size());
state.current_buffer.size());
return true; return true;
} }

8
src/citra_qt/debugger/graphics/graphics_vertex_shader.cpp
View File

@ -591,15 +591,13 @@ void GraphicsVertexShaderWidget::OnCycleIndexChanged(int index) {
.arg(record.address_registers[1]); .arg(record.address_registers[1]);
if (record.mask & Pica::Shader::DebugDataRecord::CMP_RESULT) if (record.mask & Pica::Shader::DebugDataRecord::CMP_RESULT)
text += tr("Compare Result: %1, %2\n") text += tr("Compare Result: %1, %2\n")
.arg(record.conditional_code[0]) .arg(record.conditional_code[0] ? "true" : "false")
.arg(record.conditional_code[1]); .arg(record.conditional_code[1] ? "true" : "false");
if (record.mask & Pica::Shader::DebugDataRecord::COND_BOOL_IN) if (record.mask & Pica::Shader::DebugDataRecord::COND_BOOL_IN)
text += tr("Static Condition: %1\n").arg(record.cond_bool); text += tr("Static Condition: %1\n").arg(record.cond_bool);
if (record.mask & Pica::Shader::DebugDataRecord::COND_CMP_IN) if (record.mask & Pica::Shader::DebugDataRecord::COND_CMP_IN)
text += tr("Dynamic Conditions: %1, %2\n") text += tr("Dynamic Conditions: %1, %2\n").arg(record.cond_cmp[0]).arg(record.cond_cmp[1]);
.arg(record.cond_cmp[0])
.arg(record.cond_cmp[1]);
if (record.mask & Pica::Shader::DebugDataRecord::LOOP_INT_IN) if (record.mask & Pica::Shader::DebugDataRecord::LOOP_INT_IN)
text += tr("Loop Parameters: %1 (repeats), %2 (initializer), %3 (increment), %4\n") text += tr("Loop Parameters: %1 (repeats), %2 (initializer), %3 (increment), %4\n")
.arg(record.loop_int.x) .arg(record.loop_int.x)

2
src/common/string_util.cpp
View File

@ -189,7 +189,7 @@ bool TryParse(const std::string& str, bool* const output) {
} }
std::string StringFromBool(bool value) { std::string StringFromBool(bool value) {
return value; return value ? "True" : "False";
} }
bool SplitPath(const std::string& full_path, std::string* _pPath, std::string* _pFilename, bool SplitPath(const std::string& full_path, std::string* _pPath, std::string* _pFilename,

2
src/core/hle/kernel/svc.cpp
View File

@ -827,7 +827,7 @@ static ResultCode CreateMutex(Handle* out_handle, u32 initial_locked) {
CASCADE_RESULT(*out_handle, g_handle_table.Create(std::move(mutex))); CASCADE_RESULT(*out_handle, g_handle_table.Create(std::move(mutex)));
LOG_TRACE(Kernel_SVC, "called initial_locked=%s : created handle=0x%08X", 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; return RESULT_SUCCESS;
} }

2
src/core/hle/service/ldr_ro/ldr_ro.cpp
View File

@ -202,7 +202,7 @@ void RO::LoadCRO(Kernel::HLERequestContext& ctx, bool link_on_load_bug_fix) {
"fix_level=%d, crr_address=0x%08X", "fix_level=%d, crr_address=0x%08X",
link_on_load_bug_fix ? "new" : "old", cro_buffer_ptr, cro_address, cro_size, 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, 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); IPC::RequestBuilder rb = rp.MakeBuilder(2, 0);