From 26470e0fe82094541fb0d716854bd1caf0a10f11 Mon Sep 17 00:00:00 2001 From: omigamedev Date: Fri, 5 Jun 2026 15:19:10 +0200 Subject: [PATCH] Share retained app UI GL dispatch --- docs/modernization/build-inventory.md | 6 ++- docs/modernization/debt.md | 9 +++- docs/modernization/roadmap.md | 23 +++++++--- src/app.cpp | 65 ++++++--------------------- src/app_commands.cpp | 29 +++--------- src/app_vr.cpp | 62 +++++-------------------- src/legacy_ui_gl_dispatch.h | 15 +++++++ 7 files changed, 74 insertions(+), 135 deletions(-) diff --git a/docs/modernization/build-inventory.md b/docs/modernization/build-inventory.md index ab00afd..494db80 100644 --- a/docs/modernization/build-inventory.md +++ b/docs/modernization/build-inventory.md @@ -619,7 +619,11 @@ powershell -ExecutionPolicy Bypass -File scripts\automation\apple-remote-build.p blend/depth state query-restore, depth clear masks, active texture unit dispatch, and fallback 2D texture unbind dispatch; VR SDK start/stop now dispatches through `PlatformServices` while retaining the existing Windows OpenVR bridge - shape. + shape. Its retained callback endpoints now share `legacy_ui_gl_dispatch` + with app startup, app clear, app UI viewport/scissor, and command-convert + renderer state callbacks, so those files no longer duplicate local raw GL + adapter clusters for capability, blend, clear, viewport, scissor, active + texture, or 2D texture-unbind execution. Canvas mode overlay, mask, and transform paths also consume backend-owned blend/depth state execution, active texture unit dispatch, transform/cut viewport execution, 2D texture copy targets, and RGBA8 readback format tokens; diff --git a/docs/modernization/debt.md b/docs/modernization/debt.md index b6f919d..f9c7faa 100644 --- a/docs/modernization/debt.md +++ b/docs/modernization/debt.md @@ -399,6 +399,13 @@ agent or engineer to remove them without reconstructing context from chat. raw state/copy callback cluster. Renderer services still need to own state snapshot/restore and framebuffer-copy execution before these bridges can be removed. +- 2026-06-05: DEBT-0036 was narrowed again. Retained app startup, app clear, + app UI viewport/scissor, command-convert renderer state, and desktop VR + draw-state endpoints now share `legacy_ui_gl_dispatch`, so `src/app.cpp`, + `src/app_commands.cpp`, and `src/app_vr.cpp` no longer carry duplicated raw + callback clusters for capability, blend, clear, viewport, scissor, active + texture, or 2D texture-unbind execution. Renderer services still need to own + app and VR command execution before these bridges can be removed. ## Open Debt @@ -437,7 +444,7 @@ agent or engineer to remove them without reconstructing context from chat. | DEBT-0033 | Open | Modernization | Tools menu planning and direct command execution dispatch now consume pure `pp_app_core` through `App::init_menu_tools`, `pano_cli plan-tools-menu`, `pano_cli plan-tools-panel`, `pano_cli plan-canvas-camera-reset`, `pano_cli plan-canvas-view-density`, `pano_cli plan-canvas-view-cursor-mode`, and the `ToolsMenuServices` boundary, direct command execution is centralized in `src/legacy_app_shell_services.*`, SonarPen availability/startup now routes through `PlatformServices`, and reset-camera, viewport-density, and cursor-mode execution now share `src/legacy_canvas_view_services.*`, but live adapters still construct legacy `NodePanelFloating` panels, mutate legacy panel nodes, clear `CanvasModeGrid`, open legacy shortcuts UI, mutate retained `Canvas` camera/density/cursor state, write retained `Settings`, and rely on the legacy platform adapter for the retained iOS SonarPen bridge | Preserve current Tools menu and canvas-view behavior while UI shell actions move toward app/UI/platform/canvas services | `pp_app_core_tools_menu_tests`; `pp_app_core_canvas_view_tests`; `pp_platform_api_tests`; `pano_cli plan-tools-menu --command shortcuts`; `pano_cli plan-tools-panel --panel layers`; `pano_cli plan-tools-panel --panel animation --already-visible`; `pano_cli plan-canvas-camera-reset`; `pano_cli plan-canvas-view-density --density 1.5`; `pano_cli plan-canvas-view-cursor-mode --mode 3`; `ctest --preset desktop-fast --build-config Debug` | Tools panel creation, submenu routing, grid clear, camera reset, viewport density, cursor mode, shortcuts dialog, and SonarPen dispatch are owned by injected app/UI/platform/canvas services with `App::init_menu_tools` and options callbacks acting only as UI adapters and no legacy Tools/canvas-view adapter | | DEBT-0034 | Open | Modernization | About menu command planning and execution dispatch now consume pure `pp_app_core` through `App::init_menu_about`, `pano_cli plan-about-menu`, and the `AboutMenuServices` boundary, and live execution is centralized in `src/legacy_app_shell_services.*`, but the bridge still opens legacy About/manual/what's-new dialogs, invokes the injected crash hook, and runs the legacy Canvas stroke performance test directly | Preserve About menu behavior while dialogs and diagnostics move toward app/UI/platform services | `pp_app_core_about_menu_tests`; `pano_cli plan-about-menu --command news --version-major 2 --version-minor 5 --version-fix 7`; `pano_cli plan-about-menu --command performance --no-canvas`; `ctest --preset desktop-fast --build-config Debug` | About/manual/what's-new dialog dispatch, crash-test dispatch, and performance-test execution are owned by injected app/UI/platform services with `App::init_menu_about` acting only as a UI adapter and no legacy About adapter | | DEBT-0035 | Open | Modernization | Main toolbar/status command planning and execution dispatch now consume pure `pp_app_core` through `App::init_toolbar_main`, `pano_cli plan-main-toolbar`, and the `MainToolbarServices` boundary; toolbar test-message dialog metadata now lives in `pp_app_core` through `plan_main_toolbar_message_dialog`, retained message-box creation routes through `src/legacy_app_dialog_services.*`, history/canvas commands now hand off through `HistoryUiServices` and `DocumentCanvasClearServices`, and live execution is centralized in `src/legacy_app_shell_services.*`, but the bridge still opens legacy open/save/settings dialogs, stores raw compatibility pointers, and delegates to legacy history/canvas adapters | Preserve reachable toolbar/status behavior while app shell commands move toward app/document/UI services | `pp_app_core_main_toolbar_tests`; `pano_cli plan-main-toolbar --command undo --undo-count 2`; `pano_cli plan-main-toolbar --command message-box`; `pano_cli plan-main-toolbar --command clear-canvas --no-canvas`; `ctest --preset desktop-fast --build-config Debug` | Open/save/settings/message-box routing, undo/redo/clear-history execution, and canvas-clear execution are owned by injected app/document/UI services with `App::init_toolbar_main` acting only as a UI adapter and no legacy toolbar adapter | -| DEBT-0036 | Open | Modernization | `pp_renderer_api`, `pp_paint_renderer`, `pano_cli plan-paint-feedback`, and `pano_cli plan-stroke-composite` can choose backend-neutral complex paint feedback strategies for fixed-function blending, framebuffer-fetch-capable renderers, or ping-pong render targets. OpenGL extension detection now stores `pp::renderer::RenderDeviceFeatures` through `ShaderManager`, using `pp_renderer_gl::query_opengl_capability_detection`, `detect_opengl_feature_state`, and `render_device_features` as the backend conversion point; that feature snapshot now includes float32-linear filtering, so canvas stroke texture format selection, renderer diagnostics, grid lightmap render planning, and grid bake target selection no longer read `ShaderManager::ext_*` flags directly. `pp_paint_renderer::plan_canvas_blend_gate` owns the compatibility mapping from persisted layer/brush blend indices to the extracted stroke-composite planner, and live `Canvas::draw_merge` plus `NodeCanvas` panorama rendering both call it with the stored renderer-neutral feature set for their existing shader-blend gates and destination-copy versus framebuffer-fetch decisions. `pp_paint_renderer::plan_canvas_stroke_feedback` also owns the current destination-feedback decision, and live `Canvas::stroke_draw`, thumbnail layer blending, and `NodeStrokePreview` brush-preview rendering use it for framebuffer-fetch versus destination-copy decisions. The retained `copy_framebuffer_to_texture_2d` utility bridge now routes 2D framebuffer-to-texture copies through tested `pp_renderer_gl` dispatch, retained `RTT::create`/`RTT::destroy` render-target texture parameter setup, optional depth renderbuffer allocation, framebuffer allocation/attachment/status checks, binding restore, and resource deletion now route through tested `pp_renderer_gl` dispatch, retained RTT clear, masked clear with color-write-mask restore, texture bind/unbind, and RGBA8 dirty-region texture writes now route through tested `pp_renderer_gl` dispatch, retained Canvas, NodeCanvas, and NodeStrokePreview texture-unit switches now route through tested active-texture dispatch, retained Canvas, NodeCanvas, NodeStrokePreview, and desktop HMD viewport/scissor/capability execution now route through tested `pp_renderer_gl` dispatch adapters, retained NodeCanvas, CanvasMode, and NodePanelGrid capability-state snapshots now route through tested `pp_renderer_gl` query dispatch, CanvasLayer cube/equirect generation plus frame clears now share `legacy_ui_gl_dispatch` for active-texture selection, cube texture binding, viewport execution, blend capability execution, clear-color query/restore, and color-buffer clear adapter endpoints backed by tested `pp_renderer_gl` dispatch helpers, while the cube-face framebuffer-to-texture copy now uses the shared retained `copy_framebuffer_to_texture_target` utility bridge backed by tested `pp_renderer_gl` dispatch and remains tracked by DEBT-0036 until renderer services own copy execution, `NodePanelGrid` live heightmap draw and bake setup now route depth/blend state, depth clears, color-write-mask toggles, active texture selection, bake viewport execution, sun-overlay viewport query, and desktop texture-resize readback through tested `pp_renderer_gl` dispatch adapters; its active-texture, depth/blend capability query/apply, viewport query/execution, depth-clear, and color-write-mask adapter endpoints now share `legacy_ui_gl_dispatch`, retained CanvasMode overlay/mask/transform paths now route active texture, depth/blend state, transform/cut viewport execution, paint-mode blend/depth state snapshots, and canvas-tip pick framebuffer readback through tested `pp_renderer_gl` dispatch adapters; their active-texture, capability query/apply, viewport, read-framebuffer query, and RGBA8 pixel-readback adapter endpoints now share `legacy_ui_gl_dispatch`, retained simple UI draw paths now share `legacy_ui_gl_dispatch` for blend-state execution, fallback 2D texture unbinds, `NodeViewport` viewport query/restore, color-buffer clears, and clear-color restore, retained `NodeCanvas` plus `NodeStrokePreview` draw-state paths now share `legacy_ui_gl_dispatch` for active-texture selection, fallback texture unbind, viewport/scissor execution, viewport and clear-color queries, color-buffer clears, clear-color restore, and capability query/apply adapter endpoints backed by tested `pp_renderer_gl` dispatch helpers, retained `Canvas` stroke/object/thumbnail/export/frame-clear state endpoints now share `legacy_ui_gl_dispatch` for active-texture selection, fallback texture unbind, viewport/scissor execution, viewport and clear-color query, clear-color restore, and capability query/apply adapter endpoints, retained Canvas and RTT depth renderbuffer allocation/attachment/delete now share `legacy_gl_renderbuffer_dispatch` while renderer-resource ownership remains retained, retained `Texture2D`, `TextureCube`, and RTT texture allocation/delete/bind/parameter/update/mipmap dispatch now share `legacy_gl_texture_dispatch` while renderer-resource ownership remains retained, retained `Texture2D` readback plus RTT framebuffer allocation/delete/bind/restore/blit/readback and PBO readback dispatch now share `legacy_gl_framebuffer_dispatch` while renderer-resource ownership remains retained, retained Sampler create/parameter/border/bind dispatch shares `legacy_gl_sampler_dispatch` and retained PBO allocation/readback/map/unmap/delete dispatch shares `legacy_gl_pixel_buffer_dispatch` while renderer-resource ownership remains retained, retained `Shape`, `TextMesh`, and `NodeColorWheel` mesh buffer/VAO creation/upload/draw/delete dispatch now share `legacy_gl_mesh_dispatch` while renderer-resource ownership remains retained, retained shader source compilation/deletion, program attach/link/use/delete, attribute rebinding/location lookup, active-uniform enumeration, uniform-location discovery, and uniform writes now share `legacy_gl_shader_dispatch` while shader-program ownership remains retained, retained `gl_state` save/restore and `copy_framebuffer_to_texture_target` now reuse shared retained UI/framebuffer/shader/sampler bridge callbacks while renderer state and framebuffer-copy execution remain retained, and retained `CanvasLayer` frame-clear draw-state paths route saved clear-color query and restore through the same tested helpers, but actual live stroke rasterization, dual-brush compositing, pattern feedback math, thumbnail layer compositing, brush-preview compositing, grid lightmap/heightmap mesh rendering, and the retained `ShaderManager::ext_*` compatibility fields still use legacy OpenGL canvas/UI execution | Preserve current painting behavior while the renderer boundary matures for OpenGL parity and later Vulkan/Metal experiments | `pp_renderer_api_tests`; `pp_renderer_gl_capabilities_tests`; `pp_paint_renderer_compositor_tests`; `pano_cli plan-paint-feedback --framebuffer-fetch --explicit-transitions --render-only`; `pano_cli plan-paint-feedback --texture-copy`; `pano_cli plan-stroke-composite --stroke-blend 10 --framebuffer-fetch --explicit-transitions --render-only`; `pano_cli plan-stroke-composite --layer-blend 4 --dual-blend --texture-copy`; `ctest --preset desktop-fast --build-config Debug`; `cmake --build --preset windows-msvc-default --config Debug --target PanoPainter` | Live stroke/layer compositing chooses its feedback path through `pp_paint_renderer` and renderer services, with OpenGL golden parity and Vulkan/Metal lab tests covering framebuffer-fetch and ping-pong behavior | +| DEBT-0036 | Open | Modernization | `pp_renderer_api`, `pp_paint_renderer`, `pano_cli plan-paint-feedback`, and `pano_cli plan-stroke-composite` can choose backend-neutral complex paint feedback strategies for fixed-function blending, framebuffer-fetch-capable renderers, or ping-pong render targets. OpenGL extension detection now stores `pp::renderer::RenderDeviceFeatures` through `ShaderManager`, using `pp_renderer_gl::query_opengl_capability_detection`, `detect_opengl_feature_state`, and `render_device_features` as the backend conversion point; that feature snapshot now includes float32-linear filtering, so canvas stroke texture format selection, renderer diagnostics, grid lightmap render planning, and grid bake target selection no longer read `ShaderManager::ext_*` flags directly. `pp_paint_renderer::plan_canvas_blend_gate` owns the compatibility mapping from persisted layer/brush blend indices to the extracted stroke-composite planner, and live `Canvas::draw_merge` plus `NodeCanvas` panorama rendering both call it with the stored renderer-neutral feature set for their existing shader-blend gates and destination-copy versus framebuffer-fetch decisions. `pp_paint_renderer::plan_canvas_stroke_feedback` also owns the current destination-feedback decision, and live `Canvas::stroke_draw`, thumbnail layer blending, and `NodeStrokePreview` brush-preview rendering use it for framebuffer-fetch versus destination-copy decisions. The retained `copy_framebuffer_to_texture_2d` utility bridge now routes 2D framebuffer-to-texture copies through tested `pp_renderer_gl` dispatch, retained `RTT::create`/`RTT::destroy` render-target texture parameter setup, optional depth renderbuffer allocation, framebuffer allocation/attachment/status checks, binding restore, and resource deletion now route through tested `pp_renderer_gl` dispatch, retained RTT clear, masked clear with color-write-mask restore, texture bind/unbind, and RGBA8 dirty-region texture writes now route through tested `pp_renderer_gl` dispatch, retained Canvas, NodeCanvas, and NodeStrokePreview texture-unit switches now route through tested active-texture dispatch, retained Canvas, NodeCanvas, NodeStrokePreview, and desktop HMD viewport/scissor/capability execution now route through tested `pp_renderer_gl` dispatch adapters, retained NodeCanvas, CanvasMode, and NodePanelGrid capability-state snapshots now route through tested `pp_renderer_gl` query dispatch, CanvasLayer cube/equirect generation plus frame clears now share `legacy_ui_gl_dispatch` for active-texture selection, cube texture binding, viewport execution, blend capability execution, clear-color query/restore, and color-buffer clear adapter endpoints backed by tested `pp_renderer_gl` dispatch helpers, while the cube-face framebuffer-to-texture copy now uses the shared retained `copy_framebuffer_to_texture_target` utility bridge backed by tested `pp_renderer_gl` dispatch and remains tracked by DEBT-0036 until renderer services own copy execution, `NodePanelGrid` live heightmap draw and bake setup now route depth/blend state, depth clears, color-write-mask toggles, active texture selection, bake viewport execution, sun-overlay viewport query, and desktop texture-resize readback through tested `pp_renderer_gl` dispatch adapters; its active-texture, depth/blend capability query/apply, viewport query/execution, depth-clear, and color-write-mask adapter endpoints now share `legacy_ui_gl_dispatch`, retained CanvasMode overlay/mask/transform paths now route active texture, depth/blend state, transform/cut viewport execution, paint-mode blend/depth state snapshots, and canvas-tip pick framebuffer readback through tested `pp_renderer_gl` dispatch adapters; their active-texture, capability query/apply, viewport, read-framebuffer query, and RGBA8 pixel-readback adapter endpoints now share `legacy_ui_gl_dispatch`, retained simple UI draw paths now share `legacy_ui_gl_dispatch` for blend-state execution, fallback 2D texture unbinds, `NodeViewport` viewport query/restore, color-buffer clears, and clear-color restore, retained `NodeCanvas` plus `NodeStrokePreview` draw-state paths now share `legacy_ui_gl_dispatch` for active-texture selection, fallback texture unbind, viewport/scissor execution, viewport and clear-color queries, color-buffer clears, clear-color restore, and capability query/apply adapter endpoints backed by tested `pp_renderer_gl` dispatch helpers, retained `Canvas` stroke/object/thumbnail/export/frame-clear state endpoints now share `legacy_ui_gl_dispatch` for active-texture selection, fallback texture unbind, viewport/scissor execution, viewport and clear-color query, clear-color restore, and capability query/apply adapter endpoints, retained Canvas and RTT depth renderbuffer allocation/attachment/delete now share `legacy_gl_renderbuffer_dispatch` while renderer-resource ownership remains retained, retained `Texture2D`, `TextureCube`, and RTT texture allocation/delete/bind/parameter/update/mipmap dispatch now share `legacy_gl_texture_dispatch` while renderer-resource ownership remains retained, retained `Texture2D` readback plus RTT framebuffer allocation/delete/bind/restore/blit/readback and PBO readback dispatch now share `legacy_gl_framebuffer_dispatch` while renderer-resource ownership remains retained, retained Sampler create/parameter/border/bind dispatch shares `legacy_gl_sampler_dispatch` and retained PBO allocation/readback/map/unmap/delete dispatch shares `legacy_gl_pixel_buffer_dispatch` while renderer-resource ownership remains retained, retained `Shape`, `TextMesh`, and `NodeColorWheel` mesh buffer/VAO creation/upload/draw/delete dispatch now share `legacy_gl_mesh_dispatch` while renderer-resource ownership remains retained, retained shader source compilation/deletion, program attach/link/use/delete, attribute rebinding/location lookup, active-uniform enumeration, uniform-location discovery, and uniform writes now share `legacy_gl_shader_dispatch` while shader-program ownership remains retained, retained `gl_state` save/restore and `copy_framebuffer_to_texture_target` now reuse shared retained UI/framebuffer/shader/sampler bridge callbacks while renderer state and framebuffer-copy execution remain retained, retained app startup, app clear, app UI viewport/scissor, command-convert renderer state, and desktop VR draw-state endpoints now share `legacy_ui_gl_dispatch` while app/VR renderer execution remains retained, and retained `CanvasLayer` frame-clear draw-state paths route saved clear-color query and restore through the same tested helpers, but actual live stroke rasterization, dual-brush compositing, pattern feedback math, thumbnail layer compositing, brush-preview compositing, grid lightmap/heightmap mesh rendering, and the retained `ShaderManager::ext_*` compatibility fields still use legacy OpenGL canvas/UI execution | Preserve current painting behavior while the renderer boundary matures for OpenGL parity and later Vulkan/Metal experiments | `pp_renderer_api_tests`; `pp_renderer_gl_capabilities_tests`; `pp_paint_renderer_compositor_tests`; `pano_cli plan-paint-feedback --framebuffer-fetch --explicit-transitions --render-only`; `pano_cli plan-paint-feedback --texture-copy`; `pano_cli plan-stroke-composite --stroke-blend 10 --framebuffer-fetch --explicit-transitions --render-only`; `pano_cli plan-stroke-composite --layer-blend 4 --dual-blend --texture-copy`; `ctest --preset desktop-fast --build-config Debug`; `cmake --build --preset windows-msvc-default --config Debug --target PanoPainter` | Live stroke/layer compositing chooses its feedback path through `pp_paint_renderer` and renderer services, with OpenGL golden parity and Vulkan/Metal lab tests covering framebuffer-fetch and ping-pong behavior | | DEBT-0037 | Open | Modernization | Recording lifecycle/export planning, export progress-dialog metadata, and execution dispatch now consume pure `pp_app_core` through `App::rec_start`, `App::rec_stop`, `App::rec_clear`, `App::rec_export`, `pano_cli plan-recording-session`, and the `RecordingServices` boundary; live execution is centralized in `src/legacy_recording_services.*`, retained MP4 export progress bar creation routes through `src/legacy_app_dialog_services.*`, and retained `PBO` allocation/readback/map/unmap/delete operations now route through tested `pp_renderer_gl` dispatch, but the bridge still owns legacy recording thread startup/shutdown, platform recorded-file cleanup, progress lifetime, retained `App::rec_loop` readback call sites, and `MP4Encoder::write_mp4` execution | Preserve current timelapse/MP4 behavior while recording moves toward app/document/renderer/video services | `pp_app_core_document_recording_tests`; `pp_renderer_gl_capabilities_tests`; `pano_cli plan-recording-session --running --frame-count 12`; `pano_cli plan-recording-session --platform-deletes-recorded-files`; `ctest --preset desktop-fast --build-config Debug` | Recording thread lifecycle, frame readback scheduling, platform cleanup, progress reporting, and MP4 writing are owned by injected app/renderer/video services with `App` methods acting only as adapters | | DEBT-0038 | Open | Modernization | Cloud upload/browse/bulk planning, cloud prompt/progress metadata, and execution dispatch now consume pure `pp_app_core` through `App::cloud_upload`, `App::cloud_upload_all`, `App::cloud_browse`, `pano_cli plan-cloud-upload`, `pano_cli plan-cloud-upload-all`, `pano_cli plan-cloud-browse`, `pano_cli plan-cloud-transfer`, and the `CloudServices` boundary; live execution is centralized in `src/legacy_cloud_services.*`, the app-owned `upload`/`download` CURL helpers now consume `pp_app_core` cloud transfer request/progress planning and the platform TLS-verification bypass policy before retained CURL setup, upload warning/publish/success prompts, upload/bulk progress dialog titles, download-progress prompt metadata, and formatted download progress text come from tested app-core plans, retained cloud prompt/progress creation routes through `src/legacy_app_dialog_services.*` via `App::message_box`/`App::show_progress` or direct bridge calls, and retained `Asset::open_url`, `LogRemote::net_init`, and `NodeDialogCloud::load_thumbs_thread` curl sites consume the `pp_platform_api` default TLS policy helper instead of spelling Android branches locally, but the bridge still uses legacy save-before-upload, app-owned curl helpers instead of an injected network service, upload form construction, response/error handling, retained prompt/progress lifetime, OpenGL context guarding, `NodeDialogCloud`, `Canvas` project open, layer refresh, and `ActionManager` reset | Preserve current cloud behavior while cloud/network/document import flows move toward app/document/platform services | `pp_app_core_document_cloud_tests`; `pp_platform_api_tests`; `pano_cli plan-cloud-upload --new-document --unsaved`; `pano_cli plan-cloud-browse --selected-file demo.ppi`; `pano_cli plan-cloud-upload-all --file-count 3`; `pano_cli plan-cloud-transfer --direction download --progress --disable-tls-verification`; `ctest --preset desktop-fast --build-config Debug` | Cloud upload/download, TLS policy, save-before-upload, progress reporting, cloud browse dialog, downloaded project opening, layer refresh, OpenGL context ownership, and action-history reset are owned by injected app/document/network/platform/renderer services with `App` methods acting only as adapters | | DEBT-0039 | Open | Modernization | Document-open planning and execution dispatch now consume pure `pp_app_core` through `App::open_document`, `pano_cli plan-open-route`, `DocumentOpenServices`, and `src/legacy_document_open_services.*`, but the bridge still opens ABR/PPBR import prompts before delegating import execution to `src/legacy_brush_package_import_services.*`, applies unsaved-project discard prompts, calls legacy project-open execution, refreshes layer UI, updates the app title, and clears legacy history directly | Preserve current file-open/import behavior while document loading and brush import move toward app/document/asset/UI services | `pp_app_core_document_route_tests`; `pp_app_core_document_session_tests`; `pano_cli plan-open-route --path D:/Paint/Scenes/demo.ppi --unsaved`; `pano_cli plan-open-route --path D:/Paint/Brushes/clouds.ABR --unsaved`; `ctest --preset desktop-fast --build-config Debug` | Brush import prompting, project-open execution, unsaved-project discard prompting, layer refresh, title updates, and history clearing are owned by injected app/document/asset/UI services with `App::open_document` acting only as an adapter | diff --git a/docs/modernization/roadmap.md b/docs/modernization/roadmap.md index 8993dda..a66692c 100644 --- a/docs/modernization/roadmap.md +++ b/docs/modernization/roadmap.md @@ -883,7 +883,8 @@ debug-output/debug-output-synchronous state enable sequence is now a tested Initial PanoPainter OpenGL depth/blend startup state is now represented and applied by tested `pp_renderer_gl` startup-state contracts; `App::init` delegates to the backend dispatch path instead of hard-coding the policy or -operation order. +operation order, and its retained callback endpoints now reuse the shared UI +GL bridge instead of a local raw callback cluster. OpenGL runtime version/vendor/renderer/GLSL string queries now also use a tested `pp_renderer_gl` dispatch contract, leaving `App::init` to log the result while the backend owns the query set and order. The Windows entrypoint @@ -891,19 +892,24 @@ also uses that contract for early context logging and renderer-name window title construction before replacing the temporary WGL context. The default app clear color and color-buffer clear operation now dispatch through `pp_renderer_gl` as well, moving another direct OpenGL operation out -of `App::clear` while preserving the current gray clear behavior. +of `App::clear` while preserving the current gray clear behavior; the live +callback endpoints now share `legacy_ui_gl_dispatch`. Main app UI viewport and scissor execution now dispatch through tested `pp_renderer_gl` viewport/scissor contracts, leaving `App::draw` and UI node clipping to provide rectangles while the backend owns scissor-state tokens and -the live OpenGL call sequence. +the live OpenGL call sequence. The retained viewport/scissor callback endpoints +now share `legacy_ui_gl_dispatch`. VR UI framebuffer viewport and scissor-test setup now also consumes those `pp_renderer_gl` contracts, keeping desktop and VR UI rendering aligned while -the retained OpenVR app path is split incrementally. +the retained OpenVR app path is split incrementally; its retained callback +endpoints now reuse the shared UI GL bridge. VR draw blend/depth state snapshots, transitions, restore, and depth-buffer clears, active texture unit switches, and fallback 2D texture unbinds now use generic tested `pp_renderer_gl` capability query/apply, clear, active-texture, and texture-bind dispatch contracts, reducing direct OpenGL execution in the -retained VR app path without changing state restore behavior. +retained VR app path without changing state restore behavior. The remaining +retained VR draw adapter endpoints for these calls now share +`legacy_ui_gl_dispatch`. The retained `gl_state` save/restore utility now snapshots and restores through tested `pp_renderer_gl` saved-state dispatch contracts, covering capability state, viewport, clear color, framebuffer/program bindings, active texture, @@ -2592,6 +2598,13 @@ Results: `legacy_gl_shader_dispatch`, and `legacy_gl_sampler_dispatch`, removing the local raw state/copy callback cluster from `src/util.cpp` while renderer state and framebuffer-copy execution remain retained under DEBT-0036. +- Retained app startup, app clear, app UI viewport/scissor, command-convert + renderer state, and desktop VR draw-state endpoints now share + `legacy_ui_gl_dispatch` for capability, blend equation, clear, viewport, + scissor, active-texture, and 2D texture-unbind callbacks, removing duplicated + local raw callback clusters from `src/app.cpp`, `src/app_commands.cpp`, and + `src/app_vr.cpp` while app/VR renderer execution remains retained under + DEBT-0036. - Canvas draw-merge shader-blend selection now consumes the extracted `pp_paint_renderer` stroke composite planner for current layer and primary brush blend modes, while preserving legacy OpenGL compositing execution under diff --git a/src/app.cpp b/src/app.cpp index 8621d33..1065627 100644 --- a/src/app.cpp +++ b/src/app.cpp @@ -19,6 +19,7 @@ #include "legacy_document_open_services.h" #include "legacy_document_session_services.h" #include "legacy_recording_services.h" +#include "legacy_ui_gl_dispatch.h" #include "platform_api/platform_services.h" #include "renderer_gl/opengl_capabilities.h" @@ -41,11 +42,6 @@ namespace { return reinterpret_cast(glGetString(static_cast(name))); } -void enable_opengl_state(std::uint32_t state) noexcept -{ - glEnable(static_cast(state)); -} - pp::app::CanvasToolMode canvas_tool_mode_from_canvas_mode(kCanvasMode mode) noexcept { switch (mode) { @@ -76,47 +72,12 @@ pp::app::CanvasToolMode canvas_tool_mode_from_canvas_mode(kCanvasMode mode) noex } } -void disable_opengl_state(std::uint32_t state) noexcept -{ - glDisable(static_cast(state)); -} - -void set_opengl_blend_func(std::uint32_t source_factor, std::uint32_t destination_factor) noexcept -{ - glBlendFunc(static_cast(source_factor), static_cast(destination_factor)); -} - -void set_opengl_blend_equation_separate(std::uint32_t color_equation, std::uint32_t alpha_equation) noexcept -{ - glBlendEquationSeparate(static_cast(color_equation), static_cast(alpha_equation)); -} - -void clear_opengl_color(float r, float g, float b, float a) noexcept -{ - glClearColor(r, g, b, a); -} - -void clear_opengl_buffers(std::uint32_t mask) noexcept -{ - glClear(static_cast(mask)); -} - -void set_opengl_viewport(std::int32_t x, std::int32_t y, std::int32_t width, std::int32_t height) noexcept -{ - glViewport(static_cast(x), static_cast(y), static_cast(width), static_cast(height)); -} - -void set_opengl_scissor(std::int32_t x, std::int32_t y, std::int32_t width, std::int32_t height) noexcept -{ - glScissor(static_cast(x), static_cast(y), static_cast(width), static_cast(height)); -} - void apply_app_viewport(pp::renderer::gl::OpenGlViewportRect viewport) { const auto status = pp::renderer::gl::apply_opengl_viewport( viewport, pp::renderer::gl::OpenGlViewportDispatch { - .viewport = set_opengl_viewport, + .viewport = pp::legacy::ui_gl::set_opengl_viewport, }); if (!status.ok()) LOG("OpenGL viewport failed: %s", status.message); @@ -127,9 +88,9 @@ void apply_app_scissor(pp::renderer::gl::OpenGlScissorRect scissor) const auto status = pp::renderer::gl::apply_opengl_scissor_rect( scissor, pp::renderer::gl::OpenGlScissorDispatch { - .enable = enable_opengl_state, - .disable = disable_opengl_state, - .scissor = set_opengl_scissor, + .enable = pp::legacy::ui_gl::enable_opengl_state, + .disable = pp::legacy::ui_gl::disable_opengl_state, + .scissor = pp::legacy::ui_gl::set_opengl_scissor, }); if (!status.ok()) LOG("OpenGL scissor failed: %s", status.message); @@ -140,8 +101,8 @@ void apply_app_scissor_test(bool enabled) const auto status = pp::renderer::gl::apply_opengl_scissor_test( enabled, pp::renderer::gl::OpenGlScissorTestDispatch { - .enable = enable_opengl_state, - .disable = disable_opengl_state, + .enable = pp::legacy::ui_gl::enable_opengl_state, + .disable = pp::legacy::ui_gl::disable_opengl_state, }); if (!status.ok()) LOG("OpenGL scissor test failed: %s", status.message); @@ -225,8 +186,8 @@ void App::clear() { const auto status = pp::renderer::gl::clear_panopainter_default_target( pp::renderer::gl::OpenGlClearDispatch { - .clear_color = clear_opengl_color, - .clear = clear_opengl_buffers, + .clear_color = pp::legacy::ui_gl::set_opengl_clear_color, + .clear = pp::legacy::ui_gl::clear_opengl_buffer, }); if (!status.ok()) LOG("OpenGL clear failed: %s", status.message); @@ -462,10 +423,10 @@ void App::init() App::I->apply_render_platform_hints(); const auto startup_state_status = pp::renderer::gl::apply_panopainter_initial_state( pp::renderer::gl::OpenGlStateDispatch { - .enable = enable_opengl_state, - .disable = disable_opengl_state, - .blend_func = set_opengl_blend_func, - .blend_equation_separate = set_opengl_blend_equation_separate, + .enable = pp::legacy::ui_gl::enable_opengl_state, + .disable = pp::legacy::ui_gl::disable_opengl_state, + .blend_func = pp::legacy::ui_gl::set_opengl_blend_func, + .blend_equation_separate = pp::legacy::ui_gl::set_opengl_blend_equation_separate, }); if (!startup_state_status.ok()) LOG("OpenGL startup state failed: %s", startup_state_status.message); diff --git a/src/app_commands.cpp b/src/app_commands.cpp index f0a5ebf..3d94ee0 100644 --- a/src/app_commands.cpp +++ b/src/app_commands.cpp @@ -2,39 +2,20 @@ #include "app_core/command_convert.h" #include "app.h" #include "canvas.h" +#include "legacy_ui_gl_dispatch.h" #include "log.h" #include "renderer_gl/opengl_capabilities.h" namespace { -void enable_opengl_state(std::uint32_t state) noexcept -{ - glEnable(static_cast(state)); -} - -void disable_opengl_state(std::uint32_t state) noexcept -{ - glDisable(static_cast(state)); -} - -void set_opengl_blend_func(std::uint32_t source_factor, std::uint32_t destination_factor) noexcept -{ - glBlendFunc(static_cast(source_factor), static_cast(destination_factor)); -} - -void set_opengl_blend_equation(std::uint32_t equation) noexcept -{ - glBlendEquation(static_cast(equation)); -} - void apply_convert_command_state() { const auto status = pp::renderer::gl::apply_panopainter_convert_command_state( pp::renderer::gl::OpenGlConvertCommandStateDispatch { - .enable = enable_opengl_state, - .disable = disable_opengl_state, - .blend_func = set_opengl_blend_func, - .blend_equation = set_opengl_blend_equation, + .enable = pp::legacy::ui_gl::enable_opengl_state, + .disable = pp::legacy::ui_gl::disable_opengl_state, + .blend_func = pp::legacy::ui_gl::set_opengl_blend_func, + .blend_equation = pp::legacy::ui_gl::set_opengl_blend_equation, }); if (!status.ok()) LOG("OpenGL convert command state failed: %s", status.message); diff --git a/src/app_vr.cpp b/src/app_vr.cpp index 4dd6b18..f737998 100644 --- a/src/app_vr.cpp +++ b/src/app_vr.cpp @@ -3,6 +3,7 @@ #include #include "app.h" +#include "legacy_ui_gl_dispatch.h" #include "node_panel_grid.h" #include "util.h" #include "shape.h" @@ -12,55 +13,12 @@ namespace { void set_active_texture_unit(std::uint32_t unit_index) { - const auto status = pp::renderer::gl::activate_opengl_texture_unit( - unit_index, - pp::renderer::gl::OpenGlActiveTextureDispatch { - .active_texture = [](std::uint32_t texture_unit) noexcept - { - glActiveTexture(static_cast(texture_unit)); - }, - }); - if (!status.ok()) - LOG("OpenGL VR active texture dispatch failed: %s", status.message); + pp::legacy::ui_gl::activate_texture_unit(unit_index, "OpenGL VR"); } void unbind_texture_2d() { - const auto status = pp::renderer::gl::bind_opengl_texture_2d( - 0U, - pp::renderer::gl::OpenGlTexture2DBindDispatch { - .bind_texture = [](std::uint32_t target, std::uint32_t texture) noexcept - { - glBindTexture(static_cast(target), static_cast(texture)); - }, - }); - if (!status.ok()) - LOG("OpenGL VR texture unbind dispatch failed: %s", status.message); -} - -void enable_opengl_state(std::uint32_t state) noexcept -{ - glEnable(static_cast(state)); -} - -void disable_opengl_state(std::uint32_t state) noexcept -{ - glDisable(static_cast(state)); -} - -std::uint8_t is_opengl_state_enabled(std::uint32_t state) noexcept -{ - return static_cast(glIsEnabled(static_cast(state))); -} - -void set_opengl_viewport(std::int32_t x, std::int32_t y, std::int32_t width, std::int32_t height) noexcept -{ - glViewport(static_cast(x), static_cast(y), static_cast(width), static_cast(height)); -} - -void clear_opengl_mask(std::uint32_t mask) noexcept -{ - glClear(static_cast(mask)); + pp::legacy::ui_gl::unbind_texture_2d("OpenGL VR"); } void apply_vr_ui_viewport(pp::renderer::gl::OpenGlViewportRect viewport) @@ -68,7 +26,7 @@ void apply_vr_ui_viewport(pp::renderer::gl::OpenGlViewportRect viewport) const auto status = pp::renderer::gl::apply_opengl_viewport( viewport, pp::renderer::gl::OpenGlViewportDispatch { - .viewport = set_opengl_viewport, + .viewport = pp::legacy::ui_gl::set_opengl_viewport, }); if (!status.ok()) LOG("OpenGL VR UI viewport failed: %s", status.message); @@ -79,8 +37,8 @@ void apply_vr_ui_scissor_test(bool enabled) const auto status = pp::renderer::gl::apply_opengl_scissor_test( enabled, pp::renderer::gl::OpenGlScissorTestDispatch { - .enable = enable_opengl_state, - .disable = disable_opengl_state, + .enable = pp::legacy::ui_gl::enable_opengl_state, + .disable = pp::legacy::ui_gl::disable_opengl_state, }); if (!status.ok()) LOG("OpenGL VR UI scissor test failed: %s", status.message); @@ -92,8 +50,8 @@ void apply_vr_render_capability(std::uint32_t state, bool enabled) state, enabled, pp::renderer::gl::OpenGlCapabilityDispatch { - .enable = enable_opengl_state, - .disable = disable_opengl_state, + .enable = pp::legacy::ui_gl::enable_opengl_state, + .disable = pp::legacy::ui_gl::disable_opengl_state, }); if (!status.ok()) LOG("OpenGL VR render state failed: %s", status.message); @@ -104,7 +62,7 @@ bool query_vr_render_capability(std::uint32_t state) const auto result = pp::renderer::gl::query_opengl_capability_state( state, pp::renderer::gl::OpenGlCapabilityStateQueryDispatch { - .is_enabled = is_opengl_state_enabled, + .is_enabled = pp::legacy::ui_gl::is_opengl_state_enabled, }); if (!result.ok()) { LOG("OpenGL VR render state query failed: %s", result.status().message); @@ -118,7 +76,7 @@ void clear_vr_depth_buffer() const auto status = pp::renderer::gl::clear_opengl_buffers( pp::renderer::gl::framebuffer_depth_buffer_mask(), pp::renderer::gl::OpenGlBufferClearDispatch { - .clear = clear_opengl_mask, + .clear = pp::legacy::ui_gl::clear_opengl_buffer, }); if (!status.ok()) LOG("OpenGL VR depth clear failed: %s", status.message); diff --git a/src/legacy_ui_gl_dispatch.h b/src/legacy_ui_gl_dispatch.h index bf04367..77e215e 100644 --- a/src/legacy_ui_gl_dispatch.h +++ b/src/legacy_ui_gl_dispatch.h @@ -43,6 +43,21 @@ inline void set_opengl_clear_color(float r, float g, float b, float a) noexcept glClearColor(r, g, b, a); } +inline void set_opengl_blend_func(std::uint32_t source_factor, std::uint32_t destination_factor) noexcept +{ + glBlendFunc(static_cast(source_factor), static_cast(destination_factor)); +} + +inline void set_opengl_blend_equation(std::uint32_t equation) noexcept +{ + glBlendEquation(static_cast(equation)); +} + +inline void set_opengl_blend_equation_separate(std::uint32_t color_equation, std::uint32_t alpha_equation) noexcept +{ + glBlendEquationSeparate(static_cast(color_equation), static_cast(alpha_equation)); +} + inline void set_opengl_viewport(std::int32_t x, std::int32_t y, std::int32_t width, std::int32_t height) noexcept { glViewport(static_cast(x), static_cast(y), static_cast(width), static_cast(height));