diff --git a/anda/games/gamescope/0001-cstdint.patch b/anda/games/gamescope/0001-cstdint.patch new file mode 100644 index 0000000000..36a9ad59f2 --- /dev/null +++ b/anda/games/gamescope/0001-cstdint.patch @@ -0,0 +1,36 @@ +From 5529e8ac8f3232ec6233e33286834548e1d8018d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= +Date: Sun, 8 Oct 2023 22:10:33 +0200 +Subject: [PATCH] + +--- + src/reshade/source/effect_parser_stmt.cpp | 1 + + src/reshade/source/effect_token.hpp | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/src/reshade/source/effect_parser_stmt.cpp b/src/reshade/source/effect_parser_stmt.cpp +index 7829729..f126be2 100644 +--- a/src/reshade/source/effect_parser_stmt.cpp ++++ b/src/reshade/source/effect_parser_stmt.cpp +@@ -9,6 +9,7 @@ + #include // std::toupper + #include + #include ++#include + #include + + struct on_scope_exit +diff --git a/src/reshade/source/effect_token.hpp b/src/reshade/source/effect_token.hpp +index 072d439..e4bb633 100644 +--- a/src/reshade/source/effect_token.hpp ++++ b/src/reshade/source/effect_token.hpp +@@ -5,6 +5,7 @@ + + #pragma once + ++#include + #include + #include + +-- +2.41.0 diff --git a/anda/games/gamescope/0001-limits.patch b/anda/games/gamescope/0001-limits.patch new file mode 100644 index 0000000000..0b78aafea4 --- /dev/null +++ b/anda/games/gamescope/0001-limits.patch @@ -0,0 +1,21 @@ +From 88ce1e5de62886aa14c74421cde6130e16e70d7d Mon Sep 17 00:00:00 2001 +From: psykose +Date: Sat, 6 Jul 2024 20:52:50 +0200 +Subject: [PATCH] utils: include limits.h for PATH_MAX + +--- + src/Utils/Process.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/Utils/Process.cpp b/src/Utils/Process.cpp +index e71786f75..3e748e0d3 100644 +--- a/src/Utils/Process.cpp ++++ b/src/Utils/Process.cpp +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + #include + #include + #include \ No newline at end of file diff --git a/anda/games/gamescope/1231.patch b/anda/games/gamescope/1231.patch deleted file mode 100644 index e21cb0a8ea..0000000000 --- a/anda/games/gamescope/1231.patch +++ /dev/null @@ -1,239 +0,0 @@ -From ab115896be1a448bde0eb7673c26300ea4ca5040 Mon Sep 17 00:00:00 2001 -From: sharkautarch <128002472+sharkautarch@users.noreply.github.com> -Date: Sun, 19 May 2024 20:15:36 -0400 -Subject: [PATCH 1/2] QueuePresent: canBypassXWayland(): fetch multiple xcb - cookies initially before waiting on any of them - ---- - layer/VkLayer_FROG_gamescope_wsi.cpp | 1 + - layer/xcb_helpers.hpp | 105 +++++++++++++++++++++++---- - 2 files changed, 93 insertions(+), 13 deletions(-) - -diff --git a/layer/VkLayer_FROG_gamescope_wsi.cpp b/layer/VkLayer_FROG_gamescope_wsi.cpp -index 5844c2a63..ca44849f2 100644 ---- a/layer/VkLayer_FROG_gamescope_wsi.cpp -+++ b/layer/VkLayer_FROG_gamescope_wsi.cpp -@@ -975,6 +975,7 @@ namespace GamescopeWSILayer { - continue; - } - -+ xcb::Prefetcher prefetcher(gamescopeSurface->connection, gamescopeSurface->window); - const bool canBypass = gamescopeSurface->canBypassXWayland(); - if (canBypass != gamescopeSwapchain->isBypassingXWayland) - UpdateSwapchainResult(canBypass ? VK_SUBOPTIMAL_KHR : VK_ERROR_OUT_OF_DATE_KHR); -diff --git a/layer/xcb_helpers.hpp b/layer/xcb_helpers.hpp -index 8fac5635b..72d0ec092 100644 ---- a/layer/xcb_helpers.hpp -+++ b/layer/xcb_helpers.hpp -@@ -4,22 +4,106 @@ - #include - #include - #include -+#include - - namespace xcb { -+ inline static constinit pthread_t g_cache_tid; //incase g_cache could otherwise be accessed by one thread, while it is being deleted by another thread -+ inline static constinit struct cookie_cache_t { -+ xcb_window_t window; -+ std::tuple cached_cookies; -+ std::tuple cached_replies; -+ } g_cache = {}; -+ -+ //Note: this class is currently only meant to be used within GamescopeWSILayer::VkDeviceOverrides::QueuePresentKHR: -+ struct Prefetcher { -+ explicit Prefetcher(xcb_connection_t* connection, const xcb_window_t window) { -+ g_cache = { -+ .window = window, -+ .cached_cookies = { -+ xcb_get_geometry(connection, window), -+ xcb_query_tree(connection, window) -+ } -+ }; -+ g_cache_tid = pthread_self(); -+ } - -+ ~Prefetcher() { -+ g_cache_tid = {}; -+ free(std::get<0>(g_cache.cached_replies)); -+ free(std::get<1>(g_cache.cached_replies)); -+ g_cache.cached_replies = {nullptr,nullptr}; -+ } -+ }; -+ - struct ReplyDeleter { -+ const bool m_bOwning = true; -+ consteval ReplyDeleter(bool bOwning = true) : m_bOwning{bOwning} {} - template - void operator()(T* ptr) const { -- free(const_cast*>(ptr)); -+ if (m_bOwning) -+ free(const_cast*>(ptr)); - } - }; - - template - using Reply = std::unique_ptr; -+ -+ template -+ class XcbFetch { -+ using cookie_f_ptr_t = Cookie_RetType (*)(XcbConn, Args...); -+ using reply_f_ptr_t = Reply_RetType* (*)(XcbConn, Cookie_RetType, xcb_generic_error_t**); -+ -+ const cookie_f_ptr_t m_cookieFunc; -+ const reply_f_ptr_t m_replyFunc; -+ -+ public: -+ consteval XcbFetch(cookie_f_ptr_t cookieFunc, reply_f_ptr_t replyFunc) : m_cookieFunc{cookieFunc}, m_replyFunc{replyFunc} {} -+ -+ inline Reply operator()(XcbConn conn, auto... args) { //have to use auto for argsTwo, since otherwise there'd be a type deduction conflict -+ return Reply { m_replyFunc(conn, m_cookieFunc(conn, args...), nullptr) }; -+ } -+ }; -+ -+ template -+ concept CacheableCookie = std::is_same::value -+ || std::is_same::value; -+ -+ template -+ class XcbFetch { -+ using cookie_f_ptr_t = Cookie_RetType (*)(xcb_connection_t*, xcb_window_t); -+ using reply_f_ptr_t = Reply_RetType* (*)(xcb_connection_t*, Cookie_RetType, xcb_generic_error_t**); -+ -+ const cookie_f_ptr_t m_cookieFunc; -+ const reply_f_ptr_t m_replyFunc; -+ -+ inline Reply getCachedReply(xcb_connection_t* connection) { -+ if (std::get(g_cache.cached_replies) == nullptr) { -+ std::get(g_cache.cached_replies) = m_replyFunc(connection, std::get(g_cache.cached_cookies), nullptr); -+ } - -+ return Reply{std::get(g_cache.cached_replies), ReplyDeleter{false}}; // return 'non-owning' unique_ptr -+ } -+ -+ public: -+ consteval XcbFetch(cookie_f_ptr_t cookieFunc, reply_f_ptr_t replyFunc) : m_cookieFunc{cookieFunc}, m_replyFunc{replyFunc} {} -+ -+ inline Reply operator()(xcb_connection_t* conn, xcb_window_t window) { -+ const bool tryCached = pthread_equal(g_cache_tid, pthread_self()) -+ && g_cache.window == window; -+ if (!tryCached) [[unlikely]] -+ return Reply { m_replyFunc(conn, m_cookieFunc(conn, window), nullptr) }; -+ -+ auto ret = getCachedReply(conn); -+ #if !defined(NDEBUG) || NDEBUG == 0 -+ if (!ret) -+ fprintf(stderr, "[Gamescope WSI] getCachedReply() failed.\n"); -+ #endif -+ return ret; -+ } -+ }; -+ - static std::optional getAtom(xcb_connection_t* connection, std::string_view name) { -- xcb_intern_atom_cookie_t cookie = xcb_intern_atom(connection, false, name.length(), name.data()); -- auto reply = Reply{ xcb_intern_atom_reply(connection, cookie, nullptr) }; -+ auto reply = XcbFetch{xcb_intern_atom, xcb_intern_atom_reply}(connection, false, name.length(), name.data()); - if (!reply) { - fprintf(stderr, "[Gamescope WSI] Failed to get xcb atom.\n"); - return std::nullopt; -@@ -34,8 +118,7 @@ namespace xcb { - - xcb_screen_t* screen = xcb_setup_roots_iterator(xcb_get_setup(connection)).data; - -- xcb_get_property_cookie_t cookie = xcb_get_property(connection, false, screen->root, atom, XCB_ATOM_CARDINAL, 0, sizeof(T) / sizeof(uint32_t)); -- auto reply = Reply{ xcb_get_property_reply(connection, cookie, nullptr) }; -+ auto reply = XcbFetch{xcb_get_property, xcb_get_property_reply}(connection, false, screen->root, atom, XCB_ATOM_CARDINAL, 0, sizeof(T) / sizeof(uint32_t)); - if (!reply) { - fprintf(stderr, "[Gamescope WSI] Failed to read T root window property.\n"); - return std::nullopt; -@@ -61,8 +144,7 @@ namespace xcb { - - static std::optional getToplevelWindow(xcb_connection_t* connection, xcb_window_t window) { - for (;;) { -- xcb_query_tree_cookie_t cookie = xcb_query_tree(connection, window); -- auto reply = Reply{ xcb_query_tree_reply(connection, cookie, nullptr) }; -+ auto reply = XcbFetch{xcb_query_tree, xcb_query_tree_reply}(connection, window); - - if (!reply) { - fprintf(stderr, "[Gamescope WSI] getToplevelWindow: xcb_query_tree failed for window 0x%x.\n", window); -@@ -77,8 +159,7 @@ namespace xcb { - } - - static std::optional getWindowRect(xcb_connection_t* connection, xcb_window_t window) { -- xcb_get_geometry_cookie_t cookie = xcb_get_geometry(connection, window); -- auto reply = Reply{ xcb_get_geometry_reply(connection, cookie, nullptr) }; -+ auto reply = XcbFetch{xcb_get_geometry, xcb_get_geometry_reply}(connection, window); - if (!reply) { - fprintf(stderr, "[Gamescope WSI] getWindowRect: xcb_get_geometry failed for window 0x%x.\n", window); - return std::nullopt; -@@ -112,8 +193,7 @@ namespace xcb { - static std::optional getLargestObscuringChildWindowSize(xcb_connection_t* connection, xcb_window_t window) { - VkExtent2D largestExtent = {}; - -- xcb_query_tree_cookie_t cookie = xcb_query_tree(connection, window); -- auto reply = Reply{ xcb_query_tree_reply(connection, cookie, nullptr) }; -+ auto reply = XcbFetch{xcb_query_tree, xcb_query_tree_reply}(connection, window); - - if (!reply) { - fprintf(stderr, "[Gamescope WSI] getLargestObscuringWindowSize: xcb_query_tree failed for window 0x%x.\n", window); -@@ -130,8 +210,7 @@ namespace xcb { - for (uint32_t i = 0; i < reply->children_len; i++) { - xcb_window_t child = children[i]; - -- xcb_get_window_attributes_cookie_t attributeCookie = xcb_get_window_attributes(connection, child); -- auto attributeReply = Reply{ xcb_get_window_attributes_reply(connection, attributeCookie, nullptr) }; -+ auto attributeReply = XcbFetch{xcb_get_window_attributes, xcb_get_window_attributes_reply}(connection, child); - - const bool obscuring = - attributeReply && - -From 1b59621f4de5c05096d1f279cba2e04264124154 Mon Sep 17 00:00:00 2001 -From: sharkautarch <128002472+sharkautarch@users.noreply.github.com> -Date: Tue, 18 Jun 2024 22:21:23 -0400 -Subject: [PATCH 2/2] WSI: prefetcher: fix issue w/ attempting to prefetch xcb - stuff for pure wayland surfaces - ---- - layer/VkLayer_FROG_gamescope_wsi.cpp | 2 +- - layer/xcb_helpers.hpp | 9 ++++++++- - 2 files changed, 9 insertions(+), 2 deletions(-) - -diff --git a/layer/VkLayer_FROG_gamescope_wsi.cpp b/layer/VkLayer_FROG_gamescope_wsi.cpp -index f26819a60..ce011dcd7 100644 ---- a/layer/VkLayer_FROG_gamescope_wsi.cpp -+++ b/layer/VkLayer_FROG_gamescope_wsi.cpp -@@ -1234,7 +1234,7 @@ namespace GamescopeWSILayer { - continue; - } - -- xcb::Prefetcher prefetcher(gamescopeSurface->connection, gamescopeSurface->window); -+ auto prefetcher = xcb::Prefetcher::GetPrefetcherIf(!gamescopeSurface->isWayland(), gamescopeSurface->connection, gamescopeSurface->window); - const bool canBypass = gamescopeSurface->canBypassXWayland(); - if (canBypass != gamescopeSwapchain->isBypassingXWayland) - UpdateSwapchainResult(canBypass ? VK_SUBOPTIMAL_KHR : VK_ERROR_OUT_OF_DATE_KHR); -diff --git a/layer/xcb_helpers.hpp b/layer/xcb_helpers.hpp -index 72d0ec092..f26aef38b 100644 ---- a/layer/xcb_helpers.hpp -+++ b/layer/xcb_helpers.hpp -@@ -16,6 +16,13 @@ namespace xcb { - - //Note: this class is currently only meant to be used within GamescopeWSILayer::VkDeviceOverrides::QueuePresentKHR: - struct Prefetcher { -+ static std::optional GetPrefetcherIf(bool bCond, xcb_connection_t* connection, const xcb_window_t window) { -+ if (bCond) -+ return std::optional(std::in_place_t{}, connection, window); -+ -+ return std::nullopt; -+ } -+ - explicit Prefetcher(xcb_connection_t* connection, const xcb_window_t window) { - g_cache = { - .window = window, -@@ -90,7 +97,7 @@ namespace xcb { - inline Reply operator()(xcb_connection_t* conn, xcb_window_t window) { - const bool tryCached = pthread_equal(g_cache_tid, pthread_self()) - && g_cache.window == window; -- if (!tryCached) [[unlikely]] -+ if (!tryCached) - return Reply { m_replyFunc(conn, m_cookieFunc(conn, window), nullptr) }; - - auto ret = getCachedReply(conn); diff --git a/anda/games/gamescope/1483.patch b/anda/games/gamescope/1483.patch new file mode 100644 index 0000000000..3bde8361d6 --- /dev/null +++ b/anda/games/gamescope/1483.patch @@ -0,0 +1,34 @@ +From ca58cb2453e6d9ef44d799e394ee9950b7a35b30 Mon Sep 17 00:00:00 2001 +From: Cappy Ishihara +Date: Wed, 21 Aug 2024 03:56:53 +0700 +Subject: [PATCH] Check if current GPU supports Vulkan DRM modifiers when + `--backend=auto` is used. + +This works around #1218 by making use of the new backend option added in #1321, +but adds a check to automatically fall back to the SDL backend if the current +GPU does not support Vulkan DRM modifiers. +--- + src/main.cpp | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +diff --git a/src/main.cpp b/src/main.cpp +index ca4001249..bc6b16904 100644 +--- a/src/main.cpp ++++ b/src/main.cpp +@@ -817,9 +817,13 @@ int main(int argc, char **argv) + if ( eCurrentBackend == gamescope::GamescopeBackend::Auto ) + { + if ( g_pOriginalWaylandDisplay != NULL ) +- eCurrentBackend = gamescope::GamescopeBackend::Wayland; +- else if ( g_pOriginalDisplay != NULL ) +- eCurrentBackend = gamescope::GamescopeBackend::SDL; ++ // Additional check if the current GPU supports Vulkan DRM modifiers ++ // Fallback to SDL if not supported (e.g Older AMD GPUs like Polaris 10/20) ++ if ( vulkan_supports_modifiers() ) ++ eCurrentBackend = gamescope::GamescopeBackend::Wayland; ++ else ++ eCurrentBackend = gamescope::GamescopeBackend::SDL; ++ + else + eCurrentBackend = gamescope::GamescopeBackend::DRM; + } diff --git a/anda/games/gamescope/chimeraos.patch b/anda/games/gamescope/chimeraos.patch index 80cc642b3d..f8bd2f877c 100644 --- a/anda/games/gamescope/chimeraos.patch +++ b/anda/games/gamescope/chimeraos.patch @@ -1,7 +1,7 @@ -From c06cdd847679c930ee6197514970bc21f523e853 Mon Sep 17 00:00:00 2001 +From 646446c157d55d8508c734cddfc3025834f7cf50 Mon Sep 17 00:00:00 2001 From: Matthew Anderson Date: Fri, 17 May 2024 19:43:49 -0500 -Subject: [PATCH 01/22] Add touch-gestures to open up Steam menus +Subject: [PATCH 01/21] Add touch-gestures to open up Steam menus --- src/main.cpp | 5 +++++ @@ -10,7 +10,7 @@ Subject: [PATCH 01/22] Add touch-gestures to open up Steam menus 3 files changed, 34 insertions(+) diff --git a/src/main.cpp b/src/main.cpp -index cd4aeca..4b91c97 100644 +index ca40012..3a1b1ae 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -108,6 +108,8 @@ const struct option *gamescope_options = (struct option[]){ @@ -40,18 +40,18 @@ index cd4aeca..4b91c97 100644 g_nXWaylandCount = atoi( optarg ); } else if (strcmp(opt_name, "composite-debug") == 0) { diff --git a/src/wlserver.cpp b/src/wlserver.cpp -index ee6891d..62da656 100644 +index ccbd512..26b953a 100644 --- a/src/wlserver.cpp +++ b/src/wlserver.cpp -@@ -73,6 +73,7 @@ - static LogScope wl_log("wlserver"); +@@ -81,6 +81,7 @@ using namespace std::literals; + extern gamescope::ConVar cv_drm_debug_disable_explicit_sync; //#define GAMESCOPE_SWAPCHAIN_DEBUG +gamescope::ConVar cv_touch_gestures( "enable_touch_gestures", false, "Enable/Disable the usage of touch gestures" ); struct wlserver_t wlserver = { .touch_down_ids = {} -@@ -2568,6 +2569,33 @@ void wlserver_touchmotion( double x, double y, int touch_id, uint32_t time, bool +@@ -2526,6 +2527,33 @@ void wlserver_touchmotion( double x, double y, int touch_id, uint32_t time, bool if ( bAlwaysWarpCursor ) wlserver_mousewarp( tx, ty, time, false ); @@ -86,10 +86,10 @@ index ee6891d..62da656 100644 else if ( eMode == gamescope::TouchClickModes::Disabled ) { diff --git a/src/wlserver.hpp b/src/wlserver.hpp -index db7d491..da67bf7 100644 +index 0569472..3304c18 100644 --- a/src/wlserver.hpp +++ b/src/wlserver.hpp -@@ -291,6 +291,7 @@ void wlserver_x11_surface_info_finish( struct wlserver_x11_surface_info *surf ); +@@ -272,6 +272,7 @@ void wlserver_x11_surface_info_finish( struct wlserver_x11_surface_info *surf ); void wlserver_set_xwayland_server_mode( size_t idx, int w, int h, int refresh ); extern std::atomic g_bPendingTouchMovement; @@ -98,13 +98,13 @@ index db7d491..da67bf7 100644 void wlserver_open_steam_menu( bool qam ); -- -2.45.2 +2.46.0 -From 34f22c6a52dbed8662132e4bdfd8a29dd1b7825c Mon Sep 17 00:00:00 2001 +From 97c2ed0ea6a5cd43b450e0952db20c08d82bbe60 Mon Sep 17 00:00:00 2001 From: Matthew Anderson Date: Fri, 17 May 2024 20:16:20 -0500 -Subject: [PATCH 02/22] Add bypass_steam_resolution to workaround the 720p/800p +Subject: [PATCH 02/21] Add bypass_steam_resolution to workaround the 720p/800p restrictions Steam has for games --- @@ -113,7 +113,7 @@ Subject: [PATCH 02/22] Add bypass_steam_resolution to workaround the 720p/800p 2 files changed, 14 insertions(+) diff --git a/src/main.cpp b/src/main.cpp -index 4b91c97..3d1057a 100644 +index 3a1b1ae..534779d 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -129,6 +129,8 @@ const struct option *gamescope_options = (struct option[]){ @@ -134,10 +134,10 @@ index 4b91c97..3d1057a 100644 " --xwayland-count create N xwayland servers\n" " --prefer-vk-device prefer Vulkan device for compositing (ex: 1002:7300)\n" diff --git a/src/steamcompmgr.cpp b/src/steamcompmgr.cpp -index 9ee265d..bec4268 100644 +index e997c85..952a5f8 100644 --- a/src/steamcompmgr.cpp +++ b/src/steamcompmgr.cpp -@@ -349,6 +349,8 @@ bool g_bForceHDR10OutputDebug = false; +@@ -356,6 +356,8 @@ bool g_bForceHDR10OutputDebug = false; gamescope::ConVar cv_hdr_enabled{ "hdr_enabled", false, "Whether or not HDR is enabled if it is available." }; bool g_bHDRItmEnable = false; int g_nCurrentRefreshRate_CachedValue = 0; @@ -146,7 +146,7 @@ index 9ee265d..bec4268 100644 static void update_color_mgmt() -@@ -5320,6 +5322,13 @@ handle_property_notify(xwayland_ctx_t *ctx, XPropertyEvent *ev) +@@ -5387,6 +5389,13 @@ handle_property_notify(xwayland_ctx_t *ctx, XPropertyEvent *ev) size_t server_idx = size_t{ xwayland_mode_ctl[ 0 ] }; int width = xwayland_mode_ctl[ 1 ]; int height = xwayland_mode_ctl[ 2 ]; @@ -160,7 +160,7 @@ index 9ee265d..bec4268 100644 bool allowSuperRes = !!xwayland_mode_ctl[ 3 ]; if ( !allowSuperRes ) -@@ -7166,6 +7175,8 @@ steamcompmgr_main(int argc, char **argv) +@@ -7370,6 +7379,8 @@ steamcompmgr_main(int argc, char **argv) bForceWindowsFullscreen = true; } else if (strcmp(opt_name, "hdr-enabled") == 0) { cv_hdr_enabled = true; @@ -170,13 +170,13 @@ index 9ee265d..bec4268 100644 g_bForceHDRSupportDebug = true; } else if (strcmp(opt_name, "hdr-debug-force-output") == 0) { -- -2.45.2 +2.46.0 -From 4c5657cca9a37fee0eee1d86ef3c2a6e5acef09c Mon Sep 17 00:00:00 2001 +From 234e3bb0369b7ed45a8e2f3c41f3c1e900be9d34 Mon Sep 17 00:00:00 2001 From: Matthew Anderson Date: Wed, 26 Jul 2023 20:46:29 -0500 -Subject: [PATCH 03/22] Add force external orientation. +Subject: [PATCH 03/21] Add force external orientation. Co-authored-by: Bouke Sybren Haarsma --- @@ -187,10 +187,10 @@ Co-authored-by: Bouke Sybren Haarsma 4 files changed, 53 insertions(+), 1 deletion(-) diff --git a/src/Backends/DRMBackend.cpp b/src/Backends/DRMBackend.cpp -index 92f01ca..4c72dc1 100644 +index 799fd39..3815b98 100644 --- a/src/Backends/DRMBackend.cpp +++ b/src/Backends/DRMBackend.cpp -@@ -536,6 +536,7 @@ bool g_bSupportsSyncObjs = false; +@@ -537,6 +537,7 @@ bool g_bSupportsSyncObjs = false; extern gamescope::GamescopeModeGeneration g_eGamescopeModeGeneration; extern GamescopePanelOrientation g_DesiredInternalOrientation; @@ -198,7 +198,7 @@ index 92f01ca..4c72dc1 100644 extern bool g_bForceDisableColorMgmt; -@@ -2023,6 +2024,10 @@ namespace gamescope +@@ -2031,6 +2032,10 @@ namespace gamescope { m_ChosenOrientation = g_DesiredInternalOrientation; } @@ -210,7 +210,7 @@ index 92f01ca..4c72dc1 100644 { if ( this->GetProperties().panel_orientation ) diff --git a/src/main.cpp b/src/main.cpp -index 3d1057a..fac3df2 100644 +index 534779d..f9be05e 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -128,6 +128,7 @@ const struct option *gamescope_options = (struct option[]){ @@ -274,7 +274,7 @@ index 3d1057a..fac3df2 100644 strcmp(opt_name, "fsr-sharpness") == 0) { g_upscaleFilterSharpness = atoi( optarg ); diff --git a/src/main.hpp b/src/main.hpp -index 8cfe629..5492cae 100644 +index 2e6fb83..ebd018a 100644 --- a/src/main.hpp +++ b/src/main.hpp @@ -28,6 +28,7 @@ extern bool g_bGrabbed; @@ -286,10 +286,10 @@ index 8cfe629..5492cae 100644 enum class GamescopeUpscaleFilter : uint32_t { diff --git a/src/wlserver.cpp b/src/wlserver.cpp -index 62da656..2998aed 100644 +index 26b953a..837079a 100644 --- a/src/wlserver.cpp +++ b/src/wlserver.cpp -@@ -2530,6 +2530,29 @@ static void apply_touchscreen_orientation(double *x, double *y ) +@@ -2488,6 +2488,29 @@ static void apply_touchscreen_orientation(double *x, double *y ) break; } @@ -320,13 +320,13 @@ index 62da656..2998aed 100644 *y = ty; } -- -2.45.2 +2.46.0 -From 897032bb4b8d8d5c11d67f9844a09a604b2c4333 Mon Sep 17 00:00:00 2001 +From bc0ddd46fd9db62fbc3fe14e0b1493e35ceb2be8 Mon Sep 17 00:00:00 2001 From: Bouke Sybren Haarsma Date: Tue, 12 Mar 2024 00:07:57 +0100 -Subject: [PATCH 04/22] implement force-panel-type +Subject: [PATCH 04/21] implement force-panel-type --- src/backend.h | 3 +++ @@ -335,10 +335,10 @@ Subject: [PATCH 04/22] implement force-panel-type 3 files changed, 20 insertions(+) diff --git a/src/backend.h b/src/backend.h -index 9c2db15..046eb10 100644 +index 7d9fb46..08e8268 100644 --- a/src/backend.h +++ b/src/backend.h -@@ -17,6 +17,7 @@ struct wlr_buffer; +@@ -18,6 +18,7 @@ struct wlr_buffer; struct wlr_dmabuf_attributes; struct FrameInfo_t; @@ -346,7 +346,7 @@ index 9c2db15..046eb10 100644 namespace gamescope { -@@ -213,6 +214,8 @@ namespace gamescope +@@ -221,6 +222,8 @@ namespace gamescope // Dumb helper we should remove to support multi display someday. gamescope::GamescopeScreenType GetScreenType() { @@ -356,10 +356,10 @@ index 9c2db15..046eb10 100644 return GetCurrentConnector()->GetScreenType(); diff --git a/src/gamescope_shared.h b/src/gamescope_shared.h -index f34174e..ed30d8c 100644 +index 5ce8591..d1b7a6e 100644 --- a/src/gamescope_shared.h +++ b/src/gamescope_shared.h -@@ -22,6 +22,7 @@ namespace gamescope +@@ -25,6 +25,7 @@ namespace gamescope { GAMESCOPE_SCREEN_TYPE_INTERNAL, GAMESCOPE_SCREEN_TYPE_EXTERNAL, @@ -368,7 +368,7 @@ index f34174e..ed30d8c 100644 GAMESCOPE_SCREEN_TYPE_COUNT }; diff --git a/src/main.cpp b/src/main.cpp -index fac3df2..8bea38c 100644 +index f9be05e..dc3e9c8 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -129,6 +129,7 @@ const struct option *gamescope_options = (struct option[]){ @@ -416,13 +416,13 @@ index fac3df2..8bea38c 100644 strcmp(opt_name, "fsr-sharpness") == 0) { g_upscaleFilterSharpness = atoi( optarg ); -- -2.45.2 +2.46.0 -From 2178f85676ba25434e8c39adc3848e3f7355acec Mon Sep 17 00:00:00 2001 +From 2a0c92febded984bc0d610eaedc9e8cc4d4ce51a Mon Sep 17 00:00:00 2001 From: Matthew Anderson Date: Fri, 17 May 2024 21:11:34 -0500 -Subject: [PATCH 05/22] wlserver: Fix an issue that would cause gamescope to +Subject: [PATCH 05/21] wlserver: Fix an issue that would cause gamescope to crash when the touchscreen was used --- @@ -430,10 +430,10 @@ Subject: [PATCH 05/22] wlserver: Fix an issue that would cause gamescope to 1 file changed, 23 deletions(-) diff --git a/src/wlserver.cpp b/src/wlserver.cpp -index 2998aed..62da656 100644 +index 837079a..26b953a 100644 --- a/src/wlserver.cpp +++ b/src/wlserver.cpp -@@ -2530,29 +2530,6 @@ static void apply_touchscreen_orientation(double *x, double *y ) +@@ -2488,29 +2488,6 @@ static void apply_touchscreen_orientation(double *x, double *y ) break; } @@ -464,13 +464,13 @@ index 2998aed..62da656 100644 *y = ty; } -- -2.45.2 +2.46.0 -From 261124a5a85ad80b0d7b15926f230bacbca21b22 Mon Sep 17 00:00:00 2001 +From 69bae3bffa954251d6a857b1b6928fc4755e40bf Mon Sep 17 00:00:00 2001 From: Matthew Anderson Date: Fri, 17 May 2024 21:56:55 -0500 -Subject: [PATCH 06/22] Add --custom-refresh-rates +Subject: [PATCH 06/21] Add --custom-refresh-rates --- src/Backends/DRMBackend.cpp | 4 ++++ @@ -479,10 +479,10 @@ Subject: [PATCH 06/22] Add --custom-refresh-rates 3 files changed, 36 insertions(+) diff --git a/src/Backends/DRMBackend.cpp b/src/Backends/DRMBackend.cpp -index 4c72dc1..e4caebb 100644 +index 3815b98..e3512a1 100644 --- a/src/Backends/DRMBackend.cpp +++ b/src/Backends/DRMBackend.cpp -@@ -2125,6 +2125,10 @@ namespace gamescope +@@ -2135,6 +2135,10 @@ namespace gamescope ( m_Mutable.szMakePNP == "VLV"sv && m_Mutable.szModel == "Jupiter"sv ) || ( m_Mutable.szMakePNP == "VLV"sv && m_Mutable.szModel == "Galileo"sv ); @@ -494,7 +494,7 @@ index 4c72dc1..e4caebb 100644 { static constexpr uint32_t kPIDGalileoSDC = 0x3003; diff --git a/src/main.cpp b/src/main.cpp -index 8bea38c..a9e1969 100644 +index dc3e9c8..18eb399 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -132,6 +132,7 @@ const struct option *gamescope_options = (struct option[]){ @@ -556,7 +556,7 @@ index 8bea38c..a9e1969 100644 strcmp(opt_name, "fsr-sharpness") == 0) { g_upscaleFilterSharpness = atoi( optarg ); diff --git a/src/main.hpp b/src/main.hpp -index 5492cae..0207a51 100644 +index ebd018a..4e09e3b 100644 --- a/src/main.hpp +++ b/src/main.hpp @@ -3,6 +3,7 @@ @@ -576,21 +576,21 @@ index 5492cae..0207a51 100644 enum class GamescopeUpscaleFilter : uint32_t { -- -2.45.2 +2.46.0 -From db4804880ea0fdf810979aea3153e2f45dc97bfe Mon Sep 17 00:00:00 2001 +From 5125582bc6fdfc651ca5ccb58cb71d956e2c3676 Mon Sep 17 00:00:00 2001 From: Matthew Anderson Date: Sat, 18 May 2024 08:44:38 -0500 -Subject: [PATCH 07/22] Add rotation gamescope_control command +Subject: [PATCH 07/21] Add rotation gamescope_control command --- protocol/gamescope-control.xml | 18 ++++++++++++ - src/Backends/DRMBackend.cpp | 23 +++++++++++++++- - src/gamescope_shared.h | 10 +++++++ + src/Backends/DRMBackend.cpp | 24 ++++++++++++++-- + src/gamescope_shared.h | 18 ++++++++++++ src/main.cpp | 1 + src/wlserver.cpp | 50 ++++++++++++++++++++++++++++++++++ - 5 files changed, 101 insertions(+), 1 deletion(-) + 5 files changed, 109 insertions(+), 2 deletions(-) diff --git a/protocol/gamescope-control.xml b/protocol/gamescope-control.xml index 012c48c..eab8a84 100644 @@ -621,10 +621,10 @@ index 012c48c..eab8a84 100644 diff --git a/src/Backends/DRMBackend.cpp b/src/Backends/DRMBackend.cpp -index e4caebb..70d5cdf 100644 +index e3512a1..f05c2e8 100644 --- a/src/Backends/DRMBackend.cpp +++ b/src/Backends/DRMBackend.cpp -@@ -2020,7 +2020,9 @@ namespace gamescope +@@ -2028,7 +2028,9 @@ namespace gamescope void CDRMConnector::UpdateEffectiveOrientation( const drmModeModeInfo *pMode ) { @@ -635,10 +635,11 @@ index e4caebb..70d5cdf 100644 { m_ChosenOrientation = g_DesiredInternalOrientation; } -@@ -2935,6 +2937,25 @@ bool drm_update_color_mgmt(struct drm_t *drm) +@@ -2960,8 +2962,26 @@ bool drm_update_color_mgmt(struct drm_t *drm) return true; } +-int g_nDynamicRefreshHz = 0; +void drm_set_orientation( struct drm_t *drm, bool isRotated) +{ + int width = g_nOutputWidth; @@ -649,7 +650,7 @@ index e4caebb..70d5cdf 100644 + width = height; + height = tmp; + } -+ + + if (!drm->pConnector || !drm->pConnector->GetModeConnector()) + return; + @@ -658,17 +659,26 @@ index e4caebb..70d5cdf 100644 + update_drm_effective_orientations(drm, mode); +} + ++int g_nDynamicRefreshHz = 0; static void drm_unset_mode( struct drm_t *drm ) { drm->pending.mode_id = 0; diff --git a/src/gamescope_shared.h b/src/gamescope_shared.h -index ed30d8c..d04a907 100644 +index d1b7a6e..cffa576 100644 --- a/src/gamescope_shared.h +++ b/src/gamescope_shared.h -@@ -62,6 +62,16 @@ enum GamescopePanelOrientation +@@ -65,6 +65,24 @@ enum GamescopePanelOrientation GAMESCOPE_PANEL_ORIENTATION_AUTO, }; ++struct GamescopeTimelinePoint ++{ ++ struct wlr_drm_syncobj_timeline *pTimeline = nullptr; ++ uint64_t ulPoint = 0; ++ ++ void Release(); ++}; ++ +enum GamescopePanelExternalOrientation +{ + GAMESCOPE_PANEL_EXTERNAL_ORIENTATION_0, // normal @@ -683,7 +693,7 @@ index ed30d8c..d04a907 100644 // composite priorities working in libliftoff + also // use the proper libliftoff composite plane system. diff --git a/src/main.cpp b/src/main.cpp -index a9e1969..4469ac1 100644 +index 18eb399..675020f 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -397,6 +397,7 @@ static gamescope::GamescopeScreenType force_panel_type(const char *str) @@ -695,10 +705,10 @@ index a9e1969..4469ac1 100644 } else { fprintf( stderr, "gamescope: invalid value for --force-panel-type\n" ); diff --git a/src/wlserver.cpp b/src/wlserver.cpp -index 62da656..96bb7fc 100644 +index 26b953a..c37dbc1 100644 --- a/src/wlserver.cpp +++ b/src/wlserver.cpp -@@ -1101,6 +1101,55 @@ static void gamescope_control_take_screenshot( struct wl_client *client, struct +@@ -1042,6 +1042,55 @@ static void gamescope_control_take_screenshot( struct wl_client *client, struct } ); } @@ -754,7 +764,7 @@ index 62da656..96bb7fc 100644 static void gamescope_control_handle_destroy( struct wl_client *client, struct wl_resource *resource ) { wl_resource_destroy( resource ); -@@ -1110,6 +1159,7 @@ static const struct gamescope_control_interface gamescope_control_impl = { +@@ -1051,6 +1100,7 @@ static const struct gamescope_control_interface gamescope_control_impl = { .destroy = gamescope_control_handle_destroy, .set_app_target_refresh_cycle = gamescope_control_set_app_target_refresh_cycle, .take_screenshot = gamescope_control_take_screenshot, @@ -763,13 +773,13 @@ index 62da656..96bb7fc 100644 static uint32_t get_conn_display_info_flags() -- -2.45.2 +2.46.0 -From ef9f07b932c8be1d391b9688b1b31edbb73e86ce Mon Sep 17 00:00:00 2001 +From 304c747d5eab4b62fe38225d04529ff53142e832 Mon Sep 17 00:00:00 2001 From: Matthew Anderson Date: Sat, 18 May 2024 11:54:50 -0500 -Subject: [PATCH 08/22] Fix an issue that caused force-panel to not work +Subject: [PATCH 08/21] Fix an issue that caused force-panel to not work --- protocol/gamescope-control.xml | 1 - @@ -791,7 +801,7 @@ index eab8a84..7f5578b 100644 diff --git a/src/Backends/DRMBackend.cpp b/src/Backends/DRMBackend.cpp -index 70d5cdf..7af994e 100644 +index f05c2e8..663b1e2 100644 --- a/src/Backends/DRMBackend.cpp +++ b/src/Backends/DRMBackend.cpp @@ -318,6 +318,9 @@ namespace gamescope @@ -805,11 +815,11 @@ index 70d5cdf..7af994e 100644 m_pConnector->connector_type == DRM_MODE_CONNECTOR_LVDS || m_pConnector->connector_type == DRM_MODE_CONNECTOR_DSI ) diff --git a/src/gamescope_shared.h b/src/gamescope_shared.h -index d04a907..ed30d8c 100644 +index cffa576..a11f598 100644 --- a/src/gamescope_shared.h +++ b/src/gamescope_shared.h -@@ -62,16 +62,6 @@ enum GamescopePanelOrientation - GAMESCOPE_PANEL_ORIENTATION_AUTO, +@@ -73,16 +73,6 @@ struct GamescopeTimelinePoint + void Release(); }; -enum GamescopePanelExternalOrientation @@ -826,10 +836,10 @@ index d04a907..ed30d8c 100644 // composite priorities working in libliftoff + also // use the proper libliftoff composite plane system. diff --git a/src/wlserver.cpp b/src/wlserver.cpp -index 96bb7fc..959f63b 100644 +index c37dbc1..ff534ad 100644 --- a/src/wlserver.cpp +++ b/src/wlserver.cpp -@@ -74,6 +74,8 @@ static LogScope wl_log("wlserver"); +@@ -82,6 +82,8 @@ extern gamescope::ConVar cv_drm_debug_disable_explicit_sync; //#define GAMESCOPE_SWAPCHAIN_DEBUG gamescope::ConVar cv_touch_gestures( "enable_touch_gestures", false, "Enable/Disable the usage of touch gestures" ); @@ -838,7 +848,7 @@ index 96bb7fc..959f63b 100644 struct wlserver_t wlserver = { .touch_down_ids = {} -@@ -1107,43 +1109,43 @@ static void gamescope_control_rotate_display( struct wl_client *client, struct w +@@ -1048,43 +1050,43 @@ static void gamescope_control_rotate_display( struct wl_client *client, struct w if (target_type == GAMESCOPE_CONTROL_DISPLAY_TARGET_TYPE_INTERNAL ) { switch (orientation) { @@ -914,7 +924,7 @@ index 96bb7fc..959f63b 100644 } } //drm_set_orientation(&g_DRM, isRotated); -@@ -2554,34 +2556,61 @@ const std::shared_ptr& wlserver_surface_swapchai +@@ -2512,34 +2514,61 @@ const std::shared_ptr& wlserver_surface_swapchai /* Handle the orientation of the touch inputs */ static void apply_touchscreen_orientation(double *x, double *y ) { @@ -1003,23 +1013,23 @@ index 96bb7fc..959f63b 100644 void wlserver_touchmotion( double x, double y, int touch_id, uint32_t time, bool bAlwaysWarpCursor ) -- -2.45.2 +2.46.0 -From 8950969d8c62982f03bf8452a503276960f2fa33 Mon Sep 17 00:00:00 2001 +From 3efb4df00c1e88219a3ff7c47af99b7217d1fe95 Mon Sep 17 00:00:00 2001 From: Matthew Anderson Date: Sat, 18 May 2024 13:50:57 -0500 -Subject: [PATCH 09/22] Fix an arithmetic error +Subject: [PATCH 09/21] Fix an arithmetic error --- src/Backends/DRMBackend.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Backends/DRMBackend.cpp b/src/Backends/DRMBackend.cpp -index 7af994e..30150fb 100644 +index 663b1e2..eafb2f9 100644 --- a/src/Backends/DRMBackend.cpp +++ b/src/Backends/DRMBackend.cpp -@@ -2023,9 +2023,9 @@ namespace gamescope +@@ -2031,9 +2031,9 @@ namespace gamescope void CDRMConnector::UpdateEffectiveOrientation( const drmModeModeInfo *pMode ) { @@ -1033,33 +1043,32 @@ index 7af994e..30150fb 100644 m_ChosenOrientation = g_DesiredInternalOrientation; } -- -2.45.2 +2.46.0 -From 3e51d6f0ae7603e322024783143329dc46835901 Mon Sep 17 00:00:00 2001 +From dd53e4d18b122cae5383d77fc3f6e79084d8993f Mon Sep 17 00:00:00 2001 From: Matthew Anderson Date: Sat, 18 May 2024 19:04:48 -0500 -Subject: [PATCH 10/22] Rework the touch gestures to be more smooth +Subject: [PATCH 10/21] Rework the touch gestures to be more smooth --- - src/wlserver.cpp | 90 +++++++++++++++++++++++++++++++++++++----------- - 1 file changed, 69 insertions(+), 21 deletions(-) + src/wlserver.cpp | 89 +++++++++++++++++++++++++++++++++++++----------- + 1 file changed, 69 insertions(+), 20 deletions(-) diff --git a/src/wlserver.cpp b/src/wlserver.cpp -index 959f63b..131cd72 100644 +index ff534ad..593a074 100644 --- a/src/wlserver.cpp +++ b/src/wlserver.cpp -@@ -71,7 +71,8 @@ - #include +@@ -80,6 +80,8 @@ using namespace std::literals; + + extern gamescope::ConVar cv_drm_debug_disable_explicit_sync; - static LogScope wl_log("wlserver"); -- +bool pending_gesture = false; +bool pending_osk = false; //#define GAMESCOPE_SWAPCHAIN_DEBUG gamescope::ConVar cv_touch_gestures( "enable_touch_gestures", false, "Enable/Disable the usage of touch gestures" ); extern GamescopePanelOrientation g_DesiredInternalOrientation; -@@ -421,6 +422,39 @@ void wlserver_open_steam_menu( bool qam ) +@@ -362,6 +364,39 @@ void wlserver_open_steam_menu( bool qam ) XTestFakeKeyEvent(server->get_xdisplay(), XKeysymToKeycode( server->get_xdisplay(), XK_Control_L ), False, CurrentTime); } @@ -1099,7 +1108,7 @@ index 959f63b..131cd72 100644 static void wlserver_handle_pointer_button(struct wl_listener *listener, void *data) { struct wlserver_pointer *pointer = wl_container_of( listener, pointer, button ); -@@ -2649,32 +2683,46 @@ void wlserver_touchmotion( double x, double y, int touch_id, uint32_t time, bool +@@ -2607,32 +2642,46 @@ void wlserver_touchmotion( double x, double y, int touch_id, uint32_t time, bool if ( bAlwaysWarpCursor ) wlserver_mousewarp( tx, ty, time, false ); @@ -1167,23 +1176,23 @@ index 959f63b..131cd72 100644 else if ( eMode == gamescope::TouchClickModes::Disabled ) { -- -2.45.2 +2.46.0 -From d25a36dabc8e1d8144413980d915d0e71d313434 Mon Sep 17 00:00:00 2001 +From 70d4ea8937e43752e1adb32ebbcdd3d1a0bcf23c Mon Sep 17 00:00:00 2001 From: Matthew Anderson Date: Sun, 19 May 2024 08:55:28 -0500 -Subject: [PATCH 11/22] Fix a typo for --bypass-steam-resolution +Subject: [PATCH 11/21] Fix a typo for --bypass-steam-resolution --- src/steamcompmgr.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/steamcompmgr.cpp b/src/steamcompmgr.cpp -index bec4268..10c0a75 100644 +index 952a5f8..6fceb1d 100644 --- a/src/steamcompmgr.cpp +++ b/src/steamcompmgr.cpp -@@ -7175,7 +7175,7 @@ steamcompmgr_main(int argc, char **argv) +@@ -7379,7 +7379,7 @@ steamcompmgr_main(int argc, char **argv) bForceWindowsFullscreen = true; } else if (strcmp(opt_name, "hdr-enabled") == 0) { cv_hdr_enabled = true; @@ -1193,13 +1202,13 @@ index bec4268..10c0a75 100644 } else if (strcmp(opt_name, "hdr-debug-force-support") == 0) { g_bForceHDRSupportDebug = true; -- -2.45.2 +2.46.0 -From 6d6afedd56a3f7b578cac1af7eaf93af931e0500 Mon Sep 17 00:00:00 2001 +From be8e56d7f3bf251f75da24aa8a99d2e91aa60812 Mon Sep 17 00:00:00 2001 From: Matthew Anderson Date: Sun, 19 May 2024 11:48:52 -0500 -Subject: [PATCH 12/22] Handle gesture cases better to prevent unexpected +Subject: [PATCH 12/21] Handle gesture cases better to prevent unexpected behavior --- @@ -1207,20 +1216,20 @@ Subject: [PATCH 12/22] Handle gesture cases better to prevent unexpected 1 file changed, 43 insertions(+), 20 deletions(-) diff --git a/src/wlserver.cpp b/src/wlserver.cpp -index 131cd72..9afe488 100644 +index 593a074..833140a 100644 --- a/src/wlserver.cpp +++ b/src/wlserver.cpp -@@ -71,7 +71,8 @@ - #include +@@ -80,7 +80,8 @@ using namespace std::literals; + + extern gamescope::ConVar cv_drm_debug_disable_explicit_sync; - static LogScope wl_log("wlserver"); -bool pending_gesture = false; +bool pending_gesture_x = false; +bool pending_gesture_y = false; bool pending_osk = false; //#define GAMESCOPE_SWAPCHAIN_DEBUG gamescope::ConVar cv_touch_gestures( "enable_touch_gestures", false, "Enable/Disable the usage of touch gestures" ); -@@ -2647,6 +2648,16 @@ static void apply_touchscreen_orientation(double *x, double *y ) +@@ -2606,6 +2607,16 @@ static void apply_touchscreen_orientation(double *x, double *y ) *y = ty; } @@ -1237,7 +1246,7 @@ index 131cd72..9afe488 100644 void wlserver_touchmotion( double x, double y, int touch_id, uint32_t time, bool bAlwaysWarpCursor ) { assert( wlserver_is_lock_held() ); -@@ -2685,43 +2696,55 @@ void wlserver_touchmotion( double x, double y, int touch_id, uint32_t time, bool +@@ -2644,43 +2655,55 @@ void wlserver_touchmotion( double x, double y, int touch_id, uint32_t time, bool if ( cv_touch_gestures ) { @@ -1313,13 +1322,13 @@ index 131cd72..9afe488 100644 } else if ( eMode == gamescope::TouchClickModes::Disabled ) -- -2.45.2 +2.46.0 -From 58e24b2f2ac33eb2388ef734835c6b02e437e563 Mon Sep 17 00:00:00 2001 +From b31ab55d57f0a8b746d4d0fa7939f6473bcad9a4 Mon Sep 17 00:00:00 2001 From: Matthew Anderson Date: Sun, 19 May 2024 18:14:23 -0500 -Subject: [PATCH 13/22] Add references to drm_set_orientation() and g_drm in +Subject: [PATCH 13/21] Add references to drm_set_orientation() and g_drm in wlserver for rotation gamescope-control --- @@ -1328,10 +1337,10 @@ Subject: [PATCH 13/22] Add references to drm_set_orientation() and g_drm in 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/wlserver.cpp b/src/wlserver.cpp -index 9afe488..e963bea 100644 +index 833140a..eb3936a 100644 --- a/src/wlserver.cpp +++ b/src/wlserver.cpp -@@ -1183,8 +1183,9 @@ static void gamescope_control_rotate_display( struct wl_client *client, struct w +@@ -1125,8 +1125,9 @@ static void gamescope_control_rotate_display( struct wl_client *client, struct w wl_log.errorf("Invalid target orientation selected"); } } @@ -1344,10 +1353,10 @@ index 9afe488..e963bea 100644 static void gamescope_control_handle_destroy( struct wl_client *client, struct wl_resource *resource ) diff --git a/src/wlserver.hpp b/src/wlserver.hpp -index da67bf7..688d05c 100644 +index 3304c18..0754ee5 100644 --- a/src/wlserver.hpp +++ b/src/wlserver.hpp -@@ -294,7 +294,8 @@ extern std::atomic g_bPendingTouchMovement; +@@ -275,7 +275,8 @@ extern std::atomic g_bPendingTouchMovement; extern gamescope::ConVar cv_touch_gestures; void wlserver_open_steam_menu( bool qam ); @@ -1358,13 +1367,13 @@ index da67bf7..688d05c 100644 void wlserver_destroy_xwayland_server(gamescope_xwayland_server_t *server); -- -2.45.2 +2.46.0 -From 768e5689e12c2f57766d27d72b4fad03d54fc01c Mon Sep 17 00:00:00 2001 +From 8df476a6f7d41157e847ee7c3346c796e674d9fe Mon Sep 17 00:00:00 2001 From: Matthew Anderson Date: Mon, 20 May 2024 07:02:52 -0500 -Subject: [PATCH 14/22] Fix an issue where forced panel type orientations +Subject: [PATCH 14/21] Fix an issue where forced panel type orientations weren't being applied --- @@ -1372,10 +1381,10 @@ Subject: [PATCH 14/22] Fix an issue where forced panel type orientations 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/Backends/DRMBackend.cpp b/src/Backends/DRMBackend.cpp -index 30150fb..1a2668f 100644 +index eafb2f9..1ea1221 100644 --- a/src/Backends/DRMBackend.cpp +++ b/src/Backends/DRMBackend.cpp -@@ -2023,20 +2023,19 @@ namespace gamescope +@@ -2031,20 +2031,19 @@ namespace gamescope void CDRMConnector::UpdateEffectiveOrientation( const drmModeModeInfo *pMode ) { @@ -1402,7 +1411,7 @@ index 30150fb..1a2668f 100644 switch ( this->GetProperties().panel_orientation->GetCurrentValue() ) { case DRM_MODE_PANEL_ORIENTATION_NORMAL: -@@ -2058,6 +2057,7 @@ namespace gamescope +@@ -2066,6 +2065,7 @@ namespace gamescope if ( this->GetScreenType() == gamescope::GAMESCOPE_SCREEN_TYPE_INTERNAL && pMode ) { @@ -1410,7 +1419,7 @@ index 30150fb..1a2668f 100644 // Auto-detect portait mode for internal displays m_ChosenOrientation = pMode->hdisplay < pMode->vdisplay ? GAMESCOPE_PANEL_ORIENTATION_270 -@@ -2065,6 +2065,7 @@ namespace gamescope +@@ -2073,6 +2073,7 @@ namespace gamescope } else { @@ -1419,23 +1428,23 @@ index 30150fb..1a2668f 100644 } } -- -2.45.2 +2.46.0 -From d6e4cf239f0f2113d1f3071a8d4766a810497617 Mon Sep 17 00:00:00 2001 +From 5d7781dd8ca41f4d865aa336b4e925beeec9349e Mon Sep 17 00:00:00 2001 From: Matthew Anderson Date: Mon, 20 May 2024 07:25:29 -0500 -Subject: [PATCH 15/22] add missing curly bracket... +Subject: [PATCH 15/21] add missing curly bracket... --- src/Backends/DRMBackend.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Backends/DRMBackend.cpp b/src/Backends/DRMBackend.cpp -index 1a2668f..825812e 100644 +index 1ea1221..8d86df0 100644 --- a/src/Backends/DRMBackend.cpp +++ b/src/Backends/DRMBackend.cpp -@@ -2025,7 +2025,7 @@ namespace gamescope +@@ -2033,7 +2033,7 @@ namespace gamescope { if ((this->GetScreenType() == GAMESCOPE_SCREEN_TYPE_INTERNAL && g_DesiredInternalOrientation != GAMESCOPE_PANEL_ORIENTATION_AUTO) || (this->GetScreenType() == GAMESCOPE_SCREEN_TYPE_EXTERNAL && g_DesiredInternalOrientation != GAMESCOPE_PANEL_ORIENTATION_AUTO && g_bExternalForced)) { @@ -1445,13 +1454,13 @@ index 1a2668f..825812e 100644 } else if (this->GetScreenType() == GAMESCOPE_SCREEN_TYPE_EXTERNAL && g_DesiredExternalOrientation != GAMESCOPE_PANEL_ORIENTATION_AUTO) { drm_log.infof("We are rotating the orientation of an external display"); -- -2.45.2 +2.46.0 -From 8983b3621dd81d4633a50a798b7794c6ae9d693b Mon Sep 17 00:00:00 2001 +From 0282352468bb6b99e75eb1c24cb3ed555886fff5 Mon Sep 17 00:00:00 2001 From: Matthew Anderson Date: Mon, 20 May 2024 10:17:55 -0500 -Subject: [PATCH 16/22] Fix case where real externals were rotated with faked +Subject: [PATCH 16/21] Fix case where real externals were rotated with faked external panels --- @@ -1460,7 +1469,7 @@ Subject: [PATCH 16/22] Fix case where real externals were rotated with faked 2 files changed, 64 insertions(+), 29 deletions(-) diff --git a/src/Backends/DRMBackend.cpp b/src/Backends/DRMBackend.cpp -index 825812e..2668ad7 100644 +index 8d86df0..0008505 100644 --- a/src/Backends/DRMBackend.cpp +++ b/src/Backends/DRMBackend.cpp @@ -318,13 +318,20 @@ namespace gamescope @@ -1488,7 +1497,7 @@ index 825812e..2668ad7 100644 return GAMESCOPE_SCREEN_TYPE_EXTERNAL; } -@@ -2023,11 +2030,11 @@ namespace gamescope +@@ -2031,11 +2038,11 @@ namespace gamescope void CDRMConnector::UpdateEffectiveOrientation( const drmModeModeInfo *pMode ) { @@ -1504,10 +1513,10 @@ index 825812e..2668ad7 100644 m_ChosenOrientation = g_DesiredExternalOrientation; } diff --git a/src/wlserver.cpp b/src/wlserver.cpp -index e963bea..74d8209 100644 +index eb3936a..896ec04 100644 --- a/src/wlserver.cpp +++ b/src/wlserver.cpp -@@ -2596,29 +2596,57 @@ static void apply_touchscreen_orientation(double *x, double *y ) +@@ -2555,29 +2555,57 @@ static void apply_touchscreen_orientation(double *x, double *y ) double ty = 0; // Use internal screen always for orientation purposes. @@ -1588,13 +1597,13 @@ index e963bea..74d8209 100644 else if (g_ForcedScreenType == gamescope::GAMESCOPE_SCREEN_TYPE_AUTO) { -- -2.45.2 +2.46.0 -From 57057c9e5dc4ac026259726145d5b6e480368699 Mon Sep 17 00:00:00 2001 +From 276c1220de3542467b6d8e2218dfa1f2ccfc5b79 Mon Sep 17 00:00:00 2001 From: Matthew Anderson Date: Mon, 20 May 2024 16:30:47 -0500 -Subject: [PATCH 17/22] Add verbose panel logs and attempt to address all +Subject: [PATCH 17/21] Add verbose panel logs and attempt to address all orientation issues --- @@ -1604,7 +1613,7 @@ Subject: [PATCH 17/22] Add verbose panel logs and attempt to address all 3 files changed, 39 insertions(+), 21 deletions(-) diff --git a/src/Backends/DRMBackend.cpp b/src/Backends/DRMBackend.cpp -index 2668ad7..9df20ae 100644 +index 0008505..bd5ffec 100644 --- a/src/Backends/DRMBackend.cpp +++ b/src/Backends/DRMBackend.cpp @@ -56,6 +56,7 @@ static constexpr bool k_bUseCursorPlane = false; @@ -1632,7 +1641,7 @@ index 2668ad7..9df20ae 100644 return GAMESCOPE_SCREEN_TYPE_EXTERNAL; } -@@ -2030,7 +2032,19 @@ namespace gamescope +@@ -2038,7 +2040,19 @@ namespace gamescope void CDRMConnector::UpdateEffectiveOrientation( const drmModeModeInfo *pMode ) { @@ -1654,10 +1663,10 @@ index 2668ad7..9df20ae 100644 m_ChosenOrientation = g_DesiredInternalOrientation; } diff --git a/src/wlserver.cpp b/src/wlserver.cpp -index 74d8209..3d4b239 100644 +index 896ec04..e5bb2e2 100644 --- a/src/wlserver.cpp +++ b/src/wlserver.cpp -@@ -2600,26 +2600,29 @@ static void apply_touchscreen_orientation(double *x, double *y ) +@@ -2559,26 +2559,29 @@ static void apply_touchscreen_orientation(double *x, double *y ) { if ( g_ForcedScreenType == gamescope::GAMESCOPE_SCREEN_TYPE_EXTERNAL ) { @@ -1707,10 +1716,10 @@ index 74d8209..3d4b239 100644 } else diff --git a/src/wlserver.hpp b/src/wlserver.hpp -index 688d05c..ae55963 100644 +index 0754ee5..bdf3b0b 100644 --- a/src/wlserver.hpp +++ b/src/wlserver.hpp -@@ -296,6 +296,7 @@ extern gamescope::ConVar cv_touch_gestures; +@@ -277,6 +277,7 @@ extern gamescope::ConVar cv_touch_gestures; void wlserver_open_steam_menu( bool qam ); extern void drm_set_orientation( struct drm_t *drm, bool isRotated); extern drm_t g_DRM; @@ -1719,20 +1728,20 @@ index 688d05c..ae55963 100644 void wlserver_destroy_xwayland_server(gamescope_xwayland_server_t *server); -- -2.45.2 +2.46.0 -From 41242b5ee7fa33cae22f30f5bcf5e27169bd8145 Mon Sep 17 00:00:00 2001 +From 11664b820a9065b597d8655e53ade8dd9a29c4bc Mon Sep 17 00:00:00 2001 From: Bouke Sybren Haarsma Date: Tue, 28 May 2024 21:56:47 +0200 -Subject: [PATCH 18/22] add closing bracket +Subject: [PATCH 18/21] add closing bracket --- src/main.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main.cpp b/src/main.cpp -index 4469ac1..e455225 100644 +index 675020f..315b718 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -465,6 +465,7 @@ static enum gamescope::GamescopeBackend parse_backend_name(const char *str) @@ -1744,13 +1753,13 @@ index 4469ac1..e455225 100644 std::vector g_customRefreshRates; // eg: 60,60,90,110-120 -- -2.45.2 +2.46.0 -From e528844eb590f8183fdfffaf9a7af39f33dc2213 Mon Sep 17 00:00:00 2001 +From 1e5c439eb0b1e809a3ec6414e8d0536db22c9601 Mon Sep 17 00:00:00 2001 From: Bouke Sybren Haarsma Date: Wed, 3 Jan 2024 17:03:04 +0100 -Subject: [PATCH 19/22] remove hacky texture +Subject: [PATCH 19/21] remove hacky texture This will use more hardware planes, causing some devices to composite yeilding lower framerates --- @@ -1758,10 +1767,10 @@ This will use more hardware planes, causing some devices to composite yeilding l 1 file changed, 17 insertions(+), 45 deletions(-) diff --git a/src/steamcompmgr.cpp b/src/steamcompmgr.cpp -index 10c0a75..1bc9008 100644 +index 6fceb1d..4dbbdaf 100644 --- a/src/steamcompmgr.cpp +++ b/src/steamcompmgr.cpp -@@ -1579,7 +1579,7 @@ bool MouseCursor::getTexture() +@@ -1620,7 +1620,7 @@ bool MouseCursor::getTexture() { pixels[i * image->width + j] = image->pixels[i * image->width + j]; } @@ -1770,7 +1779,7 @@ index 10c0a75..1bc9008 100644 std::vector resizeBuffer( nDesiredWidth * nDesiredHeight ); stbir_resize_uint8_srgb( (unsigned char *)pixels.data(), image->width, image->height, 0, (unsigned char *)resizeBuffer.data(), nDesiredWidth, nDesiredHeight, 0, -@@ -2257,7 +2257,7 @@ paint_all(bool async) +@@ -2306,7 +2306,7 @@ paint_all(bool async) } } } @@ -1779,7 +1788,7 @@ index 10c0a75..1bc9008 100644 int nOldLayerCount = frameInfo.layerCount; uint32_t flags = 0; -@@ -2265,7 +2265,7 @@ paint_all(bool async) +@@ -2314,7 +2314,7 @@ paint_all(bool async) flags |= PaintWindowFlag::BasePlane; paint_window(w, w, &frameInfo, global_focus.cursor, flags); update_touch_scaling( &frameInfo ); @@ -1788,7 +1797,7 @@ index 10c0a75..1bc9008 100644 // paint UI unless it's fully hidden, which it communicates to us through opacity=0 // we paint it to extract scaling coefficients above, then remove the layer if one was added if ( w->opacity == TRANSLUCENT && bHasVideoUnderlay && nOldLayerCount < frameInfo.layerCount ) -@@ -2278,7 +2278,7 @@ paint_all(bool async) +@@ -2327,7 +2327,7 @@ paint_all(bool async) float opacityScale = g_bPendingFade ? 0.0f : ((currentTime - fadeOutStartTime) / (float)g_FadeOutDuration); @@ -1797,7 +1806,7 @@ index 10c0a75..1bc9008 100644 paint_cached_base_layer(g_HeldCommits[HELD_COMMIT_FADE], g_CachedPlanes[HELD_COMMIT_FADE], &frameInfo, 1.0f - opacityScale, false); paint_window(w, w, &frameInfo, global_focus.cursor, PaintWindowFlag::BasePlane | PaintWindowFlag::FadeTarget | PaintWindowFlag::DrawBorders, opacityScale, override); } -@@ -2352,34 +2352,6 @@ paint_all(bool async) +@@ -2401,34 +2401,6 @@ paint_all(bool async) if ( overlay == global_focus.inputFocusWindow ) update_touch_scaling( &frameInfo ); } @@ -1832,7 +1841,7 @@ index 10c0a75..1bc9008 100644 if (notification) { -@@ -2957,7 +2929,7 @@ win_maybe_a_dropdown( steamcompmgr_win_t *w ) +@@ -3014,7 +2986,7 @@ win_maybe_a_dropdown( steamcompmgr_win_t *w ) // // TODO: Come back to me for original Age of Empires HD launcher. // Does that use it? It wants blending! @@ -1841,7 +1850,7 @@ index 10c0a75..1bc9008 100644 // Only do this if we have CONTROLPARENT right now. Some other apps, such as the // Street Fighter V (310950) Splash Screen also use LAYERED and TOOLWINDOW, and we don't // want that to be overlayed. -@@ -2972,12 +2944,12 @@ win_maybe_a_dropdown( steamcompmgr_win_t *w ) +@@ -3029,12 +3001,12 @@ win_maybe_a_dropdown( steamcompmgr_win_t *w ) // Josh: // The logic here is as follows. The window will be treated as a dropdown if: @@ -1856,7 +1865,7 @@ index 10c0a75..1bc9008 100644 // - If the window has transient for, disregard it, as it is trying to redirecting us elsewhere // ie. a settings menu dialog popup or something. // - If the window has both skip taskbar and pager, treat it as a dialog. -@@ -3069,7 +3041,7 @@ static bool is_good_override_candidate( steamcompmgr_win_t *override, steamcompm +@@ -3126,7 +3098,7 @@ static bool is_good_override_candidate( steamcompmgr_win_t *override, steamcompm return false; return override != focus && override->GetGeometry().nX >= 0 && override->GetGeometry().nY >= 0; @@ -1865,7 +1874,7 @@ index 10c0a75..1bc9008 100644 static bool pick_primary_focus_and_override(focus_t *out, Window focusControlWindow, const std::vector& vecPossibleFocusWindows, bool globalFocus, const std::vector& ctxFocusControlAppIDs) -@@ -3210,7 +3182,7 @@ found:; +@@ -3267,7 +3239,7 @@ found:; if ( focus ) { @@ -1874,7 +1883,7 @@ index 10c0a75..1bc9008 100644 out->focusWindow = focus; else focus->outdatedInteractiveFocus = true; -@@ -3253,9 +3225,9 @@ found:; +@@ -3310,9 +3282,9 @@ found:; override_focus = fake_override; goto found2; } @@ -1886,7 +1895,7 @@ index 10c0a75..1bc9008 100644 found2:; resolveTransientOverrides( true ); } -@@ -4514,7 +4486,7 @@ finish_destroy_win(xwayland_ctx_t *ctx, Window id, bool gone) +@@ -4574,7 +4546,7 @@ finish_destroy_win(xwayland_ctx_t *ctx, Window id, bool gone) { if (gone) finish_unmap_win (ctx, w); @@ -1895,7 +1904,7 @@ index 10c0a75..1bc9008 100644 { std::unique_lock lock( ctx->list_mutex ); *prev = w->xwayland().next; -@@ -4571,7 +4543,7 @@ destroy_win(xwayland_ctx_t *ctx, Window id, bool gone, bool fade) +@@ -4631,7 +4603,7 @@ destroy_win(xwayland_ctx_t *ctx, Window id, bool gone, bool fade) global_focus.overrideWindow = nullptr; if (x11_win(global_focus.fadeWindow) == id && gone) global_focus.fadeWindow = nullptr; @@ -1904,7 +1913,7 @@ index 10c0a75..1bc9008 100644 MakeFocusDirty(); finish_destroy_win(ctx, id, gone); -@@ -5176,7 +5148,7 @@ handle_property_notify(xwayland_ctx_t *ctx, XPropertyEvent *ev) +@@ -5243,7 +5215,7 @@ handle_property_notify(xwayland_ctx_t *ctx, XPropertyEvent *ev) { get_win_type(ctx, w); MakeFocusDirty(); @@ -1913,7 +1922,7 @@ index 10c0a75..1bc9008 100644 } if (ev->atom == ctx->atoms.sizeHintsAtom) { -@@ -6084,7 +6056,7 @@ void handle_done_commits_xdg( bool vblank, uint64_t vblank_idx ) +@@ -6153,7 +6125,7 @@ void handle_done_commits_xdg( bool vblank, uint64_t vblank_idx ) commits_before_their_time.push_back( entry ); continue; } @@ -1922,7 +1931,7 @@ index 10c0a75..1bc9008 100644 if (!entry.earliestPresentTime) { entry.earliestPresentTime = next_refresh_time; -@@ -6938,7 +6910,7 @@ void update_mode_atoms(xwayland_ctx_t *root_ctx, bool* needs_flush = nullptr) +@@ -7143,7 +7115,7 @@ void update_mode_atoms(xwayland_ctx_t *root_ctx, bool* needs_flush = nullptr) } XChangeProperty(root_ctx->dpy, root_ctx->root, root_ctx->atoms.gamescopeDisplayModeListExternal, XA_STRING, 8, PropModeReplace, (unsigned char *)modes, strlen(modes) + 1 ); @@ -1931,7 +1940,7 @@ index 10c0a75..1bc9008 100644 uint32_t one = 1; XChangeProperty(root_ctx->dpy, root_ctx->root, root_ctx->atoms.gamescopeDisplayIsExternal, XA_CARDINAL, 32, PropModeReplace, (unsigned char *)&one, 1 ); -@@ -7696,7 +7668,7 @@ void steamcompmgr_send_frame_done_to_focus_window() +@@ -7975,7 +7947,7 @@ void steamcompmgr_send_frame_done_to_focus_window() { wlserver_lock(); wlserver_send_frame_done( global_focus.focusWindow->xwayland().surface.main_surface , &now ); @@ -1941,50 +1950,23 @@ index 10c0a75..1bc9008 100644 } -- -2.45.2 - - -From 7865b34c5cd61fa5cc5428ace614e4551fabb6ec Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Joaqu=C3=ADn=20Ignacio=20Aramend=C3=ADa?= - -Date: Tue, 9 Jul 2024 18:29:16 -0300 -Subject: [PATCH 20/22] disable explicit sync to avoid graphical artifacts - ---- - src/Backends/DRMBackend.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Backends/DRMBackend.cpp b/src/Backends/DRMBackend.cpp -index 9df20ae..ff1858b 100644 ---- a/src/Backends/DRMBackend.cpp -+++ b/src/Backends/DRMBackend.cpp -@@ -68,7 +68,7 @@ gamescope::ConVar cv_drm_debug_disable_blend_tf( "drm_debug_disable_blend_ - gamescope::ConVar cv_drm_debug_disable_ctm( "drm_debug_disable_ctm", false, "CTM chicken bit. (Forces CTM off, does not affect other logic)" ); - gamescope::ConVar cv_drm_debug_disable_color_encoding( "drm_debug_disable_color_encoding", false, "YUV Color Encoding chicken bit. (Forces COLOR_ENCODING to DEFAULT, does not affect other logic)" ); - gamescope::ConVar cv_drm_debug_disable_color_range( "drm_debug_disable_color_range", false, "YUV Color Range chicken bit. (Forces COLOR_RANGE to DEFAULT, does not affect other logic)" ); --gamescope::ConVar cv_drm_debug_disable_explicit_sync( "drm_debug_disable_explicit_sync", false, "Force disable explicit sync on the DRM backend." ); -+gamescope::ConVar cv_drm_debug_disable_explicit_sync( "drm_debug_disable_explicit_sync", true, "Force disable explicit sync on the DRM backend." ); - gamescope::ConVar cv_drm_debug_disable_in_fence_fd( "drm_debug_disable_in_fence_fd", false, "Force disable IN_FENCE_FD being set to avoid over-synchronization on the DRM backend." ); - - // HACK: --- -2.45.2 +2.46.0 -From 1dbcfed76f4b80d8a9f6570819b5af7917c786fc Mon Sep 17 00:00:00 2001 +From 672fd75c5ac7bb1226c418270fa134ad6fe07b30 Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Tue, 2 Jul 2024 14:12:47 -0700 -Subject: [PATCH 21/22] Only change refresh rates on internal displays +Subject: [PATCH 20/21] Only change refresh rates on internal displays --- src/Backends/DRMBackend.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Backends/DRMBackend.cpp b/src/Backends/DRMBackend.cpp -index ff1858b..f5a452e 100644 +index bd5ffec..03b9b4c 100644 --- a/src/Backends/DRMBackend.cpp +++ b/src/Backends/DRMBackend.cpp -@@ -2152,7 +2152,7 @@ namespace gamescope +@@ -2162,7 +2162,7 @@ namespace gamescope ( m_Mutable.szMakePNP == "VLV"sv && m_Mutable.szModel == "Jupiter"sv ) || ( m_Mutable.szMakePNP == "VLV"sv && m_Mutable.szModel == "Galileo"sv ); @@ -1994,23 +1976,23 @@ index ff1858b..f5a452e 100644 return; } -- -2.45.2 +2.46.0 -From 3b0408f6ec7307e7a38f2c795b932d0dc05f2d72 Mon Sep 17 00:00:00 2001 +From 0cada655064b2bb2c0b5540f4c249a3c6a1254ed Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Tue, 2 Jul 2024 15:14:23 -0700 -Subject: [PATCH 22/22] Also check g_bExternalForced +Subject: [PATCH 21/21] Also check g_bExternalForced --- src/Backends/DRMBackend.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Backends/DRMBackend.cpp b/src/Backends/DRMBackend.cpp -index f5a452e..d7f935d 100644 +index 03b9b4c..24e81b1 100644 --- a/src/Backends/DRMBackend.cpp +++ b/src/Backends/DRMBackend.cpp -@@ -2152,9 +2152,9 @@ namespace gamescope +@@ -2162,9 +2162,9 @@ namespace gamescope ( m_Mutable.szMakePNP == "VLV"sv && m_Mutable.szModel == "Jupiter"sv ) || ( m_Mutable.szMakePNP == "VLV"sv && m_Mutable.szModel == "Galileo"sv ); @@ -2024,5 +2006,4 @@ index f5a452e..d7f935d 100644 if ( bSteamDeckDisplay ) { -- -2.45.2 - +2.46.0 diff --git a/anda/games/gamescope/deckhd.patch b/anda/games/gamescope/deckhd.patch deleted file mode 100644 index 5140e85b0f..0000000000 --- a/anda/games/gamescope/deckhd.patch +++ /dev/null @@ -1,136 +0,0 @@ -diff --git a/src/Backends/DRMBackend.cpp b/src/Backends/DRMBackend.cpp -index 85e5126..be418b4 100644 ---- a/src/Backends/DRMBackend.cpp -+++ b/src/Backends/DRMBackend.cpp -@@ -2149,6 +2149,7 @@ namespace gamescope - ( m_Mutable.szMakePNP == "WLC"sv && m_Mutable.szModel == "ANX7530 U"sv ) || - ( m_Mutable.szMakePNP == "ANX"sv && m_Mutable.szModel == "ANX7530 U"sv ) || - ( m_Mutable.szMakePNP == "VLV"sv && m_Mutable.szModel == "ANX7530 U"sv ) || -+ ( m_Mutable.szMakePNP == "DHD"sv && m_Mutable.szModel == "DeckHD-1200p"sv ) || - ( m_Mutable.szMakePNP == "VLV"sv && m_Mutable.szModel == "Jupiter"sv ) || - ( m_Mutable.szMakePNP == "VLV"sv && m_Mutable.szModel == "Galileo"sv ); - -@@ -2160,6 +2161,7 @@ namespace gamescope - { - static constexpr uint32_t kPIDGalileoSDC = 0x3003; - static constexpr uint32_t kPIDGalileoBOE = 0x3004; -+ static constexpr uint32_t kPIDJupiterDHD = 0x4001; - - if ( pProduct->product == kPIDGalileoSDC ) - { -@@ -2171,6 +2173,10 @@ namespace gamescope - m_Mutable.eKnownDisplay = GAMESCOPE_KNOWN_DISPLAY_STEAM_DECK_OLED_BOE; - m_Mutable.ValidDynamicRefreshRates = std::span( s_kSteamDeckOLEDRates ); - } -+ else if (pProduct-> product == kPIDJupiterDHD ) { -+ m_Mutable.eKnownDisplay = GAMESCOPE_KNOWN_DISPLAY_STEAM_DECK_LCD_DHD; -+ m_Mutable.ValidDynamicRefreshRates = std::span( s_kSteamDeckLCDRates ); -+ } - else - { - m_Mutable.eKnownDisplay = GAMESCOPE_KNOWN_DISPLAY_STEAM_DECK_LCD; -@@ -2200,7 +2206,8 @@ namespace gamescope - drm_log.infof( "[colorimetry]: Steam Deck LCD detected. Using known colorimetry" ); - m_Mutable.DisplayColorimetry = displaycolorimetry_steamdeck_measured; - } -- else -+ else if (m_Mutable.eKnownDisplay == GAMESCOPE_KNOWN_DISPLAY_STEAM_DECK_OLED_BOE || -+ m_Mutable.eKnownDisplay == GAMESCOPE_KNOWN_DISPLAY_STEAM_DECK_OLED_SDC ) - { - // Steam Deck OLED has calibrated chromaticity coordinates in the EDID - // for each unit. -@@ -2330,7 +2337,7 @@ namespace gamescope - .uMinContentLightLevel = nits_to_u16_dark( 0 ), - }; - } -- else if ( eKnownDisplay == GAMESCOPE_KNOWN_DISPLAY_STEAM_DECK_LCD ) -+ else if ( eKnownDisplay == GAMESCOPE_KNOWN_DISPLAY_STEAM_DECK_LCD || eKnownDisplay == GAMESCOPE_KNOWN_DISPLAY_STEAM_DECK_LCD_DHD ) - { - // Set up some HDR fallbacks for undocking - return BackendConnectorHDRInfo -diff --git a/src/gamescope_shared.h b/src/gamescope_shared.h -index ed30d8c..3b60774 100644 ---- a/src/gamescope_shared.h -+++ b/src/gamescope_shared.h -@@ -8,6 +8,7 @@ namespace gamescope - { - GAMESCOPE_KNOWN_DISPLAY_UNKNOWN, - GAMESCOPE_KNOWN_DISPLAY_STEAM_DECK_LCD, // Jupiter -+ GAMESCOPE_KNOWN_DISPLAY_STEAM_DECK_LCD_DHD, // Jupiter Deck HD - GAMESCOPE_KNOWN_DISPLAY_STEAM_DECK_OLED_SDC, // Galileo SDC - GAMESCOPE_KNOWN_DISPLAY_STEAM_DECK_OLED_BOE, // Galileo BOE - }; -diff --git a/src/modegen.cpp b/src/modegen.cpp -index d174c2d..5dd1136 100644 ---- a/src/modegen.cpp -+++ b/src/modegen.cpp -@@ -293,13 +293,32 @@ unsigned int galileo_boe_vfp[] = - 172,152,136,120,100,84,68,52,36,20,8 - }; - --#define GALILEO_MIN_REFRESH 45 -+//SD LCD Stock Timings -+#define JUPITER_BOE_PID 0x3001 -+#define JUPITER_B_PID 0x3002 -+#define JUPITER_HFP 40 -+#define JUPITER_HSYNC 4 -+#define JUPITER_HBP 40 -+#define JUPITER_VFP 30 -+#define JUPITER_VSYNC 4 -+#define JUPITER_VBP 8 -+//SD LCD DeckHD Timings -+#define JUPITER_DHD_PID 0x4001 -+#define JUPITER_DHD_HFP 40 -+#define JUPITER_DHD_HSYNC 20 -+#define JUPITER_DHD_HBP 40 -+#define JUPITER_DHD_VFP 18 -+#define JUPITER_DHD_VSYNC 2 -+#define JUPITER_DHD_VBP 20 -+//SD OLED SDC Timings - #define GALILEO_SDC_PID 0x3003 - #define GALILEO_SDC_VSYNC 1 - #define GALILEO_SDC_VBP 22 -+//SD OLED BOE Timings - #define GALILEO_BOE_PID 0x3004 - #define GALILEO_BOE_VSYNC 2 - #define GALILEO_BOE_VBP 30 -+#define GALILEO_MIN_REFRESH 45 - #define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0])) - - unsigned int get_galileo_vfp( int vrefresh, unsigned int * vfp_array, unsigned int num_rates ) -@@ -344,17 +363,28 @@ void generate_fixed_mode(drmModeModeInfo *mode, const drmModeModeInfo *base, int - mode->vsync_end = mode->vsync_start + vsync; - mode->vtotal = mode->vsync_end + vbp; - } else { -- if ( eKnownDisplay == gamescope::GAMESCOPE_KNOWN_DISPLAY_STEAM_DECK_LCD ) -+ if ( eKnownDisplay == gamescope::GAMESCOPE_KNOWN_DISPLAY_STEAM_DECK_LCD_DHD ) { -+ mode->hdisplay = 1200; -+ mode->hsync_start = mode->hdisplay + JUPITER_DHD_HFP; -+ mode->hsync_end = mode->hsync_start + JUPITER_DHD_HSYNC; -+ mode->htotal = mode->hsync_end + JUPITER_DHD_HBP; -+ -+ mode->vdisplay = 1920; -+ mode->vsync_start = mode->vdisplay + JUPITER_DHD_VFP; -+ mode->vsync_end = mode->vsync_start + JUPITER_DHD_VSYNC; -+ mode->vtotal = mode->vsync_end + JUPITER_DHD_VBP; -+ } -+ else if ( eKnownDisplay == gamescope::GAMESCOPE_KNOWN_DISPLAY_STEAM_DECK_LCD ) - { - mode->hdisplay = 800; -- mode->hsync_start = 840; -- mode->hsync_end = 844; -- mode->htotal = 884; -+ mode->hsync_start = mode->hdisplay + JUPITER_HFP; -+ mode->hsync_end = mode->hsync_start + JUPITER_HSYNC; -+ mode->htotal = mode->hsync_end + JUPITER_HBP; - - mode->vdisplay = 1280; -- mode->vsync_start = 1310; -- mode->vsync_end = 1314; -- mode->vtotal = 1322; -+ mode->vsync_start = mode->vdisplay + JUPITER_VFP; -+ mode->vsync_end = mode->vsync_start + JUPITER_VSYNC; -+ mode->vtotal = mode->vsync_end + JUPITER_VBP; - } - - mode->clock = ( ( mode->htotal * mode->vtotal * vrefresh ) + 999 ) / 1000; diff --git a/anda/games/gamescope/disable-steam-touch-click-atom.patch b/anda/games/gamescope/disable-steam-touch-click-atom.patch index 822b3a8e7e..cb10172b28 100644 --- a/anda/games/gamescope/disable-steam-touch-click-atom.patch +++ b/anda/games/gamescope/disable-steam-touch-click-atom.patch @@ -48,4 +48,4 @@ index 92bf617..d7498e5 100644 + cv_disable_touch_click = true; } break; - case '?': + case '?': \ No newline at end of file diff --git a/anda/games/gamescope/drm-Separate-BOE-and-SDC-OLED-Deck-panel-rates.patch b/anda/games/gamescope/drm-Separate-BOE-and-SDC-OLED-Deck-panel-rates.patch deleted file mode 100644 index f39afdbc4b..0000000000 --- a/anda/games/gamescope/drm-Separate-BOE-and-SDC-OLED-Deck-panel-rates.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 2e4d7ad1bf2cb98eb67ff8f9385cf6657cf2e912 Mon Sep 17 00:00:00 2001 -From: Matthew Schwartz -Date: Wed, 3 Jul 2024 15:20:08 -0700 -Subject: [PATCH] drm: Separate BOE and SDC OLED Deck panel valid refresh rates - -OLED Decks with BOE panels seem to struggle with a few different -specific modesets (51hz/55hz/65hz) that SDC panels have no issues with. -To work around this, let's make use of Gamescope recognizing each -display manufacturer to correct the bad modesets while leaving -SDC panel units alone. This can be reverted if an underlying cause can -be found in the kernel in the future. ---- - src/Backends/DRMBackend.cpp | 16 +++++++++++++--- - 1 file changed, 13 insertions(+), 3 deletions(-) - -diff --git a/src/Backends/DRMBackend.cpp b/src/Backends/DRMBackend.cpp -index 97ef446..9f93c7f 100644 ---- a/src/Backends/DRMBackend.cpp -+++ b/src/Backends/DRMBackend.cpp -@@ -554,7 +554,7 @@ static constexpr uint32_t s_kSteamDeckLCDRates[] = - 60, - }; - --static constexpr uint32_t s_kSteamDeckOLEDRates[] = -+static constexpr uint32_t s_kSteamDeckOLEDSDCRates[] = - { - 45, 47, 48, 49, - 50, 51, 53, 55, 56, 59, -@@ -564,6 +564,16 @@ static constexpr uint32_t s_kSteamDeckOLEDRates[] = - 90, - }; - -+static constexpr uint32_t s_kSteamDeckOLEDBOERates[] = -+{ -+ 45, 47, 48, 49, -+ 50, 53, 56, 59, -+ 60, 62, 64, 66, 68, -+ 72, 73, 76, 77, 78, -+ 80, 81, 82, 84, 85, 86, 87, 88, -+ 90, -+}; -+ - static void update_connector_display_info_wl(struct drm_t *drm) - { - wlserver_lock(); -@@ -2128,12 +2138,12 @@ namespace gamescope - if ( pProduct->product == kPIDGalileoSDC ) - { - m_Mutable.eKnownDisplay = GAMESCOPE_KNOWN_DISPLAY_STEAM_DECK_OLED_SDC; -- m_Mutable.ValidDynamicRefreshRates = std::span( s_kSteamDeckOLEDRates ); -+ m_Mutable.ValidDynamicRefreshRates = std::span( s_kSteamDeckOLEDSDCRates ); - } - else if ( pProduct->product == kPIDGalileoBOE ) - { - m_Mutable.eKnownDisplay = GAMESCOPE_KNOWN_DISPLAY_STEAM_DECK_OLED_BOE; -- m_Mutable.ValidDynamicRefreshRates = std::span( s_kSteamDeckOLEDRates ); -+ m_Mutable.ValidDynamicRefreshRates = std::span( s_kSteamDeckOLEDBOERates ); - } - else - { --- -2.45.2 - diff --git a/anda/games/gamescope/gamescope-legacy.sh b/anda/games/gamescope/gamescope-legacy.sh new file mode 100644 index 0000000000..34f2e1573e --- /dev/null +++ b/anda/games/gamescope/gamescope-legacy.sh @@ -0,0 +1,29 @@ +#!/bin/sh + +# Wrapper script to run Gamescope with legacy options for older GPUs + +gamescope_path="/usr/bin/gamescope" + + +# check if $BACKEND is already defined +# todo: Probably want to patch gamescope-session-plus for this instead meow + +# For compatibility, let's add the argument for nested backends too + +LEGACY_BACKEND_ARGS="" +NESTED_BACKEND_ARGS="" +if [ -z "$BACKEND" ]; then + LEGACY_BACKEND_ARGS="--backend=sdl" + NESTED_BACKEND_ARGS="--backend=sdl" +else + # Only added for nested sessions, as $BACKEND should be defined only for legacy + NESTED_BACKEND_ARGS="--backend=$BACKEND" +fi + + +if [ -z "$DISPLAY" ]; then + $gamescope_path $LEGACY_BACKEND_ARGS $@ +else + $gamescope_path $NESTED_BACKEND_ARGS $@ +fi + diff --git a/anda/games/gamescope/stb.pc b/anda/games/gamescope/stb.pc index 02c304a9fa..71d2f8a703 100644 --- a/anda/games/gamescope/stb.pc +++ b/anda/games/gamescope/stb.pc @@ -4,4 +4,4 @@ includedir=${prefix}/include/stb Name: stb Description: Single-file public domain libraries for C/C++ Version: 0.1.0 -Cflags: -I${includedir} +Cflags: -I${includedir} \ No newline at end of file diff --git a/anda/games/gamescope/terra-gamescope.spec b/anda/games/gamescope/terra-gamescope.spec index fe1a6155c7..8ad23d4953 100644 --- a/anda/games/gamescope/terra-gamescope.spec +++ b/anda/games/gamescope/terra-gamescope.spec @@ -1,37 +1,43 @@ +%if 0%{?fedora} >= 41 +%global libliftoff_minver 0.5.0 +%else %global libliftoff_minver 0.4.1 +%endif +%global toolchain clang %global _default_patch_fuzz 2 %global gamescope_tag 3.14.24 Name: terra-gamescope Version: 100.%{gamescope_tag} Release: 1%?dist -Summary: Micro-compositor for video games on Wayland +Summary: Micro-compositor for video games on Wayland - Terra patch, please read the full description License: BSD URL: https://github.com/ValveSoftware/gamescope # Create stb.pc to satisfy dependency('stb') Source0: stb.pc +Source1: gamescope-legacy.sh + +Patch0: 0001-cstdint.patch # https://github.com/ChimeraOS/gamescope -#Patch0: chimeraos.patch +Patch1: chimeraos.patch # https://hhd.dev/ -#Patch1: disable-steam-touch-click-atom.patch -# https://github.com/ValveSoftware/gamescope/pull/1281 -# Patch2: deckhd.patch -# https://github.com/ValveSoftware/gamescope/issues/1398 -Patch3: drm-Separate-BOE-and-SDC-OLED-Deck-panel-rates.patch -# https://github.com/ValveSoftware/gamescope/issues/1369 -Patch4: revert-299bc34.patch -# https://github.com/ValveSoftware/gamescope/pull/1231 -Patch5: 1231.patch +Patch2: disable-steam-touch-click-atom.patch +Patch3: v2-0001-always-send-ctrl-1-2-to-steam-s-wayland-session.patch + +# Set default backend to SDL instead of Wayland, to avoid issues with GPUs that do not support +# Vulkan DRM modifiers. +# See also: gamescope-legacy package +# https://github.com/ValveSoftware/gamescope/issues/1218#issuecomment-2123801764 +Patch6: 1483.patch BuildRequires: meson >= 0.54.0 BuildRequires: ninja-build BuildRequires: cmake -BuildRequires: gcc -BuildRequires: gcc-c++ +BuildRequires: clang BuildRequires: glm-devel BuildRequires: google-benchmark-devel BuildRequires: libXmu-devel @@ -52,22 +58,16 @@ BuildRequires: pkgconfig(xres) BuildRequires: pkgconfig(libdrm) BuildRequires: pkgconfig(vulkan) BuildRequires: pkgconfig(wayland-scanner) -BuildRequires: pkgconfig(wayland-server) +BuildRequires: pkgconfig(wayland-server) >= 1.23.0 BuildRequires: pkgconfig(wayland-protocols) >= 1.17 BuildRequires: pkgconfig(xkbcommon) BuildRequires: pkgconfig(sdl2) BuildRequires: pkgconfig(libpipewire-0.3) BuildRequires: pkgconfig(libavif) -#BuildRequires: (pkgconfig(wlroots) >= 0.18.0 with pkgconfig(wlroots) < 0.19.0) -#BuildRequires: (pkgconfig(libliftoff) >= 0.4.1 with pkgconfig(libliftoff) < 0.5) -BuildRequires: pkgconfig(libliftoff) +BuildRequires: pkgconfig(wlroots) +BuildRequires: pkgconfig(libliftoff) >= 0.4.1 BuildRequires: pkgconfig(libcap) BuildRequires: pkgconfig(hwdata) -BuildRequires: pkgconfig(libudev) -BuildRequires: pkgconfig(libseat) -BuildRequires: pkgconfig(libinput) -BuildRequires: xcb-util-wm-devel -BuildRequires: pkgconfig(xcb-errors) BuildRequires: pkgconfig(lcms2) BuildRequires: spirv-headers-devel # Enforce the the minimum EVR to contain fixes for all of: @@ -90,16 +90,21 @@ BuildRequires: git # libliftoff hasn't bumped soname, but API/ABI has changed for 0.2.0 release Requires: libliftoff%{?_isa} >= %{libliftoff_minver} Requires: xorg-x11-server-Xwayland -Requires: %{name}-libs = %{version}-%{release} -%ifarch %{ix86} -Requires: %{name}-libs(x86-32) = %{version}-%{release} -%endif +Requires: terra-gamescope-libs = %{version}-%{release} +Requires: terra-gamescope-libs(x86-32) = %{version}-%{release} Recommends: mesa-dri-drivers Recommends: mesa-vulkan-drivers +Provides: gamescope-legacy +Obsoletes: gamescope-legacy < 3.14.2 + %description Gamescope is the micro-compositor optimized for running video games on Wayland. +This specific build of Gamescope is patched to use SDL as the default backend instead of Wayland, and +includes a legacy wrapper script for older GPUs and extra configuration options. Please see +https://developer.fyralabs.com/terra/gamescope for more information. + %package libs Summary: libs for Gamescope %description libs @@ -120,21 +125,35 @@ sed -i 's^../thirdparty/SPIRV-Headers/include/spirv/^/usr/include/spirv/^' src/m %build cd gamescope export PKG_CONFIG_PATH=pkgconfig -%meson -Dpipewire=enabled -Dinput_emulation=enabled -Ddrm_backend=enabled -Drt_cap=enabled -Davif_screenshots=enabled -Dsdl2_backend=enabled +%if %{__isa_bits} == 64 +%meson --auto-features=enabled -Dforce_fallback_for=vkroots,wlroots,libliftoff +%else +%meson -Denable_gamescope=false -Denable_gamescope_wsi_layer=true +%endif %meson_build %install cd gamescope %meson_install --skip-subprojects +%if %{__isa_bits} == 64 +install -Dm755 %{SOURCE1} %{buildroot}%{_bindir}/gamescope-legacy +%endif + %files %license gamescope/LICENSE %doc gamescope/README.md +%if %{__isa_bits} == 64 %caps(cap_sys_nice=eip) %{_bindir}/gamescope %{_bindir}/gamescopectl %{_bindir}/gamescopestream %{_bindir}/gamescopereaper +%{_bindir}/gamescope-legacy +%endif %files libs %{_libdir}/libVkLayer_FROG_gamescope_wsi_*.so %{_datadir}/vulkan/implicit_layer.d/VkLayer_FROG_gamescope_wsi.*.json + +%changelog +%autochangelog diff --git a/anda/games/gamescope/update-patch.sh b/anda/games/gamescope/update-patch.sh new file mode 100755 index 0000000000..9238e8c5ce --- /dev/null +++ b/anda/games/gamescope/update-patch.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +curl -o ./1483.patch https://patch-diff.githubusercontent.com/raw/ValveSoftware/gamescope/pull/1483.patch \ No newline at end of file diff --git a/anda/games/gamescope/v2-0001-always-send-ctrl-1-2-to-steam-s-wayland-session.patch b/anda/games/gamescope/v2-0001-always-send-ctrl-1-2-to-steam-s-wayland-session.patch new file mode 100644 index 0000000000..ad97a5fcc0 --- /dev/null +++ b/anda/games/gamescope/v2-0001-always-send-ctrl-1-2-to-steam-s-wayland-session.patch @@ -0,0 +1,39 @@ +From 35e001dc59a44227d670c667a85a6ef5472eee58 Mon Sep 17 00:00:00 2001 +From: antheas +Date: Sat, 20 Jul 2024 01:23:19 +0300 +Subject: [PATCH v2] always send ctrl+1/2 to steam's wayland session + +--- + src/wlserver.cpp | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +diff --git a/src/wlserver.cpp b/src/wlserver.cpp +index 1852be9..7de737d 100644 +--- a/src/wlserver.cpp ++++ b/src/wlserver.cpp +@@ -369,7 +369,12 @@ static void wlserver_handle_key(struct wl_listener *listener, void *data) + keysym == XKB_KEY_XF86AudioLowerVolume || + keysym == XKB_KEY_XF86AudioRaiseVolume || + keysym == XKB_KEY_XF86PowerOff; +- if ( ( event->state == WL_KEYBOARD_KEY_STATE_PRESSED || event->state == WL_KEYBOARD_KEY_STATE_RELEASED ) && forbidden_key ) ++ ++ // Check for steam keys (ctrl + 1/2) ++ bool is_steamshortcut = (keyboard->wlr->modifiers.depressed & WLR_MODIFIER_CTRL) && (keysym == XKB_KEY_1 || ++ keysym == XKB_KEY_2); ++ ++ if ( ( event->state == WL_KEYBOARD_KEY_STATE_PRESSED || event->state == WL_KEYBOARD_KEY_STATE_RELEASED ) && (forbidden_key || is_steamshortcut) ) + { + // Always send volume+/- to root server only, to avoid it reaching the game. + struct wlr_surface *old_kb_surf = wlserver.kb_focus_surface; +@@ -378,6 +383,9 @@ static void wlserver_handle_key(struct wl_listener *listener, void *data) + { + wlserver_keyboardfocus( new_kb_surf, false ); + wlr_seat_set_keyboard( wlserver.wlr.seat, keyboard->wlr ); ++ // Send modifiers to steam for it to work ++ if (is_steamshortcut) ++ wlr_seat_keyboard_notify_modifiers(wlserver.wlr.seat, &keyboard->wlr->modifiers); + wlr_seat_keyboard_notify_key( wlserver.wlr.seat, event->time_msec, event->keycode, event->state ); + wlserver_keyboardfocus( old_kb_surf, false ); + return; +-- +2.45.2