ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update clang-format to version 12 

12 is the latest release and various editors (VS, VSCode and CLion)
ship with clang-format 12 by default.
This commit is contained in:
Léo Lam 2021-08-30 00:17:24 +02:00
parent 006fc99e8e
commit 815b590dfe
No known key found for this signature in database
GPG Key ID: 0DF30F9081000741
5 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Core/HW/WiimoteReal/IOWin.cpp
View File

@ -27,9 +27,9 @@
#include "Common/Logging/Log.h" #include "Common/Logging/Log.h"
#include "Common/ScopeGuard.h" #include "Common/ScopeGuard.h"
#include "Common/Thread.h" #include "Common/Thread.h"
#include "Core/HW/WiimoteCommon/DataReport.h"
#include "Core/HW/WiimoteCommon/WiimoteConstants.h" #include "Core/HW/WiimoteCommon/WiimoteConstants.h"
#include "Core/HW/WiimoteCommon/WiimoteReport.h" #include "Core/HW/WiimoteCommon/WiimoteReport.h"
#include "Core/HW/WiimoteCommon/DataReport.h"
#include "Core/HW/WiimoteReal/IOWin.h" #include "Core/HW/WiimoteReal/IOWin.h"
// Create func_t function pointer type and declare a nullptr-initialized static variable of that // Create func_t function pointer type and declare a nullptr-initialized static variable of that

2
Source/Core/Core/IOS/Network/SSL.h
View File

@ -18,8 +18,8 @@
// clang-format on // clang-format on
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
#include "Core/IOS/IOS.h"
#include "Core/IOS/Device.h" #include "Core/IOS/Device.h"
#include "Core/IOS/IOS.h"
namespace IOS::HLE namespace IOS::HLE
{ {

4
Source/Core/DiscIO/WIABlob.cpp
View File

@ -1457,8 +1457,8 @@ WIARVZFileReader<RVZ>::ProcessAndCompress(CompressThreadState* state, CompressPa
compare_hashes(offsetof(HashBlock, padding_2), sizeof(HashBlock::padding_2)); compare_hashes(offsetof(HashBlock, padding_2), sizeof(HashBlock::padding_2));
} }
static_assert(std::is_trivially_copyable_v<typename decltype( static_assert(std::is_trivially_copyable_v<
CompressThreadState::decryption_buffer)::value_type>); typename decltype(CompressThreadState::decryption_buffer)::value_type>);
if constexpr (RVZ) if constexpr (RVZ)
{ {
// We must not store junk efficiently for chunks that may get reused at a position // We must not store junk efficiently for chunks that may get reused at a position

19
Source/Core/VideoBackends/OGL/OGLRender.cpp
View File

@ -486,17 +486,14 @@ Renderer::Renderer(std::unique_ptr<GLContext> main_gl_context, float backbuffer_
if (m_main_gl_context->IsGLES()) if (m_main_gl_context->IsGLES())
{ {
g_ogl_config.SupportedESPointSize = g_ogl_config.SupportedESPointSize = GLExtensions::Supports("GL_OES_geometry_point_size") ? 1 :
GLExtensions::Supports("GL_OES_geometry_point_size") ? GLExtensions::Supports("GL_EXT_geometry_point_size") ? 2 :
1 : 0;
GLExtensions::Supports("GL_EXT_geometry_point_size") ? 2 : 0; g_ogl_config.SupportedESTextureBuffer =
g_ogl_config.SupportedESTextureBuffer = GLExtensions::Supports("VERSION_GLES_3_2") ? GLExtensions::Supports("VERSION_GLES_3_2") ? EsTexbufType::TexbufCore :
EsTexbufType::TexbufCore : GLExtensions::Supports("GL_OES_texture_buffer") ? EsTexbufType::TexbufOes :
GLExtensions::Supports("GL_OES_texture_buffer") ? GLExtensions::Supports("GL_EXT_texture_buffer") ? EsTexbufType::TexbufExt :
EsTexbufType::TexbufOes : EsTexbufType::TexbufNone;
GLExtensions::Supports("GL_EXT_texture_buffer") ?
EsTexbufType::TexbufExt :
EsTexbufType::TexbufNone;
supports_glsl_cache = true; supports_glsl_cache = true;
g_ogl_config.bSupportsGLSync = true; g_ogl_config.bSupportsGLSync = true;

2
Tools/lint.sh
View File

@ -9,7 +9,7 @@ if ! [ -x "$(command -v git)" ]; then
exit 1 exit 1
fi fi
REQUIRED_CLANG_FORMAT_MAJOR=10 REQUIRED_CLANG_FORMAT_MAJOR=12
REQUIRED_CLANG_FORMAT_MINOR=0 REQUIRED_CLANG_FORMAT_MINOR=0
CLANG_FORMAT=clang-format CLANG_FORMAT=clang-format
CLANG_FORMAT_MAJOR=clang-format-${REQUIRED_CLANG_FORMAT_MAJOR} CLANG_FORMAT_MAJOR=clang-format-${REQUIRED_CLANG_FORMAT_MAJOR}