From f21e84be9176ac5cb0617722cb55d100fb7324e1 Mon Sep 17 00:00:00 2001 From: xXJSONDeruloXx Date: Thu, 24 Sep 2026 21:53:10 -0400 Subject: [PATCH] chore: remove dead code and stale comments --- .../main/cpp/framegen/VulkanRendererContext.h | 8 - app/src/main/cpp/shaders/downscale_frag.h | 133 -------------- app/src/main/cpp/shaders/window_frag.h | 49 ----- app/src/main/cpp/shaders/window_vert.h | 68 ------- app/src/main/cpp/waylandcomp/src/vk_import.c | 167 ------------------ app/src/main/cpp/waylandcomp/src/vk_import.h | 13 -- .../com/droiddeck/launcher/MainActivity.kt | 5 - .../launcher/files/FileManagerScreen.kt | 19 +- .../droiddeck/launcher/frontend/AddedGames.kt | 2 +- .../launcher/session/SessionPaths.kt | 2 - .../launcher/ui/ModeSettingsDialog.kt | 3 +- .../mipmap-anydpi-v26/ic_launcher_round.xml | 5 - app/src/main/res/values-w600dp/dimens.xml | 5 - app/src/main/res/values-w960dp/dimens.xml | 5 - app/src/main/res/values/dimens.xml | 7 - gradle.properties | 5 +- tools/release/axml_rename.py | 2 +- 17 files changed, 6 insertions(+), 492 deletions(-) delete mode 100644 app/src/main/cpp/shaders/downscale_frag.h delete mode 100644 app/src/main/cpp/shaders/window_frag.h delete mode 100644 app/src/main/cpp/shaders/window_vert.h delete mode 100644 app/src/main/cpp/waylandcomp/src/vk_import.c delete mode 100644 app/src/main/cpp/waylandcomp/src/vk_import.h delete mode 100644 app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml delete mode 100644 app/src/main/res/values-w600dp/dimens.xml delete mode 100644 app/src/main/res/values-w960dp/dimens.xml delete mode 100644 app/src/main/res/values/dimens.xml diff --git a/app/src/main/cpp/framegen/VulkanRendererContext.h b/app/src/main/cpp/framegen/VulkanRendererContext.h index 5c8b8bfdd3..cec4a4119b 100644 --- a/app/src/main/cpp/framegen/VulkanRendererContext.h +++ b/app/src/main/cpp/framegen/VulkanRendererContext.h @@ -139,8 +139,6 @@ namespace winfg { class Engine; } static constexpr uint32_t MAX_FRAMES_IN_FLIGHT = 2; -struct WindowPushConstants { float ndcX0, ndcY0, ndcX1, ndcY1; int useTexAlpha; }; - // Push-constant layouts for the spatial-upscaler post passes. The leading vec4 // `ndc` matches upscale.vert; the remaining members are read only by the // fragment stage. std430 offsets line up with these C structs. @@ -164,11 +162,6 @@ struct RcasPushConstants { // 40 bytes uint32_t con[4]; // con.x = bit-packed sharpness float outW, outH; }; -struct DownscalePushConstants { // 32 bytes - float ndc[4]; - float srcW, srcH; // render (source) resolution - float dstW, dstH; // display (output) resolution -}; // Composable post effects (AMD CAS sharpen + fake-HDR). Both lead with vec4 ndc // (offset 0) like the upscaler PCs and stay well under the 88-byte PC range. struct CasPushConstants { // 32 bytes @@ -741,7 +734,6 @@ private: NisPushConstants nisPC{}; EasuPushConstants easuPC{}; RcasPushConstants rcasPC{}; - DownscalePushConstants dsPC{}; CasPushConstants casPC{}; HdrPushConstants hdrPC{}; FxaaPushConstants fxaaPC{}; diff --git a/app/src/main/cpp/shaders/downscale_frag.h b/app/src/main/cpp/shaders/downscale_frag.h deleted file mode 100644 index 8b29ace8ae..0000000000 --- a/app/src/main/cpp/shaders/downscale_frag.h +++ /dev/null @@ -1,133 +0,0 @@ - // 1116.2.0 - #pragma once -const uint32_t downscale_code[] = { - 0x07230203,0x00010000,0x0008000b,0x000000b5,0x00000000,0x00020011,0x00000001,0x00020011, - 0x00000032,0x0006000b,0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e, - 0x00000000,0x00000001,0x0007000f,0x00000004,0x00000004,0x6e69616d,0x00000000,0x00000046, - 0x000000ab,0x00030010,0x00000004,0x00000007,0x00030003,0x00000002,0x000001c2,0x00040005, - 0x00000004,0x6e69616d,0x00000000,0x00060005,0x0000000a,0x636e616c,0x32736f7a,0x3b316628, - 0x00000000,0x00030005,0x00000009,0x00000078,0x00030005,0x0000001d,0x00007870,0x00040005, - 0x00000031,0x6c616373,0x00000065,0x00030005,0x00000033,0x00004350,0x00040006,0x00000033, - 0x00000000,0x0063646e,0x00050006,0x00000033,0x00000001,0x53637273,0x00657a69,0x00050006, - 0x00000033,0x00000002,0x53747364,0x00657a69,0x00030005,0x00000035,0x00006370,0x00050005, - 0x00000041,0x53766e69,0x656c6163,0x00000000,0x00030005,0x00000044,0x00000063,0x00060005, - 0x00000046,0x67617266,0x43786554,0x64726f6f,0x00000000,0x00040005,0x0000004d,0x65736162, - 0x00000000,0x00030005,0x00000051,0x00007a73,0x00030005,0x00000055,0x00637273,0x00030005, - 0x0000005c,0x00636361,0x00040005,0x0000005e,0x6d757377,0x00000000,0x00030005,0x00000060, - 0x00007964,0x00030005,0x0000006a,0x00007864,0x00030005,0x00000072,0x00000069,0x00030005, - 0x00000078,0x00000074,0x00030005,0x00000081,0x00000077,0x00040005,0x00000082,0x61726170, - 0x0000006d,0x00040005,0x00000088,0x61726170,0x0000006d,0x00030005,0x00000093,0x00006969, - 0x00050005,0x000000ab,0x4374756f,0x726f6c6f,0x00000000,0x00030047,0x00000033,0x00000002, - 0x00050048,0x00000033,0x00000000,0x00000023,0x00000000,0x00050048,0x00000033,0x00000001, - 0x00000023,0x00000010,0x00050048,0x00000033,0x00000002,0x00000023,0x00000018,0x00040047, - 0x00000046,0x0000001e,0x00000000,0x00040047,0x00000055,0x00000021,0x00000000,0x00040047, - 0x00000055,0x00000022,0x00000000,0x00040047,0x000000ab,0x0000001e,0x00000000,0x00020013, - 0x00000002,0x00030021,0x00000003,0x00000002,0x00030016,0x00000006,0x00000020,0x00040020, - 0x00000007,0x00000007,0x00000006,0x00040021,0x00000008,0x00000006,0x00000007,0x0004002b, - 0x00000006,0x0000000f,0x3727c5ac,0x00020014,0x00000010,0x0004002b,0x00000006,0x00000014, - 0x3f800000,0x0004002b,0x00000006,0x00000017,0x40000000,0x0004002b,0x00000006,0x0000001b, - 0x00000000,0x0004002b,0x00000006,0x0000001e,0x40490fdb,0x0004002b,0x00000006,0x00000025, - 0x3f000000,0x00040017,0x0000002f,0x00000006,0x00000002,0x00040020,0x00000030,0x00000007, - 0x0000002f,0x00040017,0x00000032,0x00000006,0x00000004,0x0005001e,0x00000033,0x00000032, - 0x0000002f,0x0000002f,0x00040020,0x00000034,0x00000009,0x00000033,0x0004003b,0x00000034, - 0x00000035,0x00000009,0x00040015,0x00000036,0x00000020,0x00000001,0x0004002b,0x00000036, - 0x00000037,0x00000001,0x00040020,0x00000038,0x00000009,0x0000002f,0x0004002b,0x00000036, - 0x0000003b,0x00000002,0x0005002c,0x0000002f,0x0000003f,0x00000014,0x00000014,0x00040020, - 0x00000045,0x00000001,0x0000002f,0x0004003b,0x00000045,0x00000046,0x00000001,0x00040017, - 0x0000004b,0x00000036,0x00000002,0x00040020,0x0000004c,0x00000007,0x0000004b,0x00090019, - 0x00000052,0x00000006,0x00000001,0x00000000,0x00000000,0x00000000,0x00000001,0x00000000, - 0x0003001b,0x00000053,0x00000052,0x00040020,0x00000054,0x00000000,0x00000053,0x0004003b, - 0x00000054,0x00000055,0x00000000,0x0004002b,0x00000036,0x00000057,0x00000000,0x00040017, - 0x0000005a,0x00000006,0x00000003,0x00040020,0x0000005b,0x00000007,0x0000005a,0x0006002c, - 0x0000005a,0x0000005d,0x0000001b,0x0000001b,0x0000001b,0x00040020,0x0000005f,0x00000007, - 0x00000036,0x0004002b,0x00000036,0x00000061,0xfffffffc,0x0004002b,0x00000036,0x00000068, - 0x00000004,0x0005002c,0x0000002f,0x0000007b,0x00000025,0x00000025,0x00040015,0x00000083, - 0x00000020,0x00000000,0x0004002b,0x00000083,0x00000084,0x00000000,0x0004002b,0x00000083, - 0x00000089,0x00000001,0x0005002c,0x0000004b,0x00000095,0x00000057,0x00000057,0x0005002c, - 0x0000004b,0x00000097,0x00000037,0x00000037,0x00040020,0x000000aa,0x00000003,0x00000032, - 0x0004003b,0x000000aa,0x000000ab,0x00000003,0x00050036,0x00000002,0x00000004,0x00000000, - 0x00000003,0x000200f8,0x00000005,0x0004003b,0x00000030,0x00000031,0x00000007,0x0004003b, - 0x00000030,0x00000041,0x00000007,0x0004003b,0x00000030,0x00000044,0x00000007,0x0004003b, - 0x0000004c,0x0000004d,0x00000007,0x0004003b,0x0000004c,0x00000051,0x00000007,0x0004003b, - 0x0000005b,0x0000005c,0x00000007,0x0004003b,0x00000007,0x0000005e,0x00000007,0x0004003b, - 0x0000005f,0x00000060,0x00000007,0x0004003b,0x0000005f,0x0000006a,0x00000007,0x0004003b, - 0x0000004c,0x00000072,0x00000007,0x0004003b,0x00000030,0x00000078,0x00000007,0x0004003b, - 0x00000007,0x00000081,0x00000007,0x0004003b,0x00000007,0x00000082,0x00000007,0x0004003b, - 0x00000007,0x00000088,0x00000007,0x0004003b,0x0000004c,0x00000093,0x00000007,0x00050041, - 0x00000038,0x00000039,0x00000035,0x00000037,0x0004003d,0x0000002f,0x0000003a,0x00000039, - 0x00050041,0x00000038,0x0000003c,0x00000035,0x0000003b,0x0004003d,0x0000002f,0x0000003d, - 0x0000003c,0x00050088,0x0000002f,0x0000003e,0x0000003a,0x0000003d,0x0007000c,0x0000002f, - 0x00000040,0x00000001,0x00000028,0x0000003e,0x0000003f,0x0003003e,0x00000031,0x00000040, - 0x0004003d,0x0000002f,0x00000042,0x00000031,0x00050088,0x0000002f,0x00000043,0x0000003f, - 0x00000042,0x0003003e,0x00000041,0x00000043,0x0004003d,0x0000002f,0x00000047,0x00000046, - 0x00050041,0x00000038,0x00000048,0x00000035,0x00000037,0x0004003d,0x0000002f,0x00000049, - 0x00000048,0x00050085,0x0000002f,0x0000004a,0x00000047,0x00000049,0x0003003e,0x00000044, - 0x0000004a,0x0004003d,0x0000002f,0x0000004e,0x00000044,0x0006000c,0x0000002f,0x0000004f, - 0x00000001,0x00000008,0x0000004e,0x0004006e,0x0000004b,0x00000050,0x0000004f,0x0003003e, - 0x0000004d,0x00000050,0x0004003d,0x00000053,0x00000056,0x00000055,0x00040064,0x00000052, - 0x00000058,0x00000056,0x00050067,0x0000004b,0x00000059,0x00000058,0x00000057,0x0003003e, - 0x00000051,0x00000059,0x0003003e,0x0000005c,0x0000005d,0x0003003e,0x0000005e,0x0000001b, - 0x0003003e,0x00000060,0x00000061,0x000200f9,0x00000062,0x000200f8,0x00000062,0x000400f6, - 0x00000064,0x00000065,0x00000000,0x000200f9,0x00000066,0x000200f8,0x00000066,0x0004003d, - 0x00000036,0x00000067,0x00000060,0x000500b3,0x00000010,0x00000069,0x00000067,0x00000068, - 0x000400fa,0x00000069,0x00000063,0x00000064,0x000200f8,0x00000063,0x0003003e,0x0000006a, - 0x00000061,0x000200f9,0x0000006b,0x000200f8,0x0000006b,0x000400f6,0x0000006d,0x0000006e, - 0x00000000,0x000200f9,0x0000006f,0x000200f8,0x0000006f,0x0004003d,0x00000036,0x00000070, - 0x0000006a,0x000500b3,0x00000010,0x00000071,0x00000070,0x00000068,0x000400fa,0x00000071, - 0x0000006c,0x0000006d,0x000200f8,0x0000006c,0x0004003d,0x0000004b,0x00000073,0x0000004d, - 0x0004003d,0x00000036,0x00000074,0x0000006a,0x0004003d,0x00000036,0x00000075,0x00000060, - 0x00050050,0x0000004b,0x00000076,0x00000074,0x00000075,0x00050080,0x0000004b,0x00000077, - 0x00000073,0x00000076,0x0003003e,0x00000072,0x00000077,0x0004003d,0x0000004b,0x00000079, - 0x00000072,0x0004006f,0x0000002f,0x0000007a,0x00000079,0x00050081,0x0000002f,0x0000007c, - 0x0000007a,0x0000007b,0x0004003d,0x0000002f,0x0000007d,0x00000044,0x00050083,0x0000002f, - 0x0000007e,0x0000007c,0x0000007d,0x0004003d,0x0000002f,0x0000007f,0x00000041,0x00050085, - 0x0000002f,0x00000080,0x0000007e,0x0000007f,0x0003003e,0x00000078,0x00000080,0x00050041, - 0x00000007,0x00000085,0x00000078,0x00000084,0x0004003d,0x00000006,0x00000086,0x00000085, - 0x0003003e,0x00000082,0x00000086,0x00050039,0x00000006,0x00000087,0x0000000a,0x00000082, - 0x00050041,0x00000007,0x0000008a,0x00000078,0x00000089,0x0004003d,0x00000006,0x0000008b, - 0x0000008a,0x0003003e,0x00000088,0x0000008b,0x00050039,0x00000006,0x0000008c,0x0000000a, - 0x00000088,0x00050085,0x00000006,0x0000008d,0x00000087,0x0000008c,0x0003003e,0x00000081, - 0x0000008d,0x0004003d,0x00000006,0x0000008e,0x00000081,0x000500b4,0x00000010,0x0000008f, - 0x0000008e,0x0000001b,0x000300f7,0x00000091,0x00000000,0x000400fa,0x0000008f,0x00000090, - 0x00000091,0x000200f8,0x00000090,0x000200f9,0x0000006e,0x000200f8,0x00000091,0x0004003d, - 0x0000004b,0x00000094,0x00000072,0x0004003d,0x0000004b,0x00000096,0x00000051,0x00050082, - 0x0000004b,0x00000098,0x00000096,0x00000097,0x0008000c,0x0000004b,0x00000099,0x00000001, - 0x0000002d,0x00000094,0x00000095,0x00000098,0x0003003e,0x00000093,0x00000099,0x0004003d, - 0x00000053,0x0000009a,0x00000055,0x0004003d,0x0000004b,0x0000009b,0x00000093,0x00040064, - 0x00000052,0x0000009c,0x0000009a,0x0007005f,0x00000032,0x0000009d,0x0000009c,0x0000009b, - 0x00000002,0x00000057,0x0008004f,0x0000005a,0x0000009e,0x0000009d,0x0000009d,0x00000000, - 0x00000001,0x00000002,0x0004003d,0x00000006,0x0000009f,0x00000081,0x0005008e,0x0000005a, - 0x000000a0,0x0000009e,0x0000009f,0x0004003d,0x0000005a,0x000000a1,0x0000005c,0x00050081, - 0x0000005a,0x000000a2,0x000000a1,0x000000a0,0x0003003e,0x0000005c,0x000000a2,0x0004003d, - 0x00000006,0x000000a3,0x00000081,0x0004003d,0x00000006,0x000000a4,0x0000005e,0x00050081, - 0x00000006,0x000000a5,0x000000a4,0x000000a3,0x0003003e,0x0000005e,0x000000a5,0x000200f9, - 0x0000006e,0x000200f8,0x0000006e,0x0004003d,0x00000036,0x000000a6,0x0000006a,0x00050080, - 0x00000036,0x000000a7,0x000000a6,0x00000037,0x0003003e,0x0000006a,0x000000a7,0x000200f9, - 0x0000006b,0x000200f8,0x0000006d,0x000200f9,0x00000065,0x000200f8,0x00000065,0x0004003d, - 0x00000036,0x000000a8,0x00000060,0x00050080,0x00000036,0x000000a9,0x000000a8,0x00000037, - 0x0003003e,0x00000060,0x000000a9,0x000200f9,0x00000062,0x000200f8,0x00000064,0x0004003d, - 0x0000005a,0x000000ac,0x0000005c,0x0004003d,0x00000006,0x000000ad,0x0000005e,0x0007000c, - 0x00000006,0x000000ae,0x00000001,0x00000028,0x000000ad,0x0000000f,0x00060050,0x0000005a, - 0x000000af,0x000000ae,0x000000ae,0x000000ae,0x00050088,0x0000005a,0x000000b0,0x000000ac, - 0x000000af,0x00050051,0x00000006,0x000000b1,0x000000b0,0x00000000,0x00050051,0x00000006, - 0x000000b2,0x000000b0,0x00000001,0x00050051,0x00000006,0x000000b3,0x000000b0,0x00000002, - 0x00070050,0x00000032,0x000000b4,0x000000b1,0x000000b2,0x000000b3,0x00000014,0x0003003e, - 0x000000ab,0x000000b4,0x000100fd,0x00010038,0x00050036,0x00000006,0x0000000a,0x00000000, - 0x00000008,0x00030037,0x00000007,0x00000009,0x000200f8,0x0000000b,0x0004003b,0x00000007, - 0x0000001d,0x00000007,0x0004003d,0x00000006,0x0000000c,0x00000009,0x0006000c,0x00000006, - 0x0000000d,0x00000001,0x00000004,0x0000000c,0x0003003e,0x00000009,0x0000000d,0x0004003d, - 0x00000006,0x0000000e,0x00000009,0x000500b8,0x00000010,0x00000011,0x0000000e,0x0000000f, - 0x000300f7,0x00000013,0x00000000,0x000400fa,0x00000011,0x00000012,0x00000013,0x000200f8, - 0x00000012,0x000200fe,0x00000014,0x000200f8,0x00000013,0x0004003d,0x00000006,0x00000016, - 0x00000009,0x000500be,0x00000010,0x00000018,0x00000016,0x00000017,0x000300f7,0x0000001a, - 0x00000000,0x000400fa,0x00000018,0x00000019,0x0000001a,0x000200f8,0x00000019,0x000200fe, - 0x0000001b,0x000200f8,0x0000001a,0x0004003d,0x00000006,0x0000001f,0x00000009,0x00050085, - 0x00000006,0x00000020,0x0000001e,0x0000001f,0x0003003e,0x0000001d,0x00000020,0x0004003d, - 0x00000006,0x00000021,0x0000001d,0x0006000c,0x00000006,0x00000022,0x00000001,0x0000000d, - 0x00000021,0x00050085,0x00000006,0x00000023,0x00000017,0x00000022,0x0004003d,0x00000006, - 0x00000024,0x0000001d,0x00050085,0x00000006,0x00000026,0x00000024,0x00000025,0x0006000c, - 0x00000006,0x00000027,0x00000001,0x0000000d,0x00000026,0x00050085,0x00000006,0x00000028, - 0x00000023,0x00000027,0x0004003d,0x00000006,0x00000029,0x0000001d,0x0004003d,0x00000006, - 0x0000002a,0x0000001d,0x00050085,0x00000006,0x0000002b,0x00000029,0x0000002a,0x00050088, - 0x00000006,0x0000002c,0x00000028,0x0000002b,0x000200fe,0x0000002c,0x00010038 -}; diff --git a/app/src/main/cpp/shaders/window_frag.h b/app/src/main/cpp/shaders/window_frag.h deleted file mode 100644 index 78d7e5848b..0000000000 --- a/app/src/main/cpp/shaders/window_frag.h +++ /dev/null @@ -1,49 +0,0 @@ - // 1116.3.0 - #pragma once -const uint32_t window_frag_code[] = { - 0x07230203,0x00010000,0x0008000b,0x00000033,0x00000000,0x00020011,0x00000001,0x0006000b, - 0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001, - 0x0007000f,0x00000004,0x00000004,0x6e69616d,0x00000000,0x00000011,0x00000015,0x00030010, - 0x00000004,0x00000007,0x00030003,0x00000002,0x000001c2,0x00040005,0x00000004,0x6e69616d, - 0x00000000,0x00030005,0x00000009,0x00000063,0x00050005,0x0000000d,0x53786574,0x6c706d61, - 0x00007265,0x00060005,0x00000011,0x67617266,0x43786554,0x64726f6f,0x00000000,0x00050005, - 0x00000015,0x4374756f,0x726f6c6f,0x00000000,0x00030005,0x0000001a,0x00004350,0x00050006, - 0x0000001a,0x00000000,0x5863646e,0x00000030,0x00050006,0x0000001a,0x00000001,0x5963646e, - 0x00000030,0x00050006,0x0000001a,0x00000002,0x5863646e,0x00000031,0x00050006,0x0000001a, - 0x00000003,0x5963646e,0x00000031,0x00060006,0x0000001a,0x00000004,0x54657375,0x6c417865, - 0x00616870,0x00030005,0x0000001c,0x00006370,0x00040047,0x0000000d,0x00000021,0x00000000, - 0x00040047,0x0000000d,0x00000022,0x00000000,0x00040047,0x00000011,0x0000001e,0x00000000, - 0x00040047,0x00000015,0x0000001e,0x00000000,0x00030047,0x0000001a,0x00000002,0x00050048, - 0x0000001a,0x00000000,0x00000023,0x00000000,0x00050048,0x0000001a,0x00000001,0x00000023, - 0x00000004,0x00050048,0x0000001a,0x00000002,0x00000023,0x00000008,0x00050048,0x0000001a, - 0x00000003,0x00000023,0x0000000c,0x00050048,0x0000001a,0x00000004,0x00000023,0x00000010, - 0x00020013,0x00000002,0x00030021,0x00000003,0x00000002,0x00030016,0x00000006,0x00000020, - 0x00040017,0x00000007,0x00000006,0x00000004,0x00040020,0x00000008,0x00000007,0x00000007, - 0x00090019,0x0000000a,0x00000006,0x00000001,0x00000000,0x00000000,0x00000000,0x00000001, - 0x00000000,0x0003001b,0x0000000b,0x0000000a,0x00040020,0x0000000c,0x00000000,0x0000000b, - 0x0004003b,0x0000000c,0x0000000d,0x00000000,0x00040017,0x0000000f,0x00000006,0x00000002, - 0x00040020,0x00000010,0x00000001,0x0000000f,0x0004003b,0x00000010,0x00000011,0x00000001, - 0x00040020,0x00000014,0x00000003,0x00000007,0x0004003b,0x00000014,0x00000015,0x00000003, - 0x00040017,0x00000016,0x00000006,0x00000003,0x00040015,0x00000019,0x00000020,0x00000001, - 0x0007001e,0x0000001a,0x00000006,0x00000006,0x00000006,0x00000006,0x00000019,0x00040020, - 0x0000001b,0x00000009,0x0000001a,0x0004003b,0x0000001b,0x0000001c,0x00000009,0x0004002b, - 0x00000019,0x0000001d,0x00000004,0x00040020,0x0000001e,0x00000009,0x00000019,0x0004002b, - 0x00000019,0x00000021,0x00000000,0x00020014,0x00000022,0x00040020,0x00000024,0x00000007, - 0x00000006,0x00040015,0x00000028,0x00000020,0x00000000,0x0004002b,0x00000028,0x00000029, - 0x00000003,0x0004002b,0x00000006,0x0000002d,0x3f800000,0x00050036,0x00000002,0x00000004, - 0x00000000,0x00000003,0x000200f8,0x00000005,0x0004003b,0x00000008,0x00000009,0x00000007, - 0x0004003b,0x00000024,0x00000025,0x00000007,0x0004003d,0x0000000b,0x0000000e,0x0000000d, - 0x0004003d,0x0000000f,0x00000012,0x00000011,0x00050057,0x00000007,0x00000013,0x0000000e, - 0x00000012,0x0003003e,0x00000009,0x00000013,0x0004003d,0x00000007,0x00000017,0x00000009, - 0x0008004f,0x00000016,0x00000018,0x00000017,0x00000017,0x00000000,0x00000001,0x00000002, - 0x00050041,0x0000001e,0x0000001f,0x0000001c,0x0000001d,0x0004003d,0x00000019,0x00000020, - 0x0000001f,0x000500ab,0x00000022,0x00000023,0x00000020,0x00000021,0x000300f7,0x00000027, - 0x00000000,0x000400fa,0x00000023,0x00000026,0x0000002c,0x000200f8,0x00000026,0x00050041, - 0x00000024,0x0000002a,0x00000009,0x00000029,0x0004003d,0x00000006,0x0000002b,0x0000002a, - 0x0003003e,0x00000025,0x0000002b,0x000200f9,0x00000027,0x000200f8,0x0000002c,0x0003003e, - 0x00000025,0x0000002d,0x000200f9,0x00000027,0x000200f8,0x00000027,0x0004003d,0x00000006, - 0x0000002e,0x00000025,0x00050051,0x00000006,0x0000002f,0x00000018,0x00000000,0x00050051, - 0x00000006,0x00000030,0x00000018,0x00000001,0x00050051,0x00000006,0x00000031,0x00000018, - 0x00000002,0x00070050,0x00000007,0x00000032,0x0000002f,0x00000030,0x00000031,0x0000002e, - 0x0003003e,0x00000015,0x00000032,0x000100fd,0x00010038 -}; diff --git a/app/src/main/cpp/shaders/window_vert.h b/app/src/main/cpp/shaders/window_vert.h deleted file mode 100644 index 8c991104f9..0000000000 --- a/app/src/main/cpp/shaders/window_vert.h +++ /dev/null @@ -1,68 +0,0 @@ - // 1116.3.0 - #pragma once -const uint32_t window_vert_code[] = { - 0x07230203,0x00010000,0x0008000b,0x0000004a,0x00000000,0x00020011,0x00000001,0x0006000b, - 0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001, - 0x0008000f,0x00000000,0x00000004,0x6e69616d,0x00000000,0x0000000a,0x0000003a,0x00000044, - 0x00030003,0x00000002,0x000001c2,0x00040005,0x00000004,0x6e69616d,0x00000000,0x00030005, - 0x00000008,0x00006978,0x00060005,0x0000000a,0x565f6c67,0x65747265,0x646e4978,0x00007865, - 0x00030005,0x0000000f,0x00006979,0x00030005,0x00000014,0x00000078,0x00030005,0x0000001b, - 0x00004350,0x00050006,0x0000001b,0x00000000,0x5863646e,0x00000030,0x00050006,0x0000001b, - 0x00000001,0x5963646e,0x00000030,0x00050006,0x0000001b,0x00000002,0x5863646e,0x00000031, - 0x00050006,0x0000001b,0x00000003,0x5963646e,0x00000031,0x00030005,0x0000001d,0x00006370, - 0x00030005,0x00000027,0x00000079,0x00060005,0x00000038,0x505f6c67,0x65567265,0x78657472, - 0x00000000,0x00060006,0x00000038,0x00000000,0x505f6c67,0x7469736f,0x006e6f69,0x00070006, - 0x00000038,0x00000001,0x505f6c67,0x746e696f,0x657a6953,0x00000000,0x00070006,0x00000038, - 0x00000002,0x435f6c67,0x4470696c,0x61747369,0x0065636e,0x00070006,0x00000038,0x00000003, - 0x435f6c67,0x446c6c75,0x61747369,0x0065636e,0x00030005,0x0000003a,0x00000000,0x00060005, - 0x00000044,0x67617266,0x43786554,0x64726f6f,0x00000000,0x00040047,0x0000000a,0x0000000b, - 0x0000002a,0x00030047,0x0000001b,0x00000002,0x00050048,0x0000001b,0x00000000,0x00000023, - 0x00000000,0x00050048,0x0000001b,0x00000001,0x00000023,0x00000004,0x00050048,0x0000001b, - 0x00000002,0x00000023,0x00000008,0x00050048,0x0000001b,0x00000003,0x00000023,0x0000000c, - 0x00030047,0x00000038,0x00000002,0x00050048,0x00000038,0x00000000,0x0000000b,0x00000000, - 0x00050048,0x00000038,0x00000001,0x0000000b,0x00000001,0x00050048,0x00000038,0x00000002, - 0x0000000b,0x00000003,0x00050048,0x00000038,0x00000003,0x0000000b,0x00000004,0x00040047, - 0x00000044,0x0000001e,0x00000000,0x00020013,0x00000002,0x00030021,0x00000003,0x00000002, - 0x00040015,0x00000006,0x00000020,0x00000001,0x00040020,0x00000007,0x00000007,0x00000006, - 0x00040020,0x00000009,0x00000001,0x00000006,0x0004003b,0x00000009,0x0000000a,0x00000001, - 0x0004002b,0x00000006,0x0000000c,0x00000001,0x00030016,0x00000012,0x00000020,0x00040020, - 0x00000013,0x00000007,0x00000012,0x00020014,0x00000016,0x0006001e,0x0000001b,0x00000012, - 0x00000012,0x00000012,0x00000012,0x00040020,0x0000001c,0x00000009,0x0000001b,0x0004003b, - 0x0000001c,0x0000001d,0x00000009,0x0004002b,0x00000006,0x0000001e,0x00000002,0x00040020, - 0x0000001f,0x00000009,0x00000012,0x0004002b,0x00000006,0x00000023,0x00000000,0x0004002b, - 0x00000006,0x0000002d,0x00000003,0x00040017,0x00000034,0x00000012,0x00000004,0x00040015, - 0x00000035,0x00000020,0x00000000,0x0004002b,0x00000035,0x00000036,0x00000001,0x0004001c, - 0x00000037,0x00000012,0x00000036,0x0006001e,0x00000038,0x00000034,0x00000012,0x00000037, - 0x00000037,0x00040020,0x00000039,0x00000003,0x00000038,0x0004003b,0x00000039,0x0000003a, - 0x00000003,0x0004002b,0x00000012,0x0000003d,0x00000000,0x0004002b,0x00000012,0x0000003e, - 0x3f800000,0x00040020,0x00000040,0x00000003,0x00000034,0x00040017,0x00000042,0x00000012, - 0x00000002,0x00040020,0x00000043,0x00000003,0x00000042,0x0004003b,0x00000043,0x00000044, - 0x00000003,0x00050036,0x00000002,0x00000004,0x00000000,0x00000003,0x000200f8,0x00000005, - 0x0004003b,0x00000007,0x00000008,0x00000007,0x0004003b,0x00000007,0x0000000f,0x00000007, - 0x0004003b,0x00000013,0x00000014,0x00000007,0x0004003b,0x00000013,0x00000018,0x00000007, - 0x0004003b,0x00000013,0x00000027,0x00000007,0x0004003b,0x00000013,0x0000002a,0x00000007, - 0x0004003d,0x00000006,0x0000000b,0x0000000a,0x000500c3,0x00000006,0x0000000d,0x0000000b, - 0x0000000c,0x000500c7,0x00000006,0x0000000e,0x0000000d,0x0000000c,0x0003003e,0x00000008, - 0x0000000e,0x0004003d,0x00000006,0x00000010,0x0000000a,0x000500c7,0x00000006,0x00000011, - 0x00000010,0x0000000c,0x0003003e,0x0000000f,0x00000011,0x0004003d,0x00000006,0x00000015, - 0x00000008,0x000500aa,0x00000016,0x00000017,0x00000015,0x0000000c,0x000300f7,0x0000001a, - 0x00000000,0x000400fa,0x00000017,0x00000019,0x00000022,0x000200f8,0x00000019,0x00050041, - 0x0000001f,0x00000020,0x0000001d,0x0000001e,0x0004003d,0x00000012,0x00000021,0x00000020, - 0x0003003e,0x00000018,0x00000021,0x000200f9,0x0000001a,0x000200f8,0x00000022,0x00050041, - 0x0000001f,0x00000024,0x0000001d,0x00000023,0x0004003d,0x00000012,0x00000025,0x00000024, - 0x0003003e,0x00000018,0x00000025,0x000200f9,0x0000001a,0x000200f8,0x0000001a,0x0004003d, - 0x00000012,0x00000026,0x00000018,0x0003003e,0x00000014,0x00000026,0x0004003d,0x00000006, - 0x00000028,0x0000000f,0x000500aa,0x00000016,0x00000029,0x00000028,0x0000000c,0x000300f7, - 0x0000002c,0x00000000,0x000400fa,0x00000029,0x0000002b,0x00000030,0x000200f8,0x0000002b, - 0x00050041,0x0000001f,0x0000002e,0x0000001d,0x0000002d,0x0004003d,0x00000012,0x0000002f, - 0x0000002e,0x0003003e,0x0000002a,0x0000002f,0x000200f9,0x0000002c,0x000200f8,0x00000030, - 0x00050041,0x0000001f,0x00000031,0x0000001d,0x0000000c,0x0004003d,0x00000012,0x00000032, - 0x00000031,0x0003003e,0x0000002a,0x00000032,0x000200f9,0x0000002c,0x000200f8,0x0000002c, - 0x0004003d,0x00000012,0x00000033,0x0000002a,0x0003003e,0x00000027,0x00000033,0x0004003d, - 0x00000012,0x0000003b,0x00000014,0x0004003d,0x00000012,0x0000003c,0x00000027,0x00070050, - 0x00000034,0x0000003f,0x0000003b,0x0000003c,0x0000003d,0x0000003e,0x00050041,0x00000040, - 0x00000041,0x0000003a,0x00000023,0x0003003e,0x00000041,0x0000003f,0x0004003d,0x00000006, - 0x00000045,0x00000008,0x0004006f,0x00000012,0x00000046,0x00000045,0x0004003d,0x00000006, - 0x00000047,0x0000000f,0x0004006f,0x00000012,0x00000048,0x00000047,0x00050050,0x00000042, - 0x00000049,0x00000046,0x00000048,0x0003003e,0x00000044,0x00000049,0x000100fd,0x00010038 -}; diff --git a/app/src/main/cpp/waylandcomp/src/vk_import.c b/app/src/main/cpp/waylandcomp/src/vk_import.c deleted file mode 100644 index 08c1351a36..0000000000 --- a/app/src/main/cpp/waylandcomp/src/vk_import.c +++ /dev/null @@ -1,167 +0,0 @@ -/* Compositor-side dmabuf import into Turnip (see vk_import.h). */ -#define _POSIX_C_SOURCE 200809L -#include "vk_import.h" -#include -#include -#include -#include -#include - -#define MOD_INVALID 0x00ffffffffffffffULL - -static int g_ready = -1; /* -1 = untried, 0 = ok, 1 = init failed */ -static VkInstance g_inst; -static VkPhysicalDevice g_pd; -static VkDevice g_dev; -static PFN_vkGetMemoryFdPropertiesKHR p_getMemFdProps; - -static int has_ext(VkExtensionProperties *e, uint32_t n, const char *name) { - for (uint32_t i = 0; i < n; i++) - if (!strcmp(e[i].extensionName, name)) return 1; - return 0; -} - -static int vk_init(void) { - if (g_ready >= 0) return g_ready == 0 ? 0 : -1; - - VkApplicationInfo app = {.sType = VK_STRUCTURE_TYPE_APPLICATION_INFO, - .pApplicationName = "spike-compositor-import", - .apiVersion = VK_API_VERSION_1_1}; - VkInstanceCreateInfo ici = {.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO, - .pApplicationInfo = &app}; - if (vkCreateInstance(&ici, NULL, &g_inst) != VK_SUCCESS) { - fprintf(stderr, "[imp] vkCreateInstance failed\n"); - g_ready = 1; return -1; - } - uint32_t npd = 0; - vkEnumeratePhysicalDevices(g_inst, &npd, NULL); - if (!npd) { g_ready = 1; return -1; } - VkPhysicalDevice pds[8]; - if (npd > 8) npd = 8; - vkEnumeratePhysicalDevices(g_inst, &npd, pds); - g_pd = pds[0]; /* Turnip is forced via VK_ICD_FILENAMES */ - - const char *want[] = {"VK_KHR_external_memory_fd", - "VK_EXT_external_memory_dma_buf", - "VK_EXT_image_drm_format_modifier", - "VK_KHR_image_format_list"}; - uint32_t ne = 0; - vkEnumerateDeviceExtensionProperties(g_pd, NULL, &ne, NULL); - VkExtensionProperties *exts = calloc(ne, sizeof(*exts)); - vkEnumerateDeviceExtensionProperties(g_pd, NULL, &ne, exts); - for (unsigned i = 0; i < 4; i++) - if (!has_ext(exts, ne, want[i])) - fprintf(stderr, "[imp] WARNING device missing %s\n", want[i]); - free(exts); - - float prio = 1.0f; - VkDeviceQueueCreateInfo qci = {.sType = VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO, - .queueFamilyIndex = 0, .queueCount = 1, - .pQueuePriorities = &prio}; - VkDeviceCreateInfo dci = {.sType = VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO, - .queueCreateInfoCount = 1, .pQueueCreateInfos = &qci, - .enabledExtensionCount = 4, .ppEnabledExtensionNames = want}; - if (vkCreateDevice(g_pd, &dci, NULL, &g_dev) != VK_SUCCESS) { - fprintf(stderr, "[imp] vkCreateDevice failed\n"); - g_ready = 1; return -1; - } - p_getMemFdProps = (PFN_vkGetMemoryFdPropertiesKHR)vkGetDeviceProcAddr( - g_dev, "vkGetMemoryFdPropertiesKHR"); - g_ready = 0; - fprintf(stderr, "[imp] Vulkan import device ready (Turnip)\n"); - return 0; -} - -static VkFormat drm_to_vk(uint32_t drm) { - /* XR24/AR24 (XRGB/ARGB8888, little-endian bytes B,G,R,X) -> BGRA8. */ - return VK_FORMAT_B8G8R8A8_UNORM; -} - -int vk_import_dmabuf(int fd, uint32_t drm_format, uint64_t modifier, int w, int h, - uint32_t stride, uint32_t offset) { - if (modifier == MOD_INVALID) { - fprintf(stderr, "[imp] skip: INVALID modifier (needs implicit path)\n"); - return -1; - } - if (vk_init() != 0) return -1; - - VkSubresourceLayout plane = {.offset = offset, .rowPitch = stride}; - VkImageDrmFormatModifierExplicitCreateInfoEXT modInfo = { - .sType = VK_STRUCTURE_TYPE_IMAGE_DRM_FORMAT_MODIFIER_EXPLICIT_CREATE_INFO_EXT, - .drmFormatModifier = modifier, - .drmFormatModifierPlaneCount = 1, - .pPlaneLayouts = &plane}; - VkExternalMemoryImageCreateInfo extImg = { - .sType = VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_IMAGE_CREATE_INFO, - .pNext = &modInfo, - .handleTypes = VK_EXTERNAL_MEMORY_HANDLE_TYPE_DMA_BUF_BIT_EXT}; - VkImageCreateInfo ici = { - .sType = VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO, - .pNext = &extImg, - .imageType = VK_IMAGE_TYPE_2D, - .format = drm_to_vk(drm_format), - .extent = {w, h, 1}, - .mipLevels = 1, .arrayLayers = 1, .samples = VK_SAMPLE_COUNT_1_BIT, - .tiling = VK_IMAGE_TILING_DRM_FORMAT_MODIFIER_EXT, - .usage = VK_IMAGE_USAGE_TRANSFER_SRC_BIT | VK_IMAGE_USAGE_SAMPLED_BIT, - .sharingMode = VK_SHARING_MODE_EXCLUSIVE, - .initialLayout = VK_IMAGE_LAYOUT_UNDEFINED}; - VkImage image; - VkResult r = vkCreateImage(g_dev, &ici, NULL, &image); - if (r != VK_SUCCESS) { - fprintf(stderr, "[imp] vkCreateImage(drm_modifier) -> %d\n", r); - return -1; - } - - int dupfd = dup(fd); - uint32_t allowed_types = 0xffffffff; - if (p_getMemFdProps) { - VkMemoryFdPropertiesKHR fp = {.sType = VK_STRUCTURE_TYPE_MEMORY_FD_PROPERTIES_KHR}; - if (p_getMemFdProps(g_dev, VK_EXTERNAL_MEMORY_HANDLE_TYPE_DMA_BUF_BIT_EXT, - dupfd, &fp) == VK_SUCCESS) - allowed_types = fp.memoryTypeBits; - } - VkMemoryRequirements req; - vkGetImageMemoryRequirements(g_dev, image, &req); - uint32_t bits = req.memoryTypeBits & allowed_types; - int type_idx = -1; - for (int i = 0; i < 32; i++) - if (bits & (1u << i)) { type_idx = i; break; } - if (type_idx < 0) { - fprintf(stderr, "[imp] no compatible memory type\n"); - vkDestroyImage(g_dev, image, NULL); close(dupfd); return -1; - } - - VkImportMemoryFdInfoKHR imp = { - .sType = VK_STRUCTURE_TYPE_IMPORT_MEMORY_FD_INFO_KHR, - .handleType = VK_EXTERNAL_MEMORY_HANDLE_TYPE_DMA_BUF_BIT_EXT, - .fd = dupfd}; - VkMemoryDedicatedAllocateInfo ded = { - .sType = VK_STRUCTURE_TYPE_MEMORY_DEDICATED_ALLOCATE_INFO, - .pNext = &imp, .image = image}; - VkMemoryAllocateInfo mai = {.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO, - .pNext = &ded, - .allocationSize = req.size, - .memoryTypeIndex = (uint32_t)type_idx}; - VkDeviceMemory mem; - r = vkAllocateMemory(g_dev, &mai, NULL, &mem); - if (r != VK_SUCCESS) { - fprintf(stderr, "[imp] vkAllocateMemory(import fd) -> %d\n", r); - vkDestroyImage(g_dev, image, NULL); close(dupfd); return -1; - } - r = vkBindImageMemory(g_dev, image, mem, 0); - if (r != VK_SUCCESS) { - fprintf(stderr, "[imp] vkBindImageMemory -> %d\n", r); - vkFreeMemory(g_dev, mem, NULL); vkDestroyImage(g_dev, image, NULL); - return -1; - } - - fprintf(stderr, - "[imp] *** IMPORTED dmabuf -> VkImage OK (memType %d, size %llu) " - "==> compositor can turn game frames into VkImages\n", - type_idx, (unsigned long long)req.size); - /* import took ownership of dupfd; free our objects */ - vkFreeMemory(g_dev, mem, NULL); - vkDestroyImage(g_dev, image, NULL); - return 0; -} diff --git a/app/src/main/cpp/waylandcomp/src/vk_import.h b/app/src/main/cpp/waylandcomp/src/vk_import.h deleted file mode 100644 index b333e6db9c..0000000000 --- a/app/src/main/cpp/waylandcomp/src/vk_import.h +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef VK_IMPORT_H -#define VK_IMPORT_H -#include -/* - * Import a received dmabuf into the compositor's own Vulkan (Turnip) device as a - * VkImage and bind its memory. This is the M4-import de-risk: if we can import + - * bind, sampling/blitting it to screen is standard Vulkan. Non-fatal: returns 0 - * on success, negative on failure, and logs details. Does NOT consume `fd` - * (dups internally). - */ -int vk_import_dmabuf(int fd, uint32_t drm_format, uint64_t modifier, - int w, int h, uint32_t stride, uint32_t offset); -#endif diff --git a/app/src/main/java/com/droiddeck/launcher/MainActivity.kt b/app/src/main/java/com/droiddeck/launcher/MainActivity.kt index 1d50ac50ad..ffff41c9ec 100644 --- a/app/src/main/java/com/droiddeck/launcher/MainActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/MainActivity.kt @@ -82,7 +82,6 @@ class MainActivity : ComponentActivity() { private var glThread by mutableStateOf(true) private var noGlError by mutableStateOf(true) private var steamDeckMode by mutableStateOf(false) - private var showFrameGen by mutableStateOf(false) private var showCredits by mutableStateOf(false) private var showProtons by mutableStateOf(false) private var catalog by mutableStateOf?>(null) @@ -552,9 +551,6 @@ class MainActivity : ComponentActivity() { }, "remove-pkg").start() } - /** Both driver lists as the dialog shows them, re-read from disk so an import or removal shows at once. */ - /** Everything the mode's cog shows, read fresh, then the dialog. */ - /** The Steam or Desktop settings page, in the front end's pane. */ @Composable private fun ModeSettingsHost(mode: String) { ModeSettingsPage( @@ -636,7 +632,6 @@ class MainActivity : ComponentActivity() { ) } - /** The Performance page, in the front end's pane. */ @Composable private fun PerformanceHost() { PerformancePage( diff --git a/app/src/main/java/com/droiddeck/launcher/files/FileManagerScreen.kt b/app/src/main/java/com/droiddeck/launcher/files/FileManagerScreen.kt index fda38ed8ef..6442e656bd 100644 --- a/app/src/main/java/com/droiddeck/launcher/files/FileManagerScreen.kt +++ b/app/src/main/java/com/droiddeck/launcher/files/FileManagerScreen.kt @@ -98,7 +98,6 @@ import androidx.compose.ui.draw.clip import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.ImageBitmap import androidx.compose.ui.graphics.asImageBitmap -import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.input.nestedscroll.nestedScroll import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.graphics.vector.rememberVectorPainter @@ -143,10 +142,6 @@ import java.util.Locale */ enum class ConflictChoice { OVERWRITE, MERGE, KEEP_BOTH, SKIP } -/** - * Ordering for the file list. Folders always lead regardless of direction - a descending sort that - * buries every folder under the files is never what someone means by "Z to A". - */ /** * Shortens a path from the LEFT, keeping whole segments. * @@ -164,6 +159,7 @@ private fun elidePathStart(path: String, max: Int): String { return if (out.isEmpty()) "…" + path.takeLast(max - 1) else "…$out" } +/** Folder-first ordering stays fixed across both sort directions. */ private fun comparatorFor(sortBy: String, desc: Boolean): Comparator { val inner: Comparator = when (sortBy) { "date" -> compareBy { it.lastModified() } @@ -176,17 +172,9 @@ private fun comparatorFor(sortBy: String, desc: Boolean): Comparator { return compareBy { if (it.isDirectory) 0 else 1 }.then(directed) } -private val FileTypeIcon: Map = mapOf( - "folder" to Icons.Filled.Folder, -) - // Image extensions that get a real thumbnail (via Coil) instead of the generic file icon. private val IMAGE_THUMB_EXTS = setOf("jpg", "jpeg", "png", "webp", "bmp", "gif") -// Color-only sweep: the former card-fill / card-stroke / divider / icon-blue / icon-white -// constants were rerouted onto MaterialTheme.colorScheme tokens (surface / outline / primary / -// onSurface) at their use sites so a theme preset/accent recolors them. - // True when [child] is [ancestor] itself or lives anywhere inside it. private fun isWithin(child: File, ancestor: File): Boolean { val c = runCatching { child.canonicalPath }.getOrDefault(child.absolutePath) @@ -937,8 +925,7 @@ fun FileManagerScreen( } if (!showFavorites) { - // New Folder moved off a bottom bar into the toolbar (next to the grid/list toggle), - // as a compact outlined button, so the file list reclaims that bottom strip. + // Keep New Folder in the toolbar so the file list uses the full height. if (!pickMode) { OutlinedButton( onClick = { showNewFolderDialog = true }, @@ -1425,7 +1412,6 @@ fun FileManagerScreen( } } // end content Box (beside the rail) } // end rail + content Row - // (New Folder moved into the top toolbar; the bottom bar was removed to reclaim its strip.) } } @@ -1447,7 +1433,6 @@ private fun FileContextMenuItems( onDismissMenu: () -> Unit, ) { val isDir = file.isDirectory - // Enter multi-select on this item (replaces the old long-press-only entry point). DropdownMenuItem( text = { Text("Select") }, leadingIcon = { Icon(Icons.Filled.Checklist, null, tint = MaterialTheme.colorScheme.primary) }, diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/AddedGames.kt b/app/src/main/java/com/droiddeck/launcher/frontend/AddedGames.kt index 4f78634a41..bd5a759832 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/AddedGames.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/AddedGames.kt @@ -56,10 +56,10 @@ object AddedGames { "|.*installer.*|.*uninstall.*|.*updater?.*|.*config(ur.*)?|.*settings.*|.*editor.*|.*server.*|.*benchmark.*|.*helper.*|.*eac.*|.*easyanticheat.*|.*battleye.*)\\.exe$", ) - /** Where a host path appears inside the session, or null when the session cannot see it. */ /** Under here the chosen Games folders are bound inside the session, one each. */ const val GUEST_DIR = "/root/Games" + /** Where a host path appears inside the session, or null when the session cannot see it. */ fun guestPath(context: Context, host: File): String? { val path = host.absolutePath // The Games folders are bound on their own, so a folder anywhere - an SD card, a USB diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionPaths.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionPaths.kt index 0ae1ffb987..68570c8482 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPaths.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPaths.kt @@ -48,7 +48,6 @@ object SessionPaths { return made } - /** The current session's folder, or null between sessions. */ fun current(): File? = dir /** @@ -63,7 +62,6 @@ object SessionPaths { return ended } - /** A file in the current session's folder, or null between sessions. */ fun file(name: String): File? = dir?.let { File(it, name) } /** Let the next session claim a new folder. Called when a session ends. */ diff --git a/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt b/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt index 6eb2cc913d..9c964a0f5b 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt @@ -59,8 +59,7 @@ class ModeSettings( val forceFullscreen: Boolean? = null, /** Steam only: the client branch forced on the command line. */ val steamChannel: String? = null, - /** Steam only: the user's own games folder and what was found in it. */ - /** The chosen Games folders (null = not a Steam page). */ + /** Steam only: the user's chosen Games folders; null outside Steam. */ val addedGamesDirs: List? = null, val addedGames: List = emptyList(), val addedGamesArt: Boolean = true, diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml deleted file mode 100644 index 8ae0e29615..0000000000 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/app/src/main/res/values-w600dp/dimens.xml b/app/src/main/res/values-w600dp/dimens.xml deleted file mode 100644 index a00eee9b6d..0000000000 --- a/app/src/main/res/values-w600dp/dimens.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - 96dp - 80dp - diff --git a/app/src/main/res/values-w960dp/dimens.xml b/app/src/main/res/values-w960dp/dimens.xml deleted file mode 100644 index 6f48fecf82..0000000000 --- a/app/src/main/res/values-w960dp/dimens.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - 240dp - 88dp - diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml deleted file mode 100644 index a338b94685..0000000000 --- a/app/src/main/res/values/dimens.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - 24dp - 72dp - diff --git a/gradle.properties b/gradle.properties index 58de70a521..68abc99e09 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,8 +1,5 @@ org.gradle.jvmargs=-Xmx4096m -Dfile.encoding=UTF-8 -# CI is the only thing that builds this repo and its minutes are billed, so every cache Gradle -# offers is on: task outputs are reused across runs from the cache the CI action restores, the -# configuration phase is skipped when nothing about the build scripts changed, and independent -# tasks run together. +# Reuse task outputs, skip unchanged configuration, and run independent tasks in parallel. org.gradle.caching=true org.gradle.configuration-cache=true org.gradle.parallel=true diff --git a/tools/release/axml_rename.py b/tools/release/axml_rename.py index ec553a12c7..92da2753af 100644 --- a/tools/release/axml_rename.py +++ b/tools/release/axml_rename.py @@ -20,7 +20,7 @@ def enc_len16(n): return struct.pack('> 16), n & 0xffff) def rewrite(axml, repl): - ftype, fhs, fsize = struct.unpack_from('