Skip to content

A
angle
Commit 7fa8824b by Jamie Madill Committed by Commit Bot
Options

Update clang-format settings.

To allow for extern "C" declarations to not break on a brace. This preserves the current code style. Also add indented preprocessor definitions. This makes the formatting of "platform.h" much nicer. Bug: angleproject:2971 Change-Id: I392babe0c8d67539a8e026a36a023a7404bb63c2 Reviewed-on: https://chromium-review.googlesource.com/c/1347452 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarGeoff Lang <geofflang@chromium.org>
parent 7198ebc4
Showing with 188 additions and 168 deletions
.clang-format
...@@ -13,7 +13,24 @@ IndentWidth: 4 ...@@ -13,7 +13,24 @@ IndentWidth: 4
ColumnLimit: 100 ColumnLimit: 100
# Always break before braces # Always break before braces
BreakBeforeBraces: Allman BreakBeforeBraces: Custom
BraceWrapping:
AfterClass: true
AfterControlStatement: true
AfterEnum: true
AfterFunction: true
AfterNamespace: true
AfterStruct: true
AfterUnion: true
BeforeCatch: true
BeforeElse: true
IndentBraces: false
SplitEmptyFunction: false
SplitEmptyRecord: false
SplitEmptyNamespace: false
# Keeps extern "C" blocks unindented.
AfterExternBlock: false
# Indent case labels. # Indent case labels.
IndentCaseLabels: true IndentCaseLabels: true
...@@ -33,3 +50,6 @@ AllowShortCaseLabelsOnASingleLine: false ...@@ -33,3 +50,6 @@ AllowShortCaseLabelsOnASingleLine: false
# Useful for spacing out functions in classes # Useful for spacing out functions in classes
KeepEmptyLinesAtTheStartOfBlocks: true KeepEmptyLinesAtTheStartOfBlocks: true
# Indent nested PP directives.
IndentPPDirectives: AfterHash
src/common/platform.h
...@@ -10,91 +10,84 @@ ...@@ -10,91 +10,84 @@
#define COMMON_PLATFORM_H_ #define COMMON_PLATFORM_H_
#if defined(_WIN32) #if defined(_WIN32)
# define ANGLE_PLATFORM_WINDOWS 1 # define ANGLE_PLATFORM_WINDOWS 1
#elif defined(__APPLE__) #elif defined(__APPLE__)
# define ANGLE_PLATFORM_APPLE 1 # define ANGLE_PLATFORM_APPLE 1
# define ANGLE_PLATFORM_POSIX 1 # define ANGLE_PLATFORM_POSIX 1
#elif defined(ANDROID) #elif defined(ANDROID)
# define ANGLE_PLATFORM_ANDROID 1 # define ANGLE_PLATFORM_ANDROID 1
# define ANGLE_PLATFORM_POSIX 1 # define ANGLE_PLATFORM_POSIX 1
#elif defined(__linux__) || defined(EMSCRIPTEN) #elif defined(__linux__) || defined(EMSCRIPTEN)
# define ANGLE_PLATFORM_LINUX 1 # define ANGLE_PLATFORM_LINUX 1
# define ANGLE_PLATFORM_POSIX 1 # define ANGLE_PLATFORM_POSIX 1
#elif defined(__FreeBSD__) || \ #elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || \
defined(__OpenBSD__) || \ defined(__DragonFly__) || defined(__sun) || defined(__GLIBC__) || defined(__GNU__) || \
defined(__NetBSD__) || \ defined(__QNX__) || defined(__Fuchsia__) || defined(__HAIKU__)
defined(__DragonFly__) || \ # define ANGLE_PLATFORM_POSIX 1
defined(__sun) || \
defined(__GLIBC__) || \
defined(__GNU__) || \
defined(__QNX__) || \
defined(__Fuchsia__) || \
defined(__HAIKU__)
# define ANGLE_PLATFORM_POSIX 1
#else #else
# error Unsupported platform. # error Unsupported platform.
#endif #endif
#ifdef ANGLE_PLATFORM_WINDOWS #ifdef ANGLE_PLATFORM_WINDOWS
# ifndef STRICT # ifndef STRICT
# define STRICT 1 # define STRICT 1
# endif # endif
# ifndef WIN32_LEAN_AND_MEAN # ifndef WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN 1 # define WIN32_LEAN_AND_MEAN 1
# endif # endif
# ifndef NOMINMAX # ifndef NOMINMAX
# define NOMINMAX 1 # define NOMINMAX 1
# endif # endif
# include <windows.h> # include <intrin.h>
# include <intrin.h> # include <windows.h>
# if defined(WINAPI_FAMILY) && (WINAPI_FAMILY != WINAPI_FAMILY_DESKTOP_APP) # if defined(WINAPI_FAMILY) && (WINAPI_FAMILY != WINAPI_FAMILY_DESKTOP_APP)
# define ANGLE_ENABLE_WINDOWS_STORE 1 # define ANGLE_ENABLE_WINDOWS_STORE 1
# endif # endif
# if defined(ANGLE_ENABLE_D3D9) # if defined(ANGLE_ENABLE_D3D9)
# include <d3d9.h> # include <d3d9.h>
# include <d3dcompiler.h> # include <d3dcompiler.h>
# endif # endif
// Include D3D11 headers when OpenGL is enabled on Windows for interop extensions. // Include D3D11 headers when OpenGL is enabled on Windows for interop extensions.
#if defined(ANGLE_ENABLE_D3D11) || defined(ANGLE_ENABLE_OPENGL) # if defined(ANGLE_ENABLE_D3D11) || defined(ANGLE_ENABLE_OPENGL)
#include <d3d10_1.h> # include <d3d10_1.h>
#include <d3d11.h> # include <d3d11.h>
#include <d3d11_3.h> # include <d3d11_3.h>
#include <d3dcompiler.h> # include <d3dcompiler.h>
#include <dxgi.h> # include <dxgi.h>
#include <dxgi1_2.h> # include <dxgi1_2.h>
# endif # endif
#if defined(ANGLE_ENABLE_D3D9) || defined(ANGLE_ENABLE_D3D11) # if defined(ANGLE_ENABLE_D3D9) || defined(ANGLE_ENABLE_D3D11)
#include <wrl.h> # include <wrl.h>
#endif # endif
# if defined(ANGLE_ENABLE_WINDOWS_STORE) # if defined(ANGLE_ENABLE_WINDOWS_STORE)
# include <dxgi1_3.h> # include <dxgi1_3.h>
# if defined(_DEBUG) # if defined(_DEBUG)
# include <DXProgrammableCapture.h> # include <DXProgrammableCapture.h>
# include <dxgidebug.h> # include <dxgidebug.h>
# endif # endif
# endif # endif
# undef near # undef near
# undef far # undef far
#endif #endif
#if defined(_MSC_VER) && !defined(_M_ARM) && !defined(_M_ARM64) #if defined(_MSC_VER) && !defined(_M_ARM) && !defined(_M_ARM64)
#include <intrin.h> # include <intrin.h>
#define ANGLE_USE_SSE # define ANGLE_USE_SSE
#elif defined(__GNUC__) && (defined(__x86_64__) || defined(__i386__)) #elif defined(__GNUC__) && (defined(__x86_64__) || defined(__i386__))
#include <x86intrin.h> # include <x86intrin.h>
#define ANGLE_USE_SSE # define ANGLE_USE_SSE
#endif #endif
// Mips and arm devices need to include stddef for size_t. // Mips and arm devices need to include stddef for size_t.
#if defined(__mips__) || defined(__arm__) || defined(__aarch64__) #if defined(__mips__) || defined(__arm__) || defined(__aarch64__)
#include <stddef.h> # include <stddef.h>
#endif #endif
// The MemoryBarrier function name collides with a macro under Windows // The MemoryBarrier function name collides with a macro under Windows
...@@ -103,13 +96,13 @@ ...@@ -103,13 +96,13 @@
// Macro for hinting that an expression is likely to be true/false. // Macro for hinting that an expression is likely to be true/false.
#if !defined(ANGLE_LIKELY) || !defined(ANGLE_UNLIKELY) #if !defined(ANGLE_LIKELY) || !defined(ANGLE_UNLIKELY)
#if defined(__GNUC__) || defined(__clang__) # if defined(__GNUC__) || defined(__clang__)
#define ANGLE_LIKELY(x) __builtin_expect(!!(x), 1) # define ANGLE_LIKELY(x) __builtin_expect(!!(x), 1)
#define ANGLE_UNLIKELY(x) __builtin_expect(!!(x), 0) # define ANGLE_UNLIKELY(x) __builtin_expect(!!(x), 0)
#else # else
#define ANGLE_LIKELY(x) (x) # define ANGLE_LIKELY(x) (x)
#define ANGLE_UNLIKELY(x) (x) # define ANGLE_UNLIKELY(x) (x)
#endif // defined(__GNUC__) || defined(__clang__) # endif // defined(__GNUC__) || defined(__clang__)
#endif // !defined(ANGLE_LIKELY) || !defined(ANGLE_UNLIKELY) #endif // !defined(ANGLE_LIKELY) || !defined(ANGLE_UNLIKELY)
#endif // COMMON_PLATFORM_H_ #endif // COMMON_PLATFORM_H_
src/common/tls.cpp
...@@ -11,24 +11,24 @@ ...@@ -11,24 +11,24 @@
#include <assert.h> #include <assert.h>
#ifdef ANGLE_ENABLE_WINDOWS_STORE #ifdef ANGLE_ENABLE_WINDOWS_STORE
#include <vector> # include <map>
#include <set> # include <mutex>
#include <map> # include <set>
#include <mutex> # include <vector>
#include <wrl/client.h> # include <Windows.System.Threading.h>
#include <wrl/async.h> # include <wrl/async.h>
#include <Windows.System.Threading.h> # include <wrl/client.h>
using namespace std; using namespace std;
using namespace Windows::Foundation; using namespace Windows::Foundation;
using namespace ABI::Windows::System::Threading; using namespace ABI::Windows::System::Threading;
// Thread local storage for Windows Store support // Thread local storage for Windows Store support
typedef vector<void*> ThreadLocalData; typedef vector<void *> ThreadLocalData;
static __declspec(thread) ThreadLocalData* currentThreadData = nullptr; static __declspec(thread) ThreadLocalData *currentThreadData = nullptr;
static set<ThreadLocalData*> allThreadData; static set<ThreadLocalData *> allThreadData;
static DWORD nextTlsIndex = 0; static DWORD nextTlsIndex = 0;
static vector<DWORD> freeTlsIndices; static vector<DWORD> freeTlsIndices;
...@@ -39,7 +39,7 @@ TLSIndex CreateTLSIndex() ...@@ -39,7 +39,7 @@ TLSIndex CreateTLSIndex()
TLSIndex index; TLSIndex index;
#ifdef ANGLE_PLATFORM_WINDOWS #ifdef ANGLE_PLATFORM_WINDOWS
#ifdef ANGLE_ENABLE_WINDOWS_STORE # ifdef ANGLE_ENABLE_WINDOWS_STORE
if (!freeTlsIndices.empty()) if (!freeTlsIndices.empty())
{ {
DWORD result = freeTlsIndices.back(); DWORD result = freeTlsIndices.back();
...@@ -50,9 +50,9 @@ TLSIndex CreateTLSIndex() ...@@ -50,9 +50,9 @@ TLSIndex CreateTLSIndex()
{ {
index = nextTlsIndex++; index = nextTlsIndex++;
} }
#else # else
index = TlsAlloc(); index = TlsAlloc();
#endif # endif
#elif defined(ANGLE_PLATFORM_POSIX) #elif defined(ANGLE_PLATFORM_POSIX)
// Create global pool key // Create global pool key
...@@ -62,7 +62,8 @@ TLSIndex CreateTLSIndex() ...@@ -62,7 +62,8 @@ TLSIndex CreateTLSIndex()
} }
#endif #endif
assert(index != TLS_INVALID_INDEX && "CreateTLSIndex(): Unable to allocate Thread Local Storage"); assert(index != TLS_INVALID_INDEX &&
"CreateTLSIndex(): Unable to allocate Thread Local Storage");
return index; return index;
} }
...@@ -75,7 +76,7 @@ bool DestroyTLSIndex(TLSIndex index) ...@@ -75,7 +76,7 @@ bool DestroyTLSIndex(TLSIndex index)
} }
#ifdef ANGLE_PLATFORM_WINDOWS #ifdef ANGLE_PLATFORM_WINDOWS
#ifdef ANGLE_ENABLE_WINDOWS_STORE # ifdef ANGLE_ENABLE_WINDOWS_STORE
assert(index < nextTlsIndex); assert(index < nextTlsIndex);
assert(find(freeTlsIndices.begin(), freeTlsIndices.end(), index) == freeTlsIndices.end()); assert(find(freeTlsIndices.begin(), freeTlsIndices.end(), index) == freeTlsIndices.end());
...@@ -88,9 +89,9 @@ bool DestroyTLSIndex(TLSIndex index) ...@@ -88,9 +89,9 @@ bool DestroyTLSIndex(TLSIndex index)
} }
} }
return true; return true;
#else # else
return (TlsFree(index) == TRUE); return (TlsFree(index) == TRUE);
#endif # endif
#elif defined(ANGLE_PLATFORM_POSIX) #elif defined(ANGLE_PLATFORM_POSIX)
return (pthread_key_delete(index) == 0); return (pthread_key_delete(index) == 0);
#endif #endif
...@@ -105,8 +106,8 @@ bool SetTLSValue(TLSIndex index, void *value) ...@@ -105,8 +106,8 @@ bool SetTLSValue(TLSIndex index, void *value)
} }
#ifdef ANGLE_PLATFORM_WINDOWS #ifdef ANGLE_PLATFORM_WINDOWS
#ifdef ANGLE_ENABLE_WINDOWS_STORE # ifdef ANGLE_ENABLE_WINDOWS_STORE
ThreadLocalData* threadData = currentThreadData; ThreadLocalData *threadData = currentThreadData;
if (!threadData) if (!threadData)
{ {
threadData = new ThreadLocalData(index + 1, nullptr); threadData = new ThreadLocalData(index + 1, nullptr);
...@@ -120,9 +121,9 @@ bool SetTLSValue(TLSIndex index, void *value) ...@@ -120,9 +121,9 @@ bool SetTLSValue(TLSIndex index, void *value)
threadData->at(index) = value; threadData->at(index) = value;
return true; return true;
#else # else
return (TlsSetValue(index, value) == TRUE); return (TlsSetValue(index, value) == TRUE);
#endif # endif
#elif defined(ANGLE_PLATFORM_POSIX) #elif defined(ANGLE_PLATFORM_POSIX)
return (pthread_setspecific(index, value) == 0); return (pthread_setspecific(index, value) == 0);
#endif #endif
...@@ -137,8 +138,8 @@ void *GetTLSValue(TLSIndex index) ...@@ -137,8 +138,8 @@ void *GetTLSValue(TLSIndex index)
} }
#ifdef ANGLE_PLATFORM_WINDOWS #ifdef ANGLE_PLATFORM_WINDOWS
#ifdef ANGLE_ENABLE_WINDOWS_STORE # ifdef ANGLE_ENABLE_WINDOWS_STORE
ThreadLocalData* threadData = currentThreadData; ThreadLocalData *threadData = currentThreadData;
if (threadData && threadData->size() > index) if (threadData && threadData->size() > index)
{ {
return threadData->at(index); return threadData->at(index);
...@@ -147,9 +148,9 @@ void *GetTLSValue(TLSIndex index) ...@@ -147,9 +148,9 @@ void *GetTLSValue(TLSIndex index)
{ {
return nullptr; return nullptr;
} }
#else # else
return TlsGetValue(index); return TlsGetValue(index);
#endif # endif
#elif defined(ANGLE_PLATFORM_POSIX) #elif defined(ANGLE_PLATFORM_POSIX)
return pthread_getspecific(index); return pthread_getspecific(index);
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment