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:
parent
006fc99e8e
commit
815b590dfe
|
@ -27,9 +27,9 @@
|
|||
#include "Common/Logging/Log.h"
|
||||
#include "Common/ScopeGuard.h"
|
||||
#include "Common/Thread.h"
|
||||
#include "Core/HW/WiimoteCommon/DataReport.h"
|
||||
#include "Core/HW/WiimoteCommon/WiimoteConstants.h"
|
||||
#include "Core/HW/WiimoteCommon/WiimoteReport.h"
|
||||
#include "Core/HW/WiimoteCommon/DataReport.h"
|
||||
#include "Core/HW/WiimoteReal/IOWin.h"
|
||||
|
||||
// Create func_t function pointer type and declare a nullptr-initialized static variable of that
|
||||
|
|
|
@ -18,8 +18,8 @@
|
|||
// clang-format on
|
||||
|
||||
#include "Common/CommonTypes.h"
|
||||
#include "Core/IOS/IOS.h"
|
||||
#include "Core/IOS/Device.h"
|
||||
#include "Core/IOS/IOS.h"
|
||||
|
||||
namespace IOS::HLE
|
||||
{
|
||||
|
|
|
@ -1457,8 +1457,8 @@ WIARVZFileReader<RVZ>::ProcessAndCompress(CompressThreadState* state, CompressPa
|
|||
compare_hashes(offsetof(HashBlock, padding_2), sizeof(HashBlock::padding_2));
|
||||
}
|
||||
|
||||
static_assert(std::is_trivially_copyable_v<typename decltype(
|
||||
CompressThreadState::decryption_buffer)::value_type>);
|
||||
static_assert(std::is_trivially_copyable_v<
|
||||
typename decltype(CompressThreadState::decryption_buffer)::value_type>);
|
||||
if constexpr (RVZ)
|
||||
{
|
||||
// We must not store junk efficiently for chunks that may get reused at a position
|
||||
|
|
|
@ -486,16 +486,13 @@ Renderer::Renderer(std::unique_ptr<GLContext> main_gl_context, float backbuffer_
|
|||
|
||||
if (m_main_gl_context->IsGLES())
|
||||
{
|
||||
g_ogl_config.SupportedESPointSize =
|
||||
GLExtensions::Supports("GL_OES_geometry_point_size") ?
|
||||
1 :
|
||||
GLExtensions::Supports("GL_EXT_geometry_point_size") ? 2 : 0;
|
||||
g_ogl_config.SupportedESTextureBuffer = GLExtensions::Supports("VERSION_GLES_3_2") ?
|
||||
EsTexbufType::TexbufCore :
|
||||
GLExtensions::Supports("GL_OES_texture_buffer") ?
|
||||
EsTexbufType::TexbufOes :
|
||||
GLExtensions::Supports("GL_EXT_texture_buffer") ?
|
||||
EsTexbufType::TexbufExt :
|
||||
g_ogl_config.SupportedESPointSize = GLExtensions::Supports("GL_OES_geometry_point_size") ? 1 :
|
||||
GLExtensions::Supports("GL_EXT_geometry_point_size") ? 2 :
|
||||
0;
|
||||
g_ogl_config.SupportedESTextureBuffer =
|
||||
GLExtensions::Supports("VERSION_GLES_3_2") ? EsTexbufType::TexbufCore :
|
||||
GLExtensions::Supports("GL_OES_texture_buffer") ? EsTexbufType::TexbufOes :
|
||||
GLExtensions::Supports("GL_EXT_texture_buffer") ? EsTexbufType::TexbufExt :
|
||||
EsTexbufType::TexbufNone;
|
||||
|
||||
supports_glsl_cache = true;
|
||||
|
|
|
@ -9,7 +9,7 @@ if ! [ -x "$(command -v git)" ]; then
|
|||
exit 1
|
||||
fi
|
||||
|
||||
REQUIRED_CLANG_FORMAT_MAJOR=10
|
||||
REQUIRED_CLANG_FORMAT_MAJOR=12
|
||||
REQUIRED_CLANG_FORMAT_MINOR=0
|
||||
CLANG_FORMAT=clang-format
|
||||
CLANG_FORMAT_MAJOR=clang-format-${REQUIRED_CLANG_FORMAT_MAJOR}
|
||||
|
|
Loading…
Reference in New Issue