chore: Rebased and merged commits

.clang-format

@@ -1,3 +1,6 @@
+# If you change this file, please format all files of the codebase as part of your PR:
+# pre-commit run clang-format --all
+
 # Commented out parameters are those with the same value as base LLVM style.
 # We can uncomment them if we want to change their value, or enforce the
 # chosen value in case the base style changes (last sync: Clang 18.1.8).
@@ -38,7 +41,7 @@ AlignAfterOpenBracket: DontAlign
 #   AcrossEmptyLines: false
 #   AcrossComments: false
 #   AlignCaseColons: false
-# AlignEscapedNewlines: Right
+AlignEscapedNewlines: DontAlign # Aligning leads to long diffs
 AlignOperands: DontAlign
 AlignTrailingComments:
   Kind: Never
@@ -114,14 +117,25 @@ Cpp11BracedListStyle: false
 #   - BOOST_FOREACH
 # IfMacros:
 #   - KJ_IF_MAYBE
-# IncludeBlocks: Preserve
+IncludeBlocks: Regroup
 IncludeCategories:
-  - Regex: ^".*"$
-    Priority: 1
-  - Regex: ^<.*\.h>$
-    Priority: 2
+  - Regex: ^"(core|drivers|editor|main|scene|servers|tests)/.*"$
+    Priority: 20
+  - Regex: ^"(modules|platform)/.*"$
+    Priority: 30
+  - Regex: ^<thirdparty/.*>$
+    Priority: 40
+  - Regex: ^<(windows|Jolt/Jolt|platform_gl)\.h>$
+    Priority: 50
+  - Regex: ^<.*\.(h|hpp)>$
+    Priority: 60
   - Regex: ^<.*>$
-    Priority: 3
+    Priority: 70
+  - Regex: ^".*\.compat\.inc"$
+    Priority: 0
+    SortPriority: 1
+  - Regex: ^".*"$
+    Priority: 10
 # IncludeIsMainRegex: (Test)?$
 # IncludeIsMainSourceRegex: ""
 # IndentAccessModifiers: false

.clang-tidy

@@ -1,21 +1,25 @@
+# If you change this file, please format all files of the codebase as part of your PR:
+# pre-commit run --hook-stage manual clang-tidy --all
+
 Checks:
   - -*
-  - cppcoreguidelines-pro-type-member-init
+  - bugprone-use-after-move
   - modernize-deprecated-headers
   - modernize-redundant-void-arg
   - modernize-use-bool-literals
-  - modernize-use-default-member-init
+#  - modernize-use-default-member-init # TODO Re-activate
   - modernize-use-nullptr
   - readability-braces-around-statements
   - readability-redundant-member-init
+  - readability-operators-representation
 HeaderFileExtensions: ["", h, hh, hpp, hxx, inc, glsl]
 ImplementationFileExtensions: [c, cc, cpp, cxx, m, mm, java]
 HeaderFilterRegex: (core|doc|drivers|editor|main|modules|platform|scene|servers|tests)/
 FormatStyle: file
 CheckOptions:
-  cppcoreguidelines-pro-type-member-init.IgnoreArrays: true
-  cppcoreguidelines-pro-type-member-init.UseAssignment: true
   modernize-deprecated-headers.CheckHeaderFile: true
   modernize-use-bool-literals.IgnoreMacros: false
   modernize-use-default-member-init.IgnoreMacros: false
   modernize-use-default-member-init.UseAssignment: true
+  readability-operators-representation.BinaryOperators: "&&;&=;&;|;~;!;!=;||;|=;^;^="
+  readability-operators-representation.OverloadedOperators: "&&;&=;&;|;~;!;!=;||;|=;^;^="

.clangd

@@ -1,12 +1,21 @@
 # https://clangd.llvm.org/config
+
 ---
+
 # Default conditions, apply everywhere.
 
+CompileFlags:
+  Add:
+    # Some thirdparty includes seem to require a high -ferror-limit to pass checks.
+    - -ferror-limit=100
+
 Diagnostics:
   Includes:
     IgnoreHeader:
       - \.compat\.inc
+
 ---
+
 # Header-specific conditions.
 
 If:
@@ -20,11 +29,19 @@ CompileFlags:
     - -Wno-unused-const-variable
     - -Wno-unused-function
     - -Wno-unused-variable
+
 ---
-# Suppress all third-party warnings.
+
+# Suppress warnings for third-party or partial code.
 
 If:
-  PathMatch: thirdparty/.*
+  PathMatch:
+    - bin/build_deps/.*
+    - misc/dist/apple_embedded_xcode/.*
+    - tests/compatibility_test/.*
+    - thirdparty/.*
+    - .*/thirdparty/.*
+    - .*-so_wrap.[ch]
 
 Diagnostics:
   Suppress: "*"

.git-blame-ignore-revs

@@ -72,3 +72,18 @@ e06d83860d798b6766b23d6eae48557387a7db85
 
 # Style: Replace header guards with `#pragma once`
 324512e11c1b7663c3cf47bec6ddbe65c6b8db2b
+
+# Style: Don't right-align escaped newlines
+c5df0cb82bc539eff7dcfb2add99d60771fc50c5
+
+# Style: Convert `*.gen.inc` to `*.gen.h`
+7dae5da1982f4a55ba91557814905faef9ce461b
+
+# Move RenderingServer enums to a dedicated RenderingServerEnums (`RSE`) namespace
+f5a290ac462765afca34e64dd39f883511510147
+
+# Style: Add `class_db.h` includes explicitly
+e380a417526c11f15a9ddb3997292409b10da2af
+
+# Move DisplayServer enums and typedefs to DisplayServerEnums
+a447ac95ec170ee117c2eae55f1bfff0d0cf0dce

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,8 +1,6 @@
 <!--
-Please target the `master` branch in priority.
+Please target the `master` branch. We will take care of backporting relevant fixes to older versions.
 
-Relevant fixes are cherry-picked for stable branches as needed by maintainers.
-
-To speed up the contribution process and avoid CI errors, please set up pre-commit hooks locally:
-https://contributing.godotengine.org/en/latest/engine/guidelines/code_style.html
+Before submitting, please read our checklist for new contributors:
+https://contributing.godotengine.org/en/latest/engine/introduction.html#checklist-for-new-contributors
 -->

.github/actions/clangd-tidy/action.yml

@@ -0,0 +1,30 @@
+name: clangd-tidy
+description: Setup and run clangd-tidy on relevant files
+
+inputs:
+  changed-files:
+    description: A pre-filtered list of changed files.
+    required: true
+    type: string
+
+runs:
+  using: composite
+  steps:
+    - name: Setup clangd-tidy
+      shell: sh
+      run: |
+        echo "::group::Prerequisite checks"
+        if [ ! -f "compile_commands.json" ]; then
+          echo "::error::clangd-tidy checker requires a compilation database to function"
+          exit 1
+        fi
+        echo "::endgroup::"
+
+        echo "::group::Installing clangd-tidy"
+        # Don't know which python we're using, so just access the global scope.
+        python -m pip install clangd clangd-tidy clang-tidy==22.1.0
+        echo "::endgroup::"
+
+        echo "::group::Running clangd-tidy"
+        clangd-tidy ${{ inputs.changed-files }}
+        echo "::endgroup::"

.github/actions/godot-cache-restore/action.yml

@@ -12,7 +12,7 @@ runs:
   using: composite
   steps:
     - name: Restore default cache
-      uses: actions/cache/restore@v4
+      uses: actions/cache/restore@v5
       id: cache-ping
       with:
         path: ${{ inputs.scons-cache }}
@@ -27,7 +27,7 @@ runs:
     # This is done after pulling the default cache so that PRs can integrate any potential changes
     # from the default branch without conflicting with whatever local changes were already made.
     - name: Restore local cache
-      uses: actions/cache/restore@v4
+      uses: actions/cache/restore@v5
       if: github.ref_name != github.event.repository.default_branch
       with:
         path: ${{ inputs.scons-cache }}

.github/actions/godot-cache-save/action.yml

@@ -16,7 +16,7 @@ runs:
       run: misc/scripts/purge_cache.py ${{ env.CACHE_TIMESTAMP }} "${{ inputs.scons-cache }}"
 
     - name: Save SCons cache directory
-      uses: actions/cache/save@v4
+      uses: actions/cache/save@v5
       with:
         path: ${{ inputs.scons-cache }}
         key: ${{ inputs.cache-name }}|${{ github.ref_name }}|${{ github.sha }}

.github/actions/godot-compat-test/action.yml

@@ -0,0 +1,33 @@
+name: Godot hash compatibility test
+description: Check if methods with given hashes used by the older GDExtensions still can be loaded with given Godot version.
+
+inputs:
+  bin:
+    description: Path to the Godot binary.
+    required: true
+    type: string
+  reftags:
+    description: Reference tags of Godot versions to check (comma separated).
+    required: true
+    type: string
+
+runs:
+  using: composite
+  steps:
+    - name: Extract GDExtension interface
+      shell: sh
+      run: |
+        ${{ inputs.bin }} --headless --dump-gdextension-interface
+        mkdir tests/compatibility_test/src/deps/
+        mv gdextension_interface.h tests/compatibility_test/src/deps/
+
+    - name: Build minimal GDExtension
+      shell: sh
+      run: scons --directory=./tests/compatibility_test
+
+    - name: Download reference GDExtension API JSON and try to load it
+      shell: sh
+      env:
+        GODOT4_BIN: ${{ inputs.bin }}
+        REFTAGS: ${{ inputs.reftags }}
+      run: ./tests/compatibility_test/run_compatibility_test.py

.github/actions/godot-cpp-build/action.yml

@@ -35,4 +35,6 @@ runs:
 
     - name: SCons Build
       shell: sh
+      env:
+        SCONS_CACHE: ${{ inputs.scons-cache }}
       run: scons --directory=./godot-cpp/test "gdextension_dir=${{ github.workspace }}" ${{ inputs.scons-flags }}

.github/actions/godot-deps/action.yml

@@ -16,7 +16,7 @@ runs:
   using: composite
   steps:
     - name: Set up Python 3.x
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v6
       with:
         # Semantic version range syntax or exact version of a Python version.
         python-version: ${{ inputs.python-version }}

.github/actions/godot-project-export/action.yml

@@ -0,0 +1,55 @@
+name: Export Godot project
+description: Export a test Godot project.
+
+inputs:
+  bin:
+    description: The path to the Godot executable
+    required: true
+
+runs:
+  using: composite
+  steps:
+    - name: Import resources and export project
+      shell: sh
+      run: |
+        git clone --depth=1 https://github.com/godotengine/godot-tests.git /tmp/godot-tests
+
+        echo "Exporting project for Linux (PCK)"
+        ${{ inputs.bin }} --headless --path /tmp/godot-tests/tests/test_project/ --export-pack "Linux" /tmp/test_project.pck 2>&1 | tee log.txt || true
+        GODOT_CHECK_CI_LOG_ALL_ERRORS=1 misc/scripts/check_ci_log.py log.txt
+
+        echo "Exporting project for Linux (ZIP)"
+        ${{ inputs.bin }} --headless --path /tmp/godot-tests/tests/test_project/ --export-pack "Linux" /tmp/test_project.zip 2>&1 | tee log.txt || true
+        GODOT_CHECK_CI_LOG_ALL_ERRORS=1 misc/scripts/check_ci_log.py log.txt
+
+        echo "Exporting project for Linux as dedicated server (PCK)"
+        ${{ inputs.bin }} --headless --path /tmp/godot-tests/tests/test_project/ --export-pack "Linux Server" /tmp/test_project_server.pck 2>&1 | tee log.txt || true
+        GODOT_CHECK_CI_LOG_ALL_ERRORS=1 misc/scripts/check_ci_log.py log.txt
+
+    - name: Run project files from folder
+      shell: sh
+      run: |
+        xvfb-run ${{ inputs.bin }} --path /tmp/godot-tests/tests/test_project/ --language fr --resolution 64x64 --write-movie /tmp/test_project_folder.png --quit 2>&1 | tee log.txt || true
+        GODOT_CHECK_CI_LOG_ALL_ERRORS=1 misc/scripts/check_ci_log.py log.txt
+
+        ${{ inputs.bin }} --headless --path /tmp/godot-tests/tests/test_project/ --quit 2>&1 | tee log.txt || true
+        GODOT_CHECK_CI_LOG_ALL_ERRORS=1 misc/scripts/check_ci_log.py log.txt
+
+    - name: Run exported project PCK/ZIP
+      shell: sh
+      run: |
+        xvfb-run ${{ inputs.bin }} --main-pack /tmp/test_project.pck --language fr --resolution 64x64 --write-movie /tmp/test_project_pck.png --quit 2>&1 | tee log.txt || true
+        GODOT_CHECK_CI_LOG_ALL_ERRORS=1 misc/scripts/check_ci_log.py log.txt
+
+        xvfb-run ${{ inputs.bin }} --main-pack /tmp/test_project.zip --language fr --resolution 64x64 --write-movie /tmp/test_project_zip.png --quit 2>&1 | tee log.txt || true
+        GODOT_CHECK_CI_LOG_ALL_ERRORS=1 misc/scripts/check_ci_log.py log.txt
+
+        # Headless mode is implied for dedicated server PCKs.
+        ${{ inputs.bin }} --main-pack /tmp/test_project_server.pck --quit 2>&1 | tee log.txt || true
+        GODOT_CHECK_CI_LOG_ALL_ERRORS=1 misc/scripts/check_ci_log.py log.txt
+
+        echo "Checking whether video output from project folder and exported project match..."
+        md5sum /tmp/test_project*.png | md5sum --check
+
+        echo "Checking whether audio output from project folder and exported project match..."
+        md5sum /tmp/test_project*.wav | md5sum --check

.github/actions/upload-artifact/action.yml

@@ -14,7 +14,7 @@ runs:
   using: composite
   steps:
     - name: Upload Godot Artifact
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v7
       with:
         name: ${{ inputs.name }}
         path: ${{ inputs.path }}

.github/changed_files.yml

@@ -0,0 +1,29 @@
+# We lack a convenient means of gathering *all* the changes when specializations are passed, so
+#  a catch-all variable is the easiest workaround.
+everything:
+  - "**"
+
+# Determines if build actions should occur after static checks are ran. Broadly speaking, these
+#  files changing would result in SCons rebuilding the engine, or are otherwise pertinent to the
+#  buildsystem itself.
+sources:
+  - .github/{actions/*,workflows}/*.yml
+  - "**/{SConstruct,SCsub,*.py}"
+  - "**/*.{h,hpp,hh,hxx,c,cpp,cc,cxx,m,mm,inc,glsl}"
+  - modules/mono/**/*.{cs,csproj,sln,props,targets}
+  - platform/android/java/{gradle*,**/*.{jar,java,kt,gradle}}
+  - platform/web/{package{,-lock}.json,js/**/*.js}
+  - tests/**
+
+# Determines which files are appropriate for running clangd-tidy checks on. This is a subset out
+#  of necessity, as we're only evaluating a Linux runner.
+clangd:
+  - "**/*.{h,hpp,hxx,hh,c,cpp,cxx,cc}"
+  - "!**/thirdparty/**"
+  - "!**/*-so_wrap.{h,c}"
+  - "!drivers/{apple*,core*,d3d12,metal,wasapi,windows,winmidi,xaudio2}/**"
+  - "!editor/shader/shader_baker/shader_baker_export_plugin_platform_{d3d12,metal}.{h,cpp}"
+  - "!modules/camera/camera_{android,macos,win}.{h,cpp}"
+  - "!modules/openxr/extensions/platform/openxr_{android,metal}_extension.{h,cpp}"
+  - "!platform/{android,ios,macos,visionos,web,windows}/**"
+  - "platform/{android,ios,macos,visionos,web,windows}/{api,export}/*.{h,hpp,hxx,hh,c,cpp,cxx,cc}"

.github/workflows/android_builds.yml

@@ -8,7 +8,6 @@ env:
   SCONS_FLAGS: >-
     dev_mode=yes
     module_text_server_fb_enabled=yes
-    tests=no
     swappy=yes
 
 jobs:
@@ -39,12 +38,12 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           submodules: recursive
 
       - name: Set up Java 17
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: temurin
           java-version: 17

.github/workflows/ios_builds.yml

@@ -8,7 +8,6 @@ env:
   SCONS_FLAGS: >-
     dev_mode=yes
     module_text_server_fb_enabled=yes
-    tests=no
     debug_symbols=no
 
 jobs:
@@ -20,7 +19,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           submodules: recursive