Skip to content

Commit 15968ac

Browse files
BrotherShortBrotherShort
committed
Merge remote-tracking branch 'upstream/master'
2 parents bc52747 + df62358 commit 15968ac

9,505 files changed

Lines changed: 2776286 additions & 1399356 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.clang-format‎

Lines changed: 37 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
1+
# If you change this file, please format all files of the codebase as part of your PR:
2+
# prek run clang-format --all
3+
14
# Commented out parameters are those with the same value as base LLVM style.
25
# We can uncomment them if we want to change their value, or enforce the
3-
# chosen value in case the base style changes (last sync: Clang 17.0.6).
6+
# chosen value in case the base style changes (last sync: Clang 18.1.8).
47
BasedOnStyle: LLVM
58
AccessModifierOffset: -4
69
AlignAfterOpenBracket: DontAlign
@@ -10,39 +13,45 @@ AlignAfterOpenBracket: DontAlign
1013
# AcrossEmptyLines: false
1114
# AcrossComments: false
1215
# AlignCompound: false
16+
# AlignFunctionPointers: false
1317
# PadOperators: true
1418
# AlignConsecutiveBitFields:
1519
# Enabled: false
1620
# AcrossEmptyLines: false
1721
# AcrossComments: false
1822
# AlignCompound: false
23+
# AlignFunctionPointers: false
1924
# PadOperators: false
2025
# AlignConsecutiveDeclarations:
2126
# Enabled: false
2227
# AcrossEmptyLines: false
2328
# AcrossComments: false
2429
# AlignCompound: false
30+
# AlignFunctionPointers: false
2531
# PadOperators: false
2632
# AlignConsecutiveMacros:
2733
# Enabled: false
2834
# AcrossEmptyLines: false
2935
# AcrossComments: false
3036
# AlignCompound: false
37+
# AlignFunctionPointers: false
3138
# PadOperators: false
3239
# AlignConsecutiveShortCaseStatements:
3340
# Enabled: false
3441
# AcrossEmptyLines: false
3542
# AcrossComments: false
3643
# AlignCaseColons: false
37-
# AlignEscapedNewlines: Right
44+
AlignEscapedNewlines: DontAlign # Aligning leads to long diffs
3845
AlignOperands: DontAlign
3946
AlignTrailingComments:
4047
Kind: Never
4148
OverEmptyLines: 0
4249
# AllowAllArgumentsOnNextLine: true
4350
AllowAllParametersOfDeclarationOnNextLine: false
51+
# AllowBreakBeforeNoexceptSpecifier: Never
4452
# AllowShortBlocksOnASingleLine: Never
4553
# AllowShortCaseLabelsOnASingleLine: false
54+
# AllowShortCompoundRequirementOnASingleLine: true
4655
# AllowShortEnumsOnASingleLine: true
4756
AllowShortFunctionsOnASingleLine: Inline
4857
# AllowShortIfStatementsOnASingleLine: Never
@@ -52,8 +61,10 @@ AllowShortFunctionsOnASingleLine: Inline
5261
# AlwaysBreakAfterReturnType: None
5362
# AlwaysBreakBeforeMultilineStrings: false
5463
# AlwaysBreakTemplateDeclarations: MultiLine
55-
# AttributeMacros:
56-
# - __capability
64+
AttributeMacros:
65+
- _ALWAYS_INLINE_
66+
- _FORCE_INLINE_
67+
- _NO_INLINE_
5768
# BinPackArguments: true
5869
# BinPackParameters: true
5970
# BitFieldColonSpacing: Both
@@ -76,7 +87,8 @@ AllowShortFunctionsOnASingleLine: Inline
7687
# SplitEmptyFunction: true
7788
# SplitEmptyRecord: true
7889
# SplitEmptyNamespace: true
79-
# BreakAfterAttributes: Never
90+
# BreakAdjacentStringLiterals: true
91+
# BreakAfterAttributes: Leave
8092
# BreakAfterJavaFieldAnnotations: false
8193
# BreakArrays: true
8294
# BreakBeforeBinaryOperators: None
@@ -105,14 +117,25 @@ Cpp11BracedListStyle: false
105117
# - BOOST_FOREACH
106118
# IfMacros:
107119
# - KJ_IF_MAYBE
108-
# IncludeBlocks: Preserve
120+
IncludeBlocks: Regroup
109121
IncludeCategories:
110-
- Regex: ^".*"$
111-
Priority: 1
112-
- Regex: ^<.*\.h>$
113-
Priority: 2
122+
- Regex: ^"(core|drivers|editor|main|scene|servers|tests)/.*"$
123+
Priority: 20
124+
- Regex: ^"(modules|platform)/.*"$
125+
Priority: 30
126+
- Regex: ^<thirdparty/.*>$
127+
Priority: 40
128+
- Regex: ^<(windows|Jolt/Jolt|platform_gl)\.h>$
129+
Priority: 50
130+
- Regex: ^<.*\.(h|hpp)>$
131+
Priority: 60
114132
- Regex: ^<.*>$
115-
Priority: 3
133+
Priority: 70
134+
- Regex: ^".*\.compat\.inc"$
135+
Priority: 0
136+
SortPriority: 1
137+
- Regex: ^".*"$
138+
Priority: 10
116139
# IncludeIsMainRegex: (Test)?$
117140
# IncludeIsMainSourceRegex: ""
118141
# IndentAccessModifiers: false
@@ -165,6 +188,7 @@ PackConstructorInitializers: NextLine
165188
# PenaltyBreakComment: 300
166189
# PenaltyBreakFirstLessLess: 120
167190
# PenaltyBreakOpenParenthesis: 0
191+
# PenaltyBreakScopeResolution: 500
168192
# PenaltyBreakString: 1000
169193
# PenaltyBreakTemplateDeclaration: 10
170194
# PenaltyExcessCharacter: 1000000
@@ -181,6 +205,7 @@ RemoveSemicolon: true
181205
# RequiresExpressionIndentation: OuterScope
182206
# SeparateDefinitionBlocks: Leave
183207
# ShortNamespaceLines: 1
208+
# SkipMacroDefinitionBody: false
184209
# SortIncludes: CaseSensitive
185210
# SortJavaStaticImport: Before
186211
# SortUsingDeclarations: LexicographicNumeric
@@ -202,6 +227,7 @@ RemoveSemicolon: true
202227
# AfterFunctionDefinitionName: false
203228
# AfterIfMacros: true
204229
# AfterOverloadedOperator: false
230+
# AfterPlacementOperator: true
205231
# AfterRequiresInClause: false
206232
# AfterRequiresInExpression: false
207233
# BeforeNonEmptyParentheses: false

‎.clang-tidy‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,26 @@
1+
# If you change this file, please format all files of the codebase as part of your PR:
2+
# prek run --hook-stage manual clang-tidy --all
3+
14
Checks:
25
- -*
3-
- cppcoreguidelines-pro-type-member-init
6+
- performance-move-const-arg
7+
- bugprone-use-after-move
8+
- modernize-deprecated-headers
49
- modernize-redundant-void-arg
510
- modernize-use-bool-literals
6-
- modernize-use-default-member-init
11+
# - modernize-use-default-member-init # TODO Re-activate
712
- modernize-use-nullptr
813
- readability-braces-around-statements
914
- readability-redundant-member-init
15+
- readability-operators-representation
1016
HeaderFileExtensions: ["", h, hh, hpp, hxx, inc, glsl]
1117
ImplementationFileExtensions: [c, cc, cpp, cxx, m, mm, java]
1218
HeaderFilterRegex: (core|doc|drivers|editor|main|modules|platform|scene|servers|tests)/
1319
FormatStyle: file
1420
CheckOptions:
15-
cppcoreguidelines-pro-type-member-init.IgnoreArrays: true
16-
cppcoreguidelines-pro-type-member-init.UseAssignment: true
21+
modernize-deprecated-headers.CheckHeaderFile: true
1722
modernize-use-bool-literals.IgnoreMacros: false
1823
modernize-use-default-member-init.IgnoreMacros: false
1924
modernize-use-default-member-init.UseAssignment: true
25+
readability-operators-representation.BinaryOperators: "&&;&=;&;|;~;!;!=;||;|=;^;^="
26+
readability-operators-representation.OverloadedOperators: "&&;&=;&;|;~;!;!=;||;|=;^;^="

‎.clangd‎

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,21 @@
11
# https://clangd.llvm.org/config
2+
23
---
4+
35
# Default conditions, apply everywhere.
46

7+
CompileFlags:
8+
Add:
9+
# Some thirdparty includes seem to require a high -ferror-limit to pass checks.
10+
- -ferror-limit=100
11+
512
Diagnostics:
613
Includes:
714
IgnoreHeader:
815
- \.compat\.inc
16+
917
---
18+
1019
# Header-specific conditions.
1120

1221
If:
@@ -20,11 +29,19 @@ CompileFlags:
2029
- -Wno-unused-const-variable
2130
- -Wno-unused-function
2231
- -Wno-unused-variable
32+
2333
---
24-
# Suppress all third-party warnings.
34+
35+
# Suppress warnings for third-party or partial code.
2536

2637
If:
27-
PathMatch: thirdparty/.*
38+
PathMatch:
39+
- bin/build_deps/.*
40+
- misc/dist/apple_embedded_xcode/.*
41+
- tests/compatibility_test/.*
42+
- thirdparty/.*
43+
- .*/thirdparty/.*
44+
- .*-so_wrap.[ch]
2845

2946
Diagnostics:
3047
Suppress: "*"

‎.editorconfig‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,7 @@ indent_style = space
1515
[{*.{yml,yaml},.clang{-format,-tidy,d}}]
1616
indent_size = 2
1717
indent_style = space
18+
19+
[{*.props,*.vcxproj}]
20+
indent_size = 2
21+
indent_style = space

‎.git-blame-ignore-revs‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,3 +72,18 @@ e06d83860d798b6766b23d6eae48557387a7db85
7272

7373
# Style: Replace header guards with `#pragma once`
7474
324512e11c1b7663c3cf47bec6ddbe65c6b8db2b
75+
76+
# Style: Don't right-align escaped newlines
77+
c5df0cb82bc539eff7dcfb2add99d60771fc50c5
78+
79+
# Style: Convert `*.gen.inc` to `*.gen.h`
80+
7dae5da1982f4a55ba91557814905faef9ce461b
81+
82+
# Move RenderingServer enums to a dedicated RenderingServerEnums (`RSE`) namespace
83+
f5a290ac462765afca34e64dd39f883511510147
84+
85+
# Style: Add `class_db.h` includes explicitly
86+
e380a417526c11f15a9ddb3997292409b10da2af
87+
88+
# Move DisplayServer enums and typedefs to DisplayServerEnums
89+
a447ac95ec170ee117c2eae55f1bfff0d0cf0dce

‎.gitattributes‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ thirdparty/* linguist-vendored
99
*.bat eol=crlf
1010
*.sln eol=crlf
1111
*.csproj eol=crlf
12-
misc/msvs/*.template eol=crlf
12+
misc/msvs/* eol=crlf
1313
# And some test files where the EOL matters
1414
*.test.txt -text
1515

0 commit comments

Comments
 (0)