From ffea0d0d0513cc4d98d2c48f2dd7cc7fb7532b19 Mon Sep 17 00:00:00 2001 From: nikitalita <69168929+nikitalita@users.noreply.github.com> Date: Mon, 27 Jul 2026 12:37:13 -0700 Subject: [PATCH 1/3] fix wayland not being used when not starting GDRE with any CLI flags --- utility/cli_helper.h | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/utility/cli_helper.h b/utility/cli_helper.h index 107e77ed0..7a6e5b114 100644 --- a/utility/cli_helper.h +++ b/utility/cli_helper.h @@ -28,6 +28,7 @@ static void print_version() { print_line("Godot RE Tools " + String(GDRE_VERSION)); } +[[maybe_unused]] static void remove_flag(List *args, const String &flag, bool has_value = false) { for (List::Element *E = args->front(); E; E = E->next()) { auto arg_and_value = E->get().split("=", true, 1); @@ -42,6 +43,7 @@ static void remove_flag(List *args, const String &flag, bool has_value = } } +[[maybe_unused]] static void insert_flag_at_front(List *args, const String &flag, const String &value = "") { for (List::Element *E = args->front(); E; E = E->next()) { if (E->get().begins_with("-")) { @@ -49,9 +51,13 @@ static void insert_flag_at_front(List *args, const String &flag, const S if (!value.is_empty()) { args->insert_after(inserted, value); } - break; + return; } } + auto inserted = args->push_back(flag); + if (!value.is_empty()) { + args->insert_after(inserted, value); + } } static void add_wayland_args(List *args) { @@ -68,6 +74,7 @@ static bool modify_cli_args(List *args, List *user_args) { Vector engine_args; bool found_help = false; String path = ""; + bool display_driver_chosen = false; for (List::Element *E = args->front(); E; E = E->next()) { String arg = E->get(); if (arg == "--path" && E->next()) { @@ -87,6 +94,8 @@ static bool modify_cli_args(List *args, List *user_args) { user_args->clear(); args->push_back("--help"); return false; + } else if (arg == "--headless" || arg == "--display-driver") { + display_driver_chosen = true; } } if (found_help) { @@ -113,7 +122,9 @@ static bool modify_cli_args(List *args, List *user_args) { break; } } - add_wayland_args(args); + if (!display_driver_chosen) { + add_wayland_args(args); + } return false; } } //namespace gdre From 96de81fafe0f21512c60e564c0e1e4132c1f565e Mon Sep 17 00:00:00 2001 From: nikitalita <69168929+nikitalita@users.noreply.github.com> Date: Mon, 27 Jul 2026 15:39:10 -0700 Subject: [PATCH 2/3] fix compilation on later linuxes --- spirv-interop/spirv-transpiler.h | 1 + 1 file changed, 1 insertion(+) diff --git a/spirv-interop/spirv-transpiler.h b/spirv-interop/spirv-transpiler.h index ec8757dee..6503891a4 100644 --- a/spirv-interop/spirv-transpiler.h +++ b/spirv-interop/spirv-transpiler.h @@ -1,4 +1,5 @@ +#include #include #include #include From c2e6f9aace176e91b7c1c38b99ff4db040bbab61 Mon Sep 17 00:00:00 2001 From: nikitalita <69168929+nikitalita@users.noreply.github.com> Date: Mon, 27 Jul 2026 15:40:21 -0700 Subject: [PATCH 3/3] import churn after version update --- standalone/gdre_icons/gdre_Close.svg.import | 2 ++ standalone/gdre_icons/gdre_File.svg.import | 2 ++ standalone/gdre_icons/gdre_FileBroken.svg.import | 2 ++ standalone/gdre_icons/gdre_FileBrowse.svg.import | 2 ++ standalone/gdre_icons/gdre_FileEncrypted.svg.import | 2 ++ standalone/gdre_icons/gdre_FileOk.svg.import | 2 ++ standalone/gdre_icons/gdre_FileWarning.svg.import | 2 ++ standalone/gdre_icons/gdre_GuiTabMenuHl.svg.import | 2 ++ standalone/gdre_icons/gdre_Import.svg.import | 2 ++ standalone/gdre_icons/gdre_Logo.svg.import | 2 ++ standalone/gdre_icons/gdre_LogoBig.svg.import | 2 ++ standalone/gdre_icons/gdre_MaterialPreviewLight1.svg.import | 2 ++ standalone/gdre_icons/gdre_MaterialPreviewLight2.svg.import | 2 ++ standalone/gdre_icons/gdre_Pack.svg.import | 2 ++ standalone/gdre_icons/gdre_Pause.svg.import | 2 ++ standalone/gdre_icons/gdre_Play.svg.import | 2 ++ standalone/gdre_icons/gdre_Reload.svg.import | 2 ++ standalone/gdre_icons/gdre_ResBT.svg.import | 2 ++ standalone/gdre_icons/gdre_ResOther.svg.import | 2 ++ standalone/gdre_icons/gdre_ResTB.svg.import | 2 ++ standalone/gdre_icons/gdre_Script.svg.import | 2 ++ standalone/gdre_icons/gdre_Search.svg.import | 2 ++ standalone/gdre_icons/gdre_Stop.svg.import | 2 ++ standalone/gdre_icons/gdre_Translation.svg.import | 2 ++ 24 files changed, 48 insertions(+) diff --git a/standalone/gdre_icons/gdre_Close.svg.import b/standalone/gdre_icons/gdre_Close.svg.import index ce587227e..6fd3767c5 100644 --- a/standalone/gdre_icons/gdre_Close.svg.import +++ b/standalone/gdre_icons/gdre_Close.svg.import @@ -15,4 +15,6 @@ dest_files=["res://.godot/imported/gdre_Close.svg-6a694d57a40b6b67ed00f3d03bcb58 base_scale=1.0 saturation=1.0 color_map={} +fix_alpha_border=false +premult_alpha=false compress=true diff --git a/standalone/gdre_icons/gdre_File.svg.import b/standalone/gdre_icons/gdre_File.svg.import index 23ce45bf5..78a51a347 100644 --- a/standalone/gdre_icons/gdre_File.svg.import +++ b/standalone/gdre_icons/gdre_File.svg.import @@ -15,4 +15,6 @@ dest_files=["res://.godot/imported/gdre_File.svg-2a8ee674ab13ea3c8b688fd221f5e1f base_scale=1.0 saturation=1.0 color_map={} +fix_alpha_border=false +premult_alpha=false compress=true diff --git a/standalone/gdre_icons/gdre_FileBroken.svg.import b/standalone/gdre_icons/gdre_FileBroken.svg.import index 484cff7ae..0a067a150 100644 --- a/standalone/gdre_icons/gdre_FileBroken.svg.import +++ b/standalone/gdre_icons/gdre_FileBroken.svg.import @@ -15,4 +15,6 @@ dest_files=["res://.godot/imported/gdre_FileBroken.svg-47f2470a73614cd1e3f592d93 base_scale=1.0 saturation=1.0 color_map={} +fix_alpha_border=false +premult_alpha=false compress=true diff --git a/standalone/gdre_icons/gdre_FileBrowse.svg.import b/standalone/gdre_icons/gdre_FileBrowse.svg.import index fddcba118..2c4dfa86e 100644 --- a/standalone/gdre_icons/gdre_FileBrowse.svg.import +++ b/standalone/gdre_icons/gdre_FileBrowse.svg.import @@ -15,4 +15,6 @@ dest_files=["res://.godot/imported/gdre_FileBrowse.svg-85768795b621c9574e535334d base_scale=1.0 saturation=1.0 color_map={} +fix_alpha_border=false +premult_alpha=false compress=true diff --git a/standalone/gdre_icons/gdre_FileEncrypted.svg.import b/standalone/gdre_icons/gdre_FileEncrypted.svg.import index 1da078fdf..f762b2f04 100644 --- a/standalone/gdre_icons/gdre_FileEncrypted.svg.import +++ b/standalone/gdre_icons/gdre_FileEncrypted.svg.import @@ -15,4 +15,6 @@ dest_files=["res://.godot/imported/gdre_FileEncrypted.svg-8fc6ab154ff862f14557ff base_scale=1.0 saturation=1.0 color_map={} +fix_alpha_border=false +premult_alpha=false compress=true diff --git a/standalone/gdre_icons/gdre_FileOk.svg.import b/standalone/gdre_icons/gdre_FileOk.svg.import index a6f9cf369..5900e23eb 100644 --- a/standalone/gdre_icons/gdre_FileOk.svg.import +++ b/standalone/gdre_icons/gdre_FileOk.svg.import @@ -15,4 +15,6 @@ dest_files=["res://.godot/imported/gdre_FileOk.svg-6aa8e831f296fcecee3ec7b00dac9 base_scale=1.0 saturation=1.0 color_map={} +fix_alpha_border=false +premult_alpha=false compress=true diff --git a/standalone/gdre_icons/gdre_FileWarning.svg.import b/standalone/gdre_icons/gdre_FileWarning.svg.import index c107bcc82..cf01c449f 100644 --- a/standalone/gdre_icons/gdre_FileWarning.svg.import +++ b/standalone/gdre_icons/gdre_FileWarning.svg.import @@ -15,4 +15,6 @@ dest_files=["res://.godot/imported/gdre_FileWarning.svg-2689194bc355c9e337ec3d85 base_scale=1.0 saturation=1.0 color_map={} +fix_alpha_border=false +premult_alpha=false compress=true diff --git a/standalone/gdre_icons/gdre_GuiTabMenuHl.svg.import b/standalone/gdre_icons/gdre_GuiTabMenuHl.svg.import index 58d6bebc3..20cc96b4b 100644 --- a/standalone/gdre_icons/gdre_GuiTabMenuHl.svg.import +++ b/standalone/gdre_icons/gdre_GuiTabMenuHl.svg.import @@ -15,4 +15,6 @@ dest_files=["res://.godot/imported/gdre_GuiTabMenuHl.svg-6ed85db88d8026812387151 base_scale=1.0 saturation=1.0 color_map={} +fix_alpha_border=false +premult_alpha=false compress=true diff --git a/standalone/gdre_icons/gdre_Import.svg.import b/standalone/gdre_icons/gdre_Import.svg.import index 259536dcc..48209b253 100644 --- a/standalone/gdre_icons/gdre_Import.svg.import +++ b/standalone/gdre_icons/gdre_Import.svg.import @@ -15,4 +15,6 @@ dest_files=["res://.godot/imported/gdre_Import.svg-1115eb7d8044d7d233fa4679f307d base_scale=1.0 saturation=1.0 color_map={} +fix_alpha_border=false +premult_alpha=false compress=true diff --git a/standalone/gdre_icons/gdre_Logo.svg.import b/standalone/gdre_icons/gdre_Logo.svg.import index 2b50350e1..41f16a03d 100644 --- a/standalone/gdre_icons/gdre_Logo.svg.import +++ b/standalone/gdre_icons/gdre_Logo.svg.import @@ -15,4 +15,6 @@ dest_files=["res://.godot/imported/gdre_Logo.svg-03c78c677d3ee90e9fbfc520e5118ed base_scale=2.0 saturation=1.0 color_map={} +fix_alpha_border=false +premult_alpha=false compress=true diff --git a/standalone/gdre_icons/gdre_LogoBig.svg.import b/standalone/gdre_icons/gdre_LogoBig.svg.import index d022f71fc..f73e72e20 100644 --- a/standalone/gdre_icons/gdre_LogoBig.svg.import +++ b/standalone/gdre_icons/gdre_LogoBig.svg.import @@ -15,4 +15,6 @@ dest_files=["res://.godot/imported/gdre_LogoBig.svg-6ca6b5fcea192f7868ddf57e050b base_scale=1.0 saturation=1.0 color_map={} +fix_alpha_border=false +premult_alpha=false compress=true diff --git a/standalone/gdre_icons/gdre_MaterialPreviewLight1.svg.import b/standalone/gdre_icons/gdre_MaterialPreviewLight1.svg.import index d6115517e..e8fc380fc 100644 --- a/standalone/gdre_icons/gdre_MaterialPreviewLight1.svg.import +++ b/standalone/gdre_icons/gdre_MaterialPreviewLight1.svg.import @@ -15,4 +15,6 @@ dest_files=["res://.godot/imported/gdre_MaterialPreviewLight1.svg-4cf0b0e5e2d2ef base_scale=1.0 saturation=1.0 color_map={} +fix_alpha_border=false +premult_alpha=false compress=true diff --git a/standalone/gdre_icons/gdre_MaterialPreviewLight2.svg.import b/standalone/gdre_icons/gdre_MaterialPreviewLight2.svg.import index 32f9e67ba..108a4c2de 100644 --- a/standalone/gdre_icons/gdre_MaterialPreviewLight2.svg.import +++ b/standalone/gdre_icons/gdre_MaterialPreviewLight2.svg.import @@ -15,4 +15,6 @@ dest_files=["res://.godot/imported/gdre_MaterialPreviewLight2.svg-2709caafd924ed base_scale=1.0 saturation=1.0 color_map={} +fix_alpha_border=false +premult_alpha=false compress=true diff --git a/standalone/gdre_icons/gdre_Pack.svg.import b/standalone/gdre_icons/gdre_Pack.svg.import index 78e5bdb77..2c02abcbd 100644 --- a/standalone/gdre_icons/gdre_Pack.svg.import +++ b/standalone/gdre_icons/gdre_Pack.svg.import @@ -15,4 +15,6 @@ dest_files=["res://.godot/imported/gdre_Pack.svg-d44c57dd9ce66a00aa09c1dfae57e62 base_scale=2.0 saturation=1.0 color_map={} +fix_alpha_border=false +premult_alpha=false compress=true diff --git a/standalone/gdre_icons/gdre_Pause.svg.import b/standalone/gdre_icons/gdre_Pause.svg.import index 6392be423..d4a31c432 100644 --- a/standalone/gdre_icons/gdre_Pause.svg.import +++ b/standalone/gdre_icons/gdre_Pause.svg.import @@ -15,4 +15,6 @@ dest_files=["res://.godot/imported/gdre_Pause.svg-370ca5d2688558a108c081589218a4 base_scale=2.0 saturation=1.0 color_map={} +fix_alpha_border=false +premult_alpha=false compress=true diff --git a/standalone/gdre_icons/gdre_Play.svg.import b/standalone/gdre_icons/gdre_Play.svg.import index 1eb7bc0be..0e0f09bc8 100644 --- a/standalone/gdre_icons/gdre_Play.svg.import +++ b/standalone/gdre_icons/gdre_Play.svg.import @@ -15,4 +15,6 @@ dest_files=["res://.godot/imported/gdre_Play.svg-c9be634537fad3835afce9acf68d1bc base_scale=2.0 saturation=1.0 color_map={} +fix_alpha_border=false +premult_alpha=false compress=true diff --git a/standalone/gdre_icons/gdre_Reload.svg.import b/standalone/gdre_icons/gdre_Reload.svg.import index 0efaa547d..787c8844c 100644 --- a/standalone/gdre_icons/gdre_Reload.svg.import +++ b/standalone/gdre_icons/gdre_Reload.svg.import @@ -15,4 +15,6 @@ dest_files=["res://.godot/imported/gdre_Reload.svg-f61f040c5c388c741094b60afdb58 base_scale=1.6 saturation=1.0 color_map={} +fix_alpha_border=false +premult_alpha=false compress=true diff --git a/standalone/gdre_icons/gdre_ResBT.svg.import b/standalone/gdre_icons/gdre_ResBT.svg.import index bed066653..a0641abee 100644 --- a/standalone/gdre_icons/gdre_ResBT.svg.import +++ b/standalone/gdre_icons/gdre_ResBT.svg.import @@ -15,4 +15,6 @@ dest_files=["res://.godot/imported/gdre_ResBT.svg-f69b579f4913cd80591ac91026e46d base_scale=2.0 saturation=1.0 color_map={} +fix_alpha_border=false +premult_alpha=false compress=true diff --git a/standalone/gdre_icons/gdre_ResOther.svg.import b/standalone/gdre_icons/gdre_ResOther.svg.import index 1cc5fadd8..287f68c19 100644 --- a/standalone/gdre_icons/gdre_ResOther.svg.import +++ b/standalone/gdre_icons/gdre_ResOther.svg.import @@ -15,4 +15,6 @@ dest_files=["res://.godot/imported/gdre_ResOther.svg-67d527b79a9c135b8e85c8ed2f5 base_scale=2.0 saturation=1.0 color_map={} +fix_alpha_border=false +premult_alpha=false compress=true diff --git a/standalone/gdre_icons/gdre_ResTB.svg.import b/standalone/gdre_icons/gdre_ResTB.svg.import index 63d82b433..206e899eb 100644 --- a/standalone/gdre_icons/gdre_ResTB.svg.import +++ b/standalone/gdre_icons/gdre_ResTB.svg.import @@ -15,4 +15,6 @@ dest_files=["res://.godot/imported/gdre_ResTB.svg-f441a2a09b3b59642aa6947531d27a base_scale=2.0 saturation=1.0 color_map={} +fix_alpha_border=false +premult_alpha=false compress=true diff --git a/standalone/gdre_icons/gdre_Script.svg.import b/standalone/gdre_icons/gdre_Script.svg.import index 3088c1361..f0a799d66 100644 --- a/standalone/gdre_icons/gdre_Script.svg.import +++ b/standalone/gdre_icons/gdre_Script.svg.import @@ -15,4 +15,6 @@ dest_files=["res://.godot/imported/gdre_Script.svg-4c68c9c5e02f5e7a41dddea59a95e base_scale=2.0 saturation=1.0 color_map={} +fix_alpha_border=false +premult_alpha=false compress=true diff --git a/standalone/gdre_icons/gdre_Search.svg.import b/standalone/gdre_icons/gdre_Search.svg.import index 9e871aa78..c5254fb7e 100644 --- a/standalone/gdre_icons/gdre_Search.svg.import +++ b/standalone/gdre_icons/gdre_Search.svg.import @@ -15,4 +15,6 @@ dest_files=["res://.godot/imported/gdre_Search.svg-db6d735e485abd390d4286d5e840e base_scale=1.0 saturation=1.0 color_map={} +fix_alpha_border=false +premult_alpha=false compress=true diff --git a/standalone/gdre_icons/gdre_Stop.svg.import b/standalone/gdre_icons/gdre_Stop.svg.import index 68e1d4e42..a93669355 100644 --- a/standalone/gdre_icons/gdre_Stop.svg.import +++ b/standalone/gdre_icons/gdre_Stop.svg.import @@ -15,4 +15,6 @@ dest_files=["res://.godot/imported/gdre_Stop.svg-5e008734a41f86d1d6dd922429f3373 base_scale=2.0 saturation=1.0 color_map={} +fix_alpha_border=false +premult_alpha=false compress=true diff --git a/standalone/gdre_icons/gdre_Translation.svg.import b/standalone/gdre_icons/gdre_Translation.svg.import index 2f6498c9b..664cfb02f 100644 --- a/standalone/gdre_icons/gdre_Translation.svg.import +++ b/standalone/gdre_icons/gdre_Translation.svg.import @@ -15,4 +15,6 @@ dest_files=["res://.godot/imported/gdre_Translation.svg-46b428564f905f308174bad7 base_scale=1.0 saturation=1.0 color_map={} +fix_alpha_border=false +premult_alpha=false compress=true