diff options
| author | George L. Albany <Megacake1234@gmail.com> | 2024-11-27 21:15:49 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-11-27 21:15:49 +0000 |
| commit | 85d87116e184e7923b8d6804cab2681b61c62d83 (patch) | |
| tree | 55ec5bfa061a5c27272b831e697b78ed1b756a70 /misc | |
| parent | b06d20bf39d15ec736d08d4e4fcb32e0c3c1ce1e (diff) | |
| parent | 721f53fde47c2727d99e3ecccdb789a67df36de0 (diff) | |
| download | redot-engine-master.tar.gz | |
Merge commit godotengine/godot@f128f38
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/extension_api_validation/4.3-stable.expected | 19 | ||||
| -rw-r--r-- | misc/utility/.clang-format-glsl | 5 |
2 files changed, 20 insertions, 4 deletions
diff --git a/misc/extension_api_validation/4.3-stable.expected b/misc/extension_api_validation/4.3-stable.expected index 506844e6d6..0c988b8913 100644 --- a/misc/extension_api_validation/4.3-stable.expected +++ b/misc/extension_api_validation/4.3-stable.expected @@ -159,3 +159,22 @@ Validate extension JSON: API was removed: builtin_classes/Vector4i/constants/AXI Validate extension JSON: API was removed: builtin_classes/Vector4i/constants/AXIS_Z These constants have been replaced with corresponding enum constants. + + +GH-98670 +-------- +Validate extension JSON: Error: Field 'classes/RenderSceneBuffersRD/methods/create_texture/arguments': size changed value in new API, from 9 to 10. +Validate extension JSON: Error: Field 'classes/RenderingDevice/methods/draw_list_begin/arguments': size changed value in new API, from 10 to 7. +Validate extension JSON: Error: Field 'classes/RenderingDevice/methods/draw_list_begin/arguments': size changed value in new API, from 9 to 7. +Validate extension JSON: Error: Field 'classes/RenderingDevice/methods/draw_list_begin/arguments/1': type changed value in new API, from "enum::RenderingDevice.InitialAction" to "bitfield::RenderingDevice.DrawFlags". +Validate extension JSON: Error: Field 'classes/RenderingDevice/methods/draw_list_begin/arguments/2': type changed value in new API, from "enum::RenderingDevice.FinalAction" to "PackedColorArray". +Validate extension JSON: Error: Field 'classes/RenderingDevice/methods/draw_list_begin/arguments/3': type changed value in new API, from "enum::RenderingDevice.InitialAction" to "float". +Validate extension JSON: Error: Field 'classes/RenderingDevice/methods/draw_list_begin/arguments/4': type changed value in new API, from "enum::RenderingDevice.FinalAction" to "int". +Validate extension JSON: Error: Field 'classes/RenderingDevice/methods/draw_list_begin/arguments/5': default_value changed value in new API, from "PackedColorArray()" to "Rect2(0, 0, 0, 0)". +Validate extension JSON: Error: Field 'classes/RenderingDevice/methods/draw_list_begin/arguments/5': type changed value in new API, from "PackedColorArray" to "Rect2". +Validate extension JSON: Error: Field 'classes/RenderingDevice/methods/draw_list_begin/arguments/6': default_value changed value in new API, from "1.0" to "0". +Validate extension JSON: Error: Field 'classes/RenderingDevice/methods/draw_list_begin/arguments/6': meta changed value in new API, from "float" to "uint32". +Validate extension JSON: Error: Field 'classes/RenderingDevice/methods/draw_list_begin/arguments/6': type changed value in new API, from "float" to "int". + +Draw lists no longer require the initial and final action for color and depth attachments to be specified. +Draw lists can now specify if a particular color, depth, or stencil attachment should be cleared. diff --git a/misc/utility/.clang-format-glsl b/misc/utility/.clang-format-glsl index c588df0236..59efa8fa35 100644 --- a/misc/utility/.clang-format-glsl +++ b/misc/utility/.clang-format-glsl @@ -30,10 +30,7 @@ JavaImportGroups: - com.google - java - javax -KeepEmptyLines: - AtEndOfFile: false - AtStartOfBlock: false - AtStartOfFile: false +KeepEmptyLinesAtTheStartOfBlocks: false ObjCBlockIndentWidth: 4 PackConstructorInitializers: NextLine RemoveSemicolon: false # Differs from base .clang-format |