diff --git a/docs/modernization/build-inventory.md b/docs/modernization/build-inventory.md index 88357ea..e434138 100644 --- a/docs/modernization/build-inventory.md +++ b/docs/modernization/build-inventory.md @@ -252,7 +252,8 @@ powershell -ExecutionPolicy Bypass -File scripts\automation\apple-remote-build.p rectangles into full renderer-sized RGBA buffers with layer visibility, opacity, and blend mode applied in document order, then uploading those six faces through the renderer-neutral `IRenderDevice` texture API using the - recording backend. + recording backend. It also covers the shared recorded-upload report helper + consumed by CLI and live export-readiness bridges. - `pano_cli simulate-document-export` exposes the same pure document-to-PPI export, asset-level decode, and document reimport path through JSON automation and is covered by `pano_cli_simulate_document_export_smoke`. @@ -270,16 +271,16 @@ powershell -ExecutionPolicy Bypass -File scripts\automation\apple-remote-build.p exports through the pure `pp_document` PPI writer and reports generated byte counts plus decoded dirty-face counts in `ppiExport` JSON. Payload-complete snapshots also feed the active frame through the `pp_paint_renderer` - document-frame compositor and renderer-neutral recording upload path, + document-frame compositor and renderer-neutral recorded-upload report helper, reporting texture, transition, command, byte, and active-frame payload counts in `rendererUpload` JSON. It is covered by `pano_cli_plan_canvas_document_snapshot_smoke` plus the payload-bearing snapshot smoke. - Live equirectangular, layer, animation-frame, and cube-face export adapters now prepare and log the same payload-bearing canvas document snapshot plus - renderer-neutral active-frame upload report before delegating to retained - `Canvas` export execution. Depth and video export remain on the older retained - path. + shared renderer-neutral active-frame upload report before delegating to + retained `Canvas` export execution. Depth and video export remain on the older + retained path. - `pano_cli save-document-project` writes that pure document export to a PPI file and is covered by `pano_cli_save_document_project_roundtrip_smoke`, which inspects and loads the generated file. diff --git a/docs/modernization/debt.md b/docs/modernization/debt.md index e12b1d9..9e48823 100644 --- a/docs/modernization/debt.md +++ b/docs/modernization/debt.md @@ -494,6 +494,11 @@ agent or engineer to remove them without reconstructing context from chat. payload-bearing canvas document snapshot and renderer-neutral upload report before retained `Canvas` export execution. Failures are logged and retained export still continues. +- 2026-06-05: DEBT-0036 was narrowed again. The renderer-neutral document-frame + recorded-upload report now lives in `pp_paint_renderer` as + `record_document_frame_upload`, with focused compositor coverage, and both + `pano_cli plan-canvas-document-snapshot` plus live export readiness logging + consume that shared helper instead of duplicating command counting. ## Open Debt @@ -532,7 +537,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. Pure document-frame compositing and renderer-neutral six-face texture upload are now covered both by `simulate-document-render` and payload-complete `plan-canvas-document-snapshot` automation, and live equirectangular/layer/animation-frame/cube-face export adapters now prepare the same renderer-neutral upload report before retained Canvas export execution. 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, retained RTT clear and masked-clear endpoints now share `legacy_ui_gl_dispatch` while RTT render-target execution remains retained, retained app startup logging, Windows early context logging/window-title detection, and shader capability detection now share `legacy_gl_runtime_dispatch` while runtime/capability probing 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, export readback/writer execution, 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`; `pano_cli plan-canvas-document-snapshot --captured-face-payloads-per-layer 1`; `ctest --preset desktop-fast --build-config Debug`; `cmake --build --preset windows-msvc-default --config Debug --target PanoPainter` | Live stroke/layer/export 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. Pure document-frame compositing and renderer-neutral six-face texture upload are now covered both by `simulate-document-render` and payload-complete `plan-canvas-document-snapshot` automation, `pp_paint_renderer::record_document_frame_upload` owns the recorded command-count report for document-frame uploads, and live equirectangular/layer/animation-frame/cube-face export adapters now prepare that same renderer-neutral upload report before retained Canvas export execution. 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, retained RTT clear and masked-clear endpoints now share `legacy_ui_gl_dispatch` while RTT render-target execution remains retained, retained app startup logging, Windows early context logging/window-title detection, and shader capability detection now share `legacy_gl_runtime_dispatch` while runtime/capability probing 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, export readback/writer execution, 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`; `pano_cli plan-canvas-document-snapshot --captured-face-payloads-per-layer 1`; `ctest --preset desktop-fast --build-config Debug`; `cmake --build --preset windows-msvc-default --config Debug --target PanoPainter` | Live stroke/layer/export 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 7366808..36d7927 100644 --- a/docs/modernization/roadmap.md +++ b/docs/modernization/roadmap.md @@ -677,13 +677,14 @@ also has a tested pure PPI export helper, and snapshots and reports generated byte/dirty-face summaries. The same automation now feeds payload-complete snapshots through the `pp_paint_renderer` document-frame compositor and renderer-neutral recording upload path, reporting -texture, transition, byte, payload, and command counts. Live save writer -replacement, export adoption, and renderer-owned readback remain under +texture, transition, byte, payload, and command counts through the shared +`record_document_frame_upload` report helper. Live save writer replacement, +export adoption, and renderer-owned readback remain under `DEBT-0010`/`DEBT-0013`/`DEBT-0036`. Live equirectangular, layer, animation-frame, and cube-face export adapters now prepare the same payload-bearing document snapshot and renderer-neutral upload -report before delegating to retained `Canvas` export execution, so export -workflows consume the boundary without changing file output yet. +report helper before delegating to retained `Canvas` export execution, so export +workflows consume the shared renderer boundary without changing file output yet. `pano_cli plan-image-import` exposes app-core planning for File > Import image route decisions, including wide equirectangular images, legacy vertical cube strips, regular transform-placement images, and invalid image dimensions; live @@ -2515,12 +2516,13 @@ Results: - Payload-complete canvas snapshot automation also crosses the renderer boundary now: `pano_cli plan-canvas-document-snapshot` records the same snapshot through the pure document-frame compositor and renderer-neutral - texture upload stream, so agents can validate document/canvas payloads moving - into renderer commands before live canvas export/save writer replacement. + texture upload stream through `pp_paint_renderer::record_document_frame_upload`, + so agents can validate document/canvas payloads moving into renderer commands + before live canvas export/save writer replacement. - Live image/collection/cube export adapters now prepare and log the same - document/canvas plus renderer-upload readiness before retained `Canvas` - export calls. Depth and video export remain on their prior retained paths; - actual image/cube writer replacement remains tracked under export debt. + document/canvas plus shared renderer-upload readiness report before retained + `Canvas` export calls. Depth and video export remain on their prior retained + paths; actual image/cube writer replacement remains tracked under export debt. - Snapshot creation now rejects invalid embedded RGBA8 face payloads before document export or history can persist malformed state. - Package-smoke wrappers validate the Windows CMake app executable/runtime diff --git a/src/legacy_document_export_services.cpp b/src/legacy_document_export_services.cpp index 5d1f3d0..4bf76d9 100644 --- a/src/legacy_document_export_services.cpp +++ b/src/legacy_document_export_services.cpp @@ -5,7 +5,6 @@ #include "app.h" #include "legacy_document_canvas_services.h" #include "paint_renderer/compositor.h" -#include "renderer_api/recording_renderer.h" #include #include @@ -46,41 +45,28 @@ pp::foundation::Status prepare_legacy_document_export_snapshot(App& app, const c return pp::foundation::Status::success(); } - pp::renderer::RecordingRenderDevice render_device; - const auto uploaded = pp::paint_renderer::upload_document_frame_faces( - render_device, + const auto recorded_upload = pp::paint_renderer::record_document_frame_upload( pp::paint_renderer::DocumentFrameUploadRequest { .document = &snapshot.value().document, .frame_index = snapshot.value().document.active_frame_index(), .clear_color = {}, }); - if (!uploaded) { - LOG("%s document export renderer upload failed: %s", context, uploaded.status().message); - return uploaded.status(); - } - - std::size_t upload_commands = 0; - std::size_t transition_commands = 0; - const auto commands = render_device.commands(); - for (const auto& command : commands) { - if (command.kind == pp::renderer::RecordedRenderCommandKind::upload_texture) { - ++upload_commands; - } - if (command.kind == pp::renderer::RecordedRenderCommandKind::transition_texture) { - ++transition_commands; - } + if (!recorded_upload) { + LOG("%s document export renderer upload failed: %s", context, recorded_upload.status().message); + return recorded_upload.status(); } + const auto& uploaded = recorded_upload.value().upload; LOG( "%s document export renderer upload: textures=%zu bytes=%llu transitions=%zu facePayloads=%zu commands=%zu uploadCommands=%zu transitionCommands=%zu", context, - uploaded.value().texture_count, - static_cast(uploaded.value().uploaded_bytes), - uploaded.value().transition_count, - uploaded.value().composite.face_payload_count, - commands.size(), - upload_commands, - transition_commands); + uploaded.texture_count, + static_cast(uploaded.uploaded_bytes), + uploaded.transition_count, + uploaded.composite.face_payload_count, + recorded_upload.value().command_count, + recorded_upload.value().upload_command_count, + recorded_upload.value().transition_command_count); return pp::foundation::Status::success(); } diff --git a/src/paint_renderer/compositor.cpp b/src/paint_renderer/compositor.cpp index 30c08a2..b1cd115 100644 --- a/src/paint_renderer/compositor.cpp +++ b/src/paint_renderer/compositor.cpp @@ -1,5 +1,7 @@ #include "paint_renderer/compositor.h" +#include "renderer_api/recording_renderer.h" + #include #include #include @@ -412,6 +414,31 @@ pp::foundation::Result upload_document_frame_faces( return pp::foundation::Result::success(std::move(result)); } +pp::foundation::Result record_document_frame_upload( + DocumentFrameUploadRequest request) +{ + pp::renderer::RecordingRenderDevice render_device; + auto uploaded = upload_document_frame_faces(render_device, request); + if (!uploaded) { + return pp::foundation::Result::failure(uploaded.status()); + } + + RecordedDocumentFrameUploadResult result; + result.upload = std::move(uploaded.value()); + const auto commands = render_device.commands(); + result.command_count = commands.size(); + for (const auto& command : commands) { + if (command.kind == pp::renderer::RecordedRenderCommandKind::upload_texture) { + ++result.upload_command_count; + } + if (command.kind == pp::renderer::RecordedRenderCommandKind::transition_texture) { + ++result.transition_command_count; + } + } + + return pp::foundation::Result::success(std::move(result)); +} + bool stroke_composite_requires_feedback( pp::paint::BlendMode layer_blend_mode, pp::paint::StrokeBlendMode stroke_blend_mode, diff --git a/src/paint_renderer/compositor.h b/src/paint_renderer/compositor.h index 0efec3f..0e65e68 100644 --- a/src/paint_renderer/compositor.h +++ b/src/paint_renderer/compositor.h @@ -132,6 +132,13 @@ struct DocumentFrameUploadResult { std::uint64_t uploaded_bytes = 0; }; +struct RecordedDocumentFrameUploadResult { + DocumentFrameUploadResult upload {}; + std::size_t command_count = 0; + std::size_t upload_command_count = 0; + std::size_t transition_command_count = 0; +}; + [[nodiscard]] pp::foundation::Status composite_layer( std::span destination, pp::renderer::Extent2D extent, @@ -147,6 +154,9 @@ struct DocumentFrameUploadResult { pp::renderer::IRenderDevice& device, DocumentFrameUploadRequest request); +[[nodiscard]] pp::foundation::Result record_document_frame_upload( + DocumentFrameUploadRequest request); + [[nodiscard]] bool stroke_composite_requires_feedback( pp::paint::BlendMode layer_blend_mode, pp::paint::StrokeBlendMode stroke_blend_mode, diff --git a/tests/paint_renderer/compositor_tests.cpp b/tests/paint_renderer/compositor_tests.cpp index 4ba5b05..09497ba 100644 --- a/tests/paint_renderer/compositor_tests.cpp +++ b/tests/paint_renderer/compositor_tests.cpp @@ -541,6 +541,62 @@ void uploads_document_frame_faces_to_renderer_api(pp::tests::Harness& h) PP_EXPECT(h, transition_count == pp::document::cube_face_count); } +void records_document_frame_upload_report(pp::tests::Harness& h) +{ + const AnimationFrame root_frames[] { + { .duration_ms = 100, .face_pixels = {} }, + }; + const AnimationFrame layer_frames[] { + { + .duration_ms = 100, + .face_pixels = { + LayerFacePixels { + .face_index = 1, + .x = 0, + .y = 0, + .width = 1, + .height = 1, + .rgba8 = { 0, 0, 255, 255 }, + }, + }, + }, + }; + const DocumentLayerConfig layers[] { + { + .name = "Paint", + .frames = std::span(layer_frames, 1), + }, + }; + const auto document = CanvasDocument::create_from_snapshot(DocumentSnapshotConfig { + .width = 1, + .height = 1, + .layers = std::span(layers, 1), + .frames = std::span(root_frames, 1), + .selection_masks = {}, + }); + PP_EXPECT(h, document); + if (!document) { + return; + } + + const auto report = pp::paint_renderer::record_document_frame_upload( + pp::paint_renderer::DocumentFrameUploadRequest { + .document = &document.value(), + .frame_index = 0, + }); + + PP_EXPECT(h, report); + if (report) { + PP_EXPECT(h, report.value().upload.texture_count == pp::document::cube_face_count); + PP_EXPECT(h, report.value().upload.transition_count == pp::document::cube_face_count); + PP_EXPECT(h, report.value().upload.uploaded_bytes == 24U); + PP_EXPECT(h, report.value().upload.composite.face_payload_count == 1U); + PP_EXPECT(h, report.value().command_count == 12U); + PP_EXPECT(h, report.value().upload_command_count == pp::document::cube_face_count); + PP_EXPECT(h, report.value().transition_command_count == pp::document::cube_face_count); + } +} + void document_frame_upload_rejects_invalid_requests(pp::tests::Harness& h) { RecordingRenderDevice device; @@ -922,6 +978,7 @@ int main() harness.run("composites_document_frame_cube_faces", composites_document_frame_cube_faces); harness.run("document_frame_composite_rejects_invalid_requests", document_frame_composite_rejects_invalid_requests); harness.run("uploads_document_frame_faces_to_renderer_api", uploads_document_frame_faces_to_renderer_api); + harness.run("records_document_frame_upload_report", records_document_frame_upload_report); harness.run("document_frame_upload_rejects_invalid_requests", document_frame_upload_rejects_invalid_requests); harness.run("detects_feedback_requirements", detects_feedback_requirements); harness.run("plans_stroke_composite_paths", plans_stroke_composite_paths); diff --git a/tools/pano_cli/main.cpp b/tools/pano_cli/main.cpp index 7f06016..549cfad 100644 --- a/tools/pano_cli/main.cpp +++ b/tools/pano_cli/main.cpp @@ -6024,36 +6024,26 @@ int plan_canvas_document_snapshot(int argc, char** argv) ppi_export_bytes = exported.value().bytes.size(); ppi_export_dirty_faces = decoded.value().project.body.summary.dirty_face_count; - constexpr pp::paint::Rgba clear_color {}; - pp::renderer::RecordingRenderDevice render_device; - const auto uploaded = pp::paint_renderer::upload_document_frame_faces( - render_device, + const auto recorded_upload = pp::paint_renderer::record_document_frame_upload( pp::paint_renderer::DocumentFrameUploadRequest { .document = &document, .frame_index = document.active_frame_index(), - .clear_color = clear_color, + .clear_color = {}, }); - if (!uploaded) { - print_error("plan-canvas-document-snapshot", uploaded.status().message); + if (!recorded_upload) { + print_error("plan-canvas-document-snapshot", recorded_upload.status().message); return 2; } renderer_upload_ready = true; - renderer_texture_count = uploaded.value().texture_count; - renderer_transition_count = uploaded.value().transition_count; - renderer_uploaded_bytes = uploaded.value().uploaded_bytes; - renderer_face_payloads = uploaded.value().composite.face_payload_count; - renderer_composited_layer_faces = uploaded.value().composite.composited_layer_face_count; - const auto commands = render_device.commands(); - renderer_command_count = commands.size(); - for (const auto& command : commands) { - if (command.kind == pp::renderer::RecordedRenderCommandKind::upload_texture) { - ++renderer_upload_command_count; - } - if (command.kind == pp::renderer::RecordedRenderCommandKind::transition_texture) { - ++renderer_transition_command_count; - } - } + renderer_texture_count = recorded_upload.value().upload.texture_count; + renderer_transition_count = recorded_upload.value().upload.transition_count; + renderer_uploaded_bytes = recorded_upload.value().upload.uploaded_bytes; + renderer_face_payloads = recorded_upload.value().upload.composite.face_payload_count; + renderer_composited_layer_faces = recorded_upload.value().upload.composite.composited_layer_face_count; + renderer_command_count = recorded_upload.value().command_count; + renderer_upload_command_count = recorded_upload.value().upload_command_count; + renderer_transition_command_count = recorded_upload.value().transition_command_count; } std::cout << "{\"ok\":true,\"command\":\"plan-canvas-document-snapshot\""