From c1184957a5ca520cdc5b117ed78a7c601c924cd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Lam?= Date: Thu, 11 Aug 2016 21:14:39 +0200 Subject: [PATCH] Run clang-format on missed files `clang-format`s files that lint missed because of the bug. Fortunately, not much. --- Source/Core/Core/Core.cpp | 4 ++-- Source/Core/Core/PowerPC/JitArm64/JitAsm.cpp | 4 ++-- Source/Core/DiscIO/Enums.cpp | 2 +- Source/Core/VideoCommon/PixelEngine.cpp | 6 +++--- Source/Core/VideoCommon/RenderBase.cpp | 6 +++--- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Source/Core/Core/Core.cpp b/Source/Core/Core/Core.cpp index 02eea57324..b240c4b578 100644 --- a/Source/Core/Core/Core.cpp +++ b/Source/Core/Core/Core.cpp @@ -905,8 +905,8 @@ void UpdateTitle() (u32)Movie::GetCurrentFrame(), FPS, VPS, Speed); else if (Movie::IsRecordingInput()) SFPS = StringFromFormat("Input: %u - VI: %u - FPS: %.0f - VPS: %.0f - %.0f%%", - (u32)Movie::GetCurrentInputCount(), (u32)Movie::GetCurrentFrame(), FPS, VPS, - Speed); + (u32)Movie::GetCurrentInputCount(), (u32)Movie::GetCurrentFrame(), FPS, + VPS, Speed); else { SFPS = StringFromFormat("FPS: %.0f - VPS: %.0f - %.0f%%", FPS, VPS, Speed); diff --git a/Source/Core/Core/PowerPC/JitArm64/JitAsm.cpp b/Source/Core/Core/PowerPC/JitArm64/JitAsm.cpp index 9e0187770e..1de8cc1b91 100644 --- a/Source/Core/Core/PowerPC/JitArm64/JitAsm.cpp +++ b/Source/Core/Core/PowerPC/JitArm64/JitAsm.cpp @@ -53,7 +53,7 @@ void JitArm64::GenerateAsm() { // set the mem_base based on MSR flags LDR(INDEX_UNSIGNED, ARM64Reg::W28, PPC_REG, PPCSTATE_OFF(msr)); - FixupBranch physmem = TBNZ(ARM64Reg::W28, 31-27); + FixupBranch physmem = TBNZ(ARM64Reg::W28, 31 - 27); MOVI2R(MEM_REG, (u64)Memory::physical_base); FixupBranch membaseend = B(); SetJumpTarget(physmem); @@ -103,7 +103,7 @@ void JitArm64::GenerateAsm() // set the mem_base based on MSR flags LDR(INDEX_UNSIGNED, ARM64Reg::W28, PPC_REG, PPCSTATE_OFF(msr)); - FixupBranch physmem = TBNZ(ARM64Reg::W28, 31-27); + FixupBranch physmem = TBNZ(ARM64Reg::W28, 31 - 27); MOVI2R(MEM_REG, (u64)Memory::physical_base); FixupBranch membaseend = B(); SetJumpTarget(physmem); diff --git a/Source/Core/DiscIO/Enums.cpp b/Source/Core/DiscIO/Enums.cpp index d19ac3e038..385fff1317 100644 --- a/Source/Core/DiscIO/Enums.cpp +++ b/Source/Core/DiscIO/Enums.cpp @@ -5,9 +5,9 @@ #include #include -#include "DiscIO/Enums.h" #include "Common/CommonTypes.h" #include "Common/Logging/Log.h" +#include "DiscIO/Enums.h" namespace DiscIO { diff --git a/Source/Core/VideoCommon/PixelEngine.cpp b/Source/Core/VideoCommon/PixelEngine.cpp index f5c0dea0a4..81adc2071e 100644 --- a/Source/Core/VideoCommon/PixelEngine.cpp +++ b/Source/Core/VideoCommon/PixelEngine.cpp @@ -148,7 +148,8 @@ void Init() s_signal_token_interrupt = false; s_signal_finish_interrupt = false; - et_SetTokenFinishOnMainThread = CoreTiming::RegisterEvent("SetTokenFinish", SetTokenFinish_OnMainThread); + et_SetTokenFinishOnMainThread = + CoreTiming::RegisterEvent("SetTokenFinish", SetTokenFinish_OnMainThread); } void RegisterMMIO(MMIO::Mapping* mmio, u32 base) @@ -218,8 +219,7 @@ void RegisterMMIO(MMIO::Mapping* mmio, u32 base) })); // Token register, readonly. - mmio->Register(base | PE_TOKEN_REG, - MMIO::ComplexRead([](u32) { return s_token; }), + mmio->Register(base | PE_TOKEN_REG, MMIO::ComplexRead([](u32) { return s_token; }), MMIO::InvalidWrite()); // BBOX registers, readonly and need to update a flag. diff --git a/Source/Core/VideoCommon/RenderBase.cpp b/Source/Core/VideoCommon/RenderBase.cpp index a8911a7cdd..fade0d00b9 100644 --- a/Source/Core/VideoCommon/RenderBase.cpp +++ b/Source/Core/VideoCommon/RenderBase.cpp @@ -312,9 +312,9 @@ void Renderer::DrawDebugText() { final_cyan += StringFromFormat("Frame: %llu", (unsigned long long)Movie::GetCurrentFrame()); if (Movie::IsPlayingInput()) - final_cyan += - StringFromFormat("\nInput: %llu / %llu", (unsigned long long)Movie::GetCurrentInputCount(), - (unsigned long long)Movie::GetTotalInputCount()); + final_cyan += StringFromFormat("\nInput: %llu / %llu", + (unsigned long long)Movie::GetCurrentInputCount(), + (unsigned long long)Movie::GetTotalInputCount()); } final_cyan += "\n";