From 68b8d8c45f0dfe8174c3e88da4ffee1ed6993803 Mon Sep 17 00:00:00 2001 From: omigamedev Date: Wed, 17 Jun 2026 11:26:11 +0200 Subject: [PATCH] Narrow Win32 lifecycle state surface --- src/platform_windows/windows_lifecycle_shell.h | 7 ------- src/platform_windows/windows_lifecycle_state.cpp | 5 ----- src/platform_windows/windows_lifecycle_state.h | 1 - src/platform_windows/windows_runtime_shell.cpp | 2 +- src/platform_windows/windows_window_shell.cpp | 1 + 5 files changed, 2 insertions(+), 14 deletions(-) diff --git a/src/platform_windows/windows_lifecycle_shell.h b/src/platform_windows/windows_lifecycle_shell.h index eb177eda..a869f6ab 100644 --- a/src/platform_windows/windows_lifecycle_shell.h +++ b/src/platform_windows/windows_lifecycle_shell.h @@ -2,8 +2,6 @@ #include -#include - #include "platform_windows/windows_vr_shell.h" namespace pp::platform::windows { @@ -11,11 +9,6 @@ namespace pp::platform::windows { inline constexpr UINT kUserCloseMessage = WM_USER + 1; inline constexpr UINT kUserWakeupMessage = WM_USER + 2; -[[nodiscard]] std::atomic& lifecycle_running_state() noexcept; -void mark_lifecycle_running() noexcept; -void mark_lifecycle_stopped() noexcept; -[[nodiscard]] bool lifecycle_is_running() noexcept; - void request_window_close(HWND hWnd); void handle_window_close_message(VrShellState& vr); diff --git a/src/platform_windows/windows_lifecycle_state.cpp b/src/platform_windows/windows_lifecycle_state.cpp index 714f8b7e..d7c5bf98 100644 --- a/src/platform_windows/windows_lifecycle_state.cpp +++ b/src/platform_windows/windows_lifecycle_state.cpp @@ -18,11 +18,6 @@ struct RetainedWindowLifecycleState final { } -std::atomic& lifecycle_running_state() noexcept -{ - return retained_lifecycle_running_state(); -} - void mark_lifecycle_running() noexcept { retained_lifecycle_running_state().store(1, std::memory_order_relaxed); diff --git a/src/platform_windows/windows_lifecycle_state.h b/src/platform_windows/windows_lifecycle_state.h index b4bb228b..ff8aa264 100644 --- a/src/platform_windows/windows_lifecycle_state.h +++ b/src/platform_windows/windows_lifecycle_state.h @@ -6,7 +6,6 @@ namespace pp::platform::windows { -[[nodiscard]] std::atomic& lifecycle_running_state() noexcept; void mark_lifecycle_running() noexcept; void mark_lifecycle_stopped() noexcept; [[nodiscard]] bool lifecycle_is_running() noexcept; diff --git a/src/platform_windows/windows_runtime_shell.cpp b/src/platform_windows/windows_runtime_shell.cpp index 9d3e50b1..f658d2cb 100644 --- a/src/platform_windows/windows_runtime_shell.cpp +++ b/src/platform_windows/windows_runtime_shell.cpp @@ -5,7 +5,7 @@ #include "app.h" #include "log.h" #include "platform_windows/windows_bootstrap_helpers.h" -#include "platform_windows/windows_lifecycle_shell.h" +#include "platform_windows/windows_lifecycle_state.h" #include "platform_windows/windows_main_window_session.h" #include "platform_windows/windows_platform_services.h" #include "platform_windows/windows_stylus_input.h" diff --git a/src/platform_windows/windows_window_shell.cpp b/src/platform_windows/windows_window_shell.cpp index c245536c..b6873c77 100644 --- a/src/platform_windows/windows_window_shell.cpp +++ b/src/platform_windows/windows_window_shell.cpp @@ -3,6 +3,7 @@ #include "platform_windows/windows_window_shell.h" #include "app.h" +#include "platform_windows/windows_lifecycle_state.h" #include "platform_windows/windows_lifecycle_shell.h" #include "platform_windows/windows_main_window_session.h" #include "platform_windows/windows_platform_services.h"