diff --git a/docs/modernization/build-inventory.md b/docs/modernization/build-inventory.md index 53e75f3..165ff11 100644 --- a/docs/modernization/build-inventory.md +++ b/docs/modernization/build-inventory.md @@ -448,9 +448,9 @@ Known local toolchain state: startup storage path preparation, clipboard text, cursor visibility, virtual-keyboard visibility, external file display, file sharing, native app/window close, UI-thread lifecycle hooks, render-context lifecycle hooks, - render-target binding hooks, render-capture frame hooks, per-frame platform - hooks, picker callbacks, and recording cleanup, live asset/layout reload - policy, diagnostic + render-target binding hooks, render platform hint hooks, render-capture frame + hooks, per-frame platform hooks, picker callbacks, and recording cleanup, + live asset/layout reload policy, diagnostic stacktrace/crash hooks, prepared-file save/download handoff; Windows live app execution now uses injected diff --git a/docs/modernization/debt.md b/docs/modernization/debt.md index bae6092..3a22573 100644 --- a/docs/modernization/debt.md +++ b/docs/modernization/debt.md @@ -35,7 +35,7 @@ agent or engineer to remove them without reconstructing context from chat. | DEBT-0014 | Open | Modernization | `windows-clangcl-asan` now configures as a headless Ninja/clang-cl preset and uses the release MSVC runtime required by ASan, but local builds still fail because installed clang-cl 18.1.8 is paired with VS 2026-preview STL headers that require Clang 20 or newer | Sanitizer validation should be local and repeatable, but this machine's compiler/header pairing is incompatible | `cmake --fresh --preset windows-clangcl-asan`; `cmake --build --preset windows-clangcl-asan --target pp_foundation` | Install/use Clang 20+ with the VS 2026 STL, or point the preset at a compatible VS 2022 toolchain, then make `platform-build.ps1 -Presets windows-clangcl-asan` pass for the headless matrix | | DEBT-0015 | Open | Modernization | Cursor visibility requests now consume pure `pp_app_core` planning through `pano_cli plan-cursor-visibility`, `App::show_cursor`/`App::hide_cursor` dispatch through `PlatformServices` without platform guards, and Windows live execution uses injected `WindowsPlatformServices`, but macOS cursor execution still reaches the retained fallback adapter | Keep canvas cursor behavior stable while platform shells are extracted incrementally | `pp_app_core_document_platform_io_tests`; `pano_cli plan-cursor-visibility --visible`; `ctest --preset desktop-fast --build-config Debug` | Cursor visibility execution is owned by injected `pp_platform_*` services for every supported platform | | DEBT-0016 | Open | Modernization | Clipboard get/set requests now consume pure `pp_app_core` planning through `pano_cli plan-clipboard-read` and `pano_cli plan-clipboard-write`, and Windows live execution uses injected `WindowsPlatformServices`, but Apple/Android clipboard execution still reaches retained fallback adapter branches from `App::clipboard_get_text` and `App::clipboard_set_text` | Keep picker/color text clipboard behavior stable while platform shells are extracted incrementally | `pp_app_core_document_platform_io_tests`; `pano_cli plan-clipboard-write --text #ff00aa`; `ctest --preset desktop-fast --build-config Debug` | Clipboard execution is owned by injected `pp_platform_*` services for every supported platform | -| DEBT-0017 | Open | Modernization | Startup storage path preparation, `App::clipboard_get_text`, `App::clipboard_set_text`, `App::show_cursor`, `App::hide_cursor`, `App::showKeyboard`, `App::hideKeyboard`, `App::display_file`, `App::share_file`, native app/window close, UI-thread lifecycle hooks, render-context acquire/release/present hooks, render-target binding hooks, render-capture frame hooks, recording cleanup, live asset/layout reload policy, diagnostic stacktrace/crash hooks, per-frame platform hooks, `App::pick_image`, `App::pick_file`, the non-writer `App::pick_file_save`, `App::pick_dir`, and prepared-file save/download handoff now call the SDK-free `pp::platform::PlatformServices` interface, and Windows injects `WindowsPlatformServices` from `src/platform_windows/windows_platform_services.*`; non-Windows live implementations still use `src/platform_legacy/legacy_platform_services.*`, a named fallback adapter that forwards to retained Apple/Android/Linux/Web bridge functions and retained no-op branches | Preserve behavior while moving platform execution behind a testable service boundary before platform shell implementations are injected | `pp_platform_api_tests`; `pp_app_core_document_platform_io_tests`; `ctest --preset desktop-fast --build-config Debug`; `powershell -ExecutionPolicy Bypass -File scripts\automation\package-smoke.ps1 -Preset windows-msvc-default -Configuration Debug` | Replace `src/platform_legacy/legacy_platform_services.*` with injected `pp_platform_*` service implementations owned by each non-Windows platform shell | +| DEBT-0017 | Open | Modernization | Startup storage path preparation, `App::clipboard_get_text`, `App::clipboard_set_text`, `App::show_cursor`, `App::hide_cursor`, `App::showKeyboard`, `App::hideKeyboard`, `App::display_file`, `App::share_file`, native app/window close, UI-thread lifecycle hooks, render-context acquire/release/present hooks, render-target binding hooks, render platform hint hooks, render-capture frame hooks, recording cleanup, live asset/layout reload policy, diagnostic stacktrace/crash hooks, per-frame platform hooks, `App::pick_image`, `App::pick_file`, the non-writer `App::pick_file_save`, `App::pick_dir`, and prepared-file save/download handoff now call the SDK-free `pp::platform::PlatformServices` interface, and Windows injects `WindowsPlatformServices` from `src/platform_windows/windows_platform_services.*`; non-Windows live implementations still use `src/platform_legacy/legacy_platform_services.*`, a named fallback adapter that forwards to retained Apple/Android/Linux/Web bridge functions and retained no-op branches | Preserve behavior while moving platform execution behind a testable service boundary before platform shell implementations are injected | `pp_platform_api_tests`; `pp_app_core_document_platform_io_tests`; `ctest --preset desktop-fast --build-config Debug`; `powershell -ExecutionPolicy Bypass -File scripts\automation\package-smoke.ps1 -Preset windows-msvc-default -Configuration Debug` | Replace `src/platform_legacy/legacy_platform_services.*` with injected `pp_platform_*` service implementations owned by each non-Windows platform shell | ## Closed Debt diff --git a/docs/modernization/roadmap.md b/docs/modernization/roadmap.md index d4171d4..bac2aa2 100644 --- a/docs/modernization/roadmap.md +++ b/docs/modernization/roadmap.md @@ -472,9 +472,9 @@ before retained platform clipboard bridges continue. startup storage path preparation, clipboard text, cursor visibility, virtual-keyboard visibility, UI-thread lifecycle hooks, render-context acquire/release/present hooks, render-target binding hooks, render-capture -frame hooks, external file display, file sharing, recording file cleanup, live -asset/layout reload policy, diagnostic stacktrace/crash hooks, -image/file/save-file pickers, and directory pickers. +frame hooks, render platform hint hooks, external file display, file sharing, +recording file cleanup, live asset/layout reload policy, diagnostic +stacktrace/crash hooks, image/file/save-file pickers, and directory pickers. Windows installs an injected `WindowsPlatformServices` implementation from `src/platform_windows/windows_platform_services.*` in `pp_platform_windows`; other platforms still route through the debt-tracked legacy fallback adapter @@ -506,6 +506,9 @@ shells are injected. Render-task default-target binding and visible main-target binding now dispatch through `PlatformServices`, preserving the existing iOS drawable bind in the legacy adapter while removing the iOS drawable branch from `App::draw`. +Initial render platform hints now also dispatch through `PlatformServices`, +preserving the previous Windows/macOS program-point-size and line-smoothing +enablement while removing the Windows/macOS branch from `App::init`. Windows RenderDoc frame capture hooks now also dispatch through `PlatformServices`, keeping capture integration in the platform service while leaving non-Windows adapters as no-ops. @@ -1038,11 +1041,11 @@ Results: clipboard writes, cursor visibility dispatch, virtual-keyboard visibility dispatch, external file display dispatch, file sharing dispatch, native app/window close dispatch, UI-thread lifecycle dispatch, render-context - lifecycle dispatch, render-target binding dispatch, render-capture frame hook - dispatch, recording cleanup dispatch, live asset/layout reload policy - dispatch, diagnostic hook dispatch, per-frame platform hook dispatch, picker - callback dispatch, and prepared-file save/download callback dispatch. The - live Windows app now + lifecycle dispatch, render-target binding dispatch, render platform hint + dispatch, render-capture frame hook dispatch, recording cleanup dispatch, + live asset/layout reload policy dispatch, diagnostic hook dispatch, per-frame + platform hook dispatch, picker callback dispatch, and prepared-file + save/download callback dispatch. The live Windows app now consumes this interface through an injected `WindowsPlatformServices` instance isolated in `src/platform_windows/windows_platform_services.*`; other platforms still diff --git a/src/app.cpp b/src/app.cpp index 84ff19a..8828dc3 100644 --- a/src/app.cpp +++ b/src/app.cpp @@ -85,16 +85,6 @@ namespace { return static_cast(pp::renderer::gl::scissor_test_state()); } -[[nodiscard]] GLenum program_point_size_state() noexcept -{ - return static_cast(pp::renderer::gl::program_point_size_state()); -} - -[[nodiscard]] GLenum line_smooth_state() noexcept -{ - return static_cast(pp::renderer::gl::line_smooth_state()); -} - [[nodiscard]] GLenum source_alpha_blend_factor() noexcept { return static_cast(pp::renderer::gl::source_alpha_blend_factor()); @@ -496,10 +486,7 @@ void App::init() //} glDisable(depth_test_state()); - #if defined(_WIN32) || defined(__OSX__) - glEnable(program_point_size_state()); - glEnable(line_smooth_state()); - #endif + App::I->apply_render_platform_hints(); glBlendFunc(source_alpha_blend_factor(), one_minus_source_alpha_blend_factor()); glBlendEquationSeparate(add_blend_equation(), max_blend_equation()); }); diff --git a/src/app.h b/src/app.h index 451bdd8..e5a62a3 100644 --- a/src/app.h +++ b/src/app.h @@ -198,6 +198,7 @@ public: void present_render_context(); void bind_default_render_target(); void bind_main_render_target(); + void apply_render_platform_hints(); void begin_render_capture_frame(); void end_render_capture_frame(); [[nodiscard]] bool platform_deletes_recorded_files_on_clear(); diff --git a/src/app_events.cpp b/src/app_events.cpp index 03d5c0b..7857aae 100644 --- a/src/app_events.cpp +++ b/src/app_events.cpp @@ -247,6 +247,11 @@ void App::bind_main_render_target() active_platform_services().bind_main_render_target(); } +void App::apply_render_platform_hints() +{ + active_platform_services().apply_render_platform_hints(); +} + void App::begin_render_capture_frame() { active_platform_services().begin_render_capture_frame(); diff --git a/src/platform_api/platform_services.h b/src/platform_api/platform_services.h index bba253a..9d8aa2c 100644 --- a/src/platform_api/platform_services.h +++ b/src/platform_api/platform_services.h @@ -35,6 +35,7 @@ public: virtual void present_render_context() = 0; virtual void bind_default_render_target() = 0; virtual void bind_main_render_target() = 0; + virtual void apply_render_platform_hints() = 0; virtual void begin_render_capture_frame() = 0; virtual void end_render_capture_frame() = 0; [[nodiscard]] virtual bool deletes_recorded_files_on_clear() = 0; diff --git a/src/platform_legacy/legacy_platform_services.cpp b/src/platform_legacy/legacy_platform_services.cpp index 73ac0f1..6bc13c5 100644 --- a/src/platform_legacy/legacy_platform_services.cpp +++ b/src/platform_legacy/legacy_platform_services.cpp @@ -241,6 +241,14 @@ public: #endif } + void apply_render_platform_hints() override + { +#if defined(__OSX__) + glEnable(static_cast(pp::renderer::gl::program_point_size_state())); + glEnable(static_cast(pp::renderer::gl::line_smooth_state())); +#endif + } + void begin_render_capture_frame() override { } diff --git a/src/platform_windows/windows_platform_services.cpp b/src/platform_windows/windows_platform_services.cpp index a7e362d..e788e9c 100644 --- a/src/platform_windows/windows_platform_services.cpp +++ b/src/platform_windows/windows_platform_services.cpp @@ -262,6 +262,12 @@ public: bind_default_render_target(); } + void apply_render_platform_hints() override + { + glEnable(static_cast(pp::renderer::gl::program_point_size_state())); + glEnable(static_cast(pp::renderer::gl::line_smooth_state())); + } + void begin_render_capture_frame() override { win32_renderdoc_frame_start(); diff --git a/tests/platform_api/platform_services_tests.cpp b/tests/platform_api/platform_services_tests.cpp index fb6c084..da71c5a 100644 --- a/tests/platform_api/platform_services_tests.cpp +++ b/tests/platform_api/platform_services_tests.cpp @@ -91,6 +91,11 @@ public: ++main_render_target_binds; } + void apply_render_platform_hints() override + { + ++render_platform_hint_applies; + } + void begin_render_capture_frame() override { ++render_capture_begins; @@ -196,6 +201,7 @@ public: int render_context_presents = 0; int default_render_target_binds = 0; int main_render_target_binds = 0; + int render_platform_hint_applies = 0; int render_capture_begins = 0; int render_capture_ends = 0; int storage_prepares = 0; @@ -327,12 +333,14 @@ void platform_services_dispatch_render_context_lifecycle(pp::tests::Harness& har services.present_render_context(); services.bind_default_render_target(); services.bind_main_render_target(); + services.apply_render_platform_hints(); services.release_render_context(); PP_EXPECT(harness, fake.render_context_acquires == 1); PP_EXPECT(harness, fake.render_context_presents == 1); PP_EXPECT(harness, fake.default_render_target_binds == 1); PP_EXPECT(harness, fake.main_render_target_binds == 1); + PP_EXPECT(harness, fake.render_platform_hint_applies == 1); PP_EXPECT(harness, fake.render_context_releases == 1); }