diff --git a/docs/modernization/build-inventory.md b/docs/modernization/build-inventory.md index c9f934d..ab00afd 100644 --- a/docs/modernization/build-inventory.md +++ b/docs/modernization/build-inventory.md @@ -548,9 +548,11 @@ powershell -ExecutionPolicy Bypass -File scripts\automation\apple-remote-build.p viewport changes through tested `pp_renderer_gl` dispatch adapters. Grid depth-state snapshots and sun overlay viewport queries now use tested backend query dispatch as well. - Legacy `util.cpp` OpenGL error naming and `gl_state` save/restore also - consume backend-owned error codes, state queries, framebuffer targets, - texture binding targets, and active texture units. + Legacy `util.cpp` OpenGL error naming, framebuffer-to-texture copy helper, + and `gl_state` save/restore also consume backend-owned error codes, state + queries, framebuffer targets, texture binding targets, active texture units, + shader program use, and sampler binding through the shared retained bridge + headers instead of local raw OpenGL callbacks. `NodeStrokePreview` brush preview rendering also consumes backend-owned depth/scissor/blend state, tested viewport/clear-color query dispatch, clear-color restore, active texture unit execution, fallback 2D texture diff --git a/docs/modernization/debt.md b/docs/modernization/debt.md index 044ce57..b6f919d 100644 --- a/docs/modernization/debt.md +++ b/docs/modernization/debt.md @@ -392,6 +392,13 @@ agent or engineer to remove them without reconstructing context from chat. `src/shader.cpp` no longer carries raw shader/program/uniform callback ownership. Renderer services still need to own shader-program lifetime before this bridge can be removed. +- 2026-06-05: DEBT-0036 was narrowed again. Retained `gl_state` save/restore + and `copy_framebuffer_to_texture_target` now reuse `legacy_ui_gl_dispatch`, + `legacy_gl_framebuffer_dispatch`, `legacy_gl_shader_dispatch`, and + `legacy_gl_sampler_dispatch`, so `src/util.cpp` no longer carries its local + raw state/copy callback cluster. Renderer services still need to own state + snapshot/restore and framebuffer-copy execution before these bridges can be + removed. ## Open Debt @@ -430,7 +437,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, 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, 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 584d26d..8993dda 100644 --- a/docs/modernization/roadmap.md +++ b/docs/modernization/roadmap.md @@ -1265,9 +1265,11 @@ readback also goes through the tested framebuffer-backed texture readback dispatch instead of direct `glGetTexImage`. Grid depth-state snapshots and sun overlay viewport queries now also use tested backend query dispatch instead of direct state reads. -Legacy `util.cpp` OpenGL error naming and `gl_state` save/restore now delegate -error codes, state queries, framebuffer targets, texture binding targets, and -active texture units to `pp_renderer_gl`. +Legacy `util.cpp` OpenGL error naming, framebuffer-to-texture copy helper, and +`gl_state` save/restore now delegate error codes, state queries, framebuffer +targets, texture binding targets, active texture units, shader program use, and +sampler binding to `pp_renderer_gl` through the shared retained bridge headers +instead of owning local raw OpenGL callbacks. `NodeStrokePreview` brush preview rendering now delegates depth/scissor/blend state, tested viewport/clear-color query dispatch, clear-color restore, active texture unit execution, fallback 2D texture unbinds, 2D texture targets, copy @@ -2585,6 +2587,11 @@ Results: `legacy_gl_shader_dispatch`, removing duplicated raw shader/program/uniform callback ownership from `src/shader.cpp` while shader-program ownership remains retained under DEBT-0036. +- Retained `gl_state` save/restore and `copy_framebuffer_to_texture_target` + now reuse `legacy_ui_gl_dispatch`, `legacy_gl_framebuffer_dispatch`, + `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. - 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/legacy_gl_framebuffer_dispatch.h b/src/legacy_gl_framebuffer_dispatch.h index 92155dd..e96d383 100644 --- a/src/legacy_gl_framebuffer_dispatch.h +++ b/src/legacy_gl_framebuffer_dispatch.h @@ -91,6 +91,27 @@ inline void read_opengl_pixels( pixels); } +inline void copy_opengl_tex_sub_image_2d( + std::uint32_t target, + std::int32_t level, + std::int32_t destination_x, + std::int32_t destination_y, + std::int32_t source_x, + std::int32_t source_y, + std::int32_t width, + std::int32_t height) noexcept +{ + glCopyTexSubImage2D( + static_cast(target), + static_cast(level), + static_cast(destination_x), + static_cast(destination_y), + static_cast(source_x), + static_cast(source_y), + static_cast(width), + static_cast(height)); +} + inline pp::renderer::gl::OpenGlTexture2DReadbackDispatch texture_2d_readback_dispatch() noexcept { return pp::renderer::gl::OpenGlTexture2DReadbackDispatch { @@ -123,6 +144,13 @@ inline pp::renderer::gl::OpenGlFramebufferReadbackDispatch framebuffer_readback_ }; } +inline pp::renderer::gl::OpenGlTexture2DFramebufferCopyDispatch framebuffer_to_texture_copy_dispatch() noexcept +{ + return pp::renderer::gl::OpenGlTexture2DFramebufferCopyDispatch { + .copy_tex_sub_image_2d = copy_opengl_tex_sub_image_2d, + }; +} + inline pp::renderer::gl::OpenGlFramebufferBindDispatch framebuffer_bind_dispatch() noexcept { return pp::renderer::gl::OpenGlFramebufferBindDispatch { diff --git a/src/util.cpp b/src/util.cpp index 9ae0b33..4cbdbd5 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -3,93 +3,12 @@ #include "util.h" #include #include "app.h" +#include "legacy_gl_framebuffer_dispatch.h" +#include "legacy_gl_sampler_dispatch.h" +#include "legacy_gl_shader_dispatch.h" +#include "legacy_ui_gl_dispatch.h" #include "renderer_gl/opengl_capabilities.h" -namespace { - -std::uint8_t is_opengl_enabled(std::uint32_t state) noexcept -{ - return static_cast(glIsEnabled(static_cast(state))); -} - -void query_opengl_integer(std::uint32_t name, std::int32_t* value) noexcept -{ - glGetIntegerv(static_cast(name), reinterpret_cast(value)); -} - -void query_opengl_float(std::uint32_t name, float* value) noexcept -{ - glGetFloatv(static_cast(name), value); -} - -void set_opengl_active_texture(std::uint32_t texture_unit) noexcept -{ - glActiveTexture(static_cast(texture_unit)); -} - -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_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_clear_color(float r, float g, float b, float a) noexcept -{ - glClearColor(r, g, b, a); -} - -void bind_opengl_framebuffer(std::uint32_t target, std::uint32_t framebuffer) noexcept -{ - glBindFramebuffer(static_cast(target), static_cast(framebuffer)); -} - -void use_opengl_program(std::uint32_t program) noexcept -{ - glUseProgram(static_cast(program)); -} - -void bind_opengl_texture(std::uint32_t target, std::uint32_t texture) noexcept -{ - glBindTexture(static_cast(target), static_cast(texture)); -} - -void bind_opengl_sampler(std::uint32_t unit, std::uint32_t sampler) noexcept -{ - glBindSampler(static_cast(unit), static_cast(sampler)); -} - -void copy_opengl_tex_sub_image_2d( - std::uint32_t target, - std::int32_t level, - std::int32_t destination_x, - std::int32_t destination_y, - std::int32_t source_x, - std::int32_t source_y, - std::int32_t width, - std::int32_t height) noexcept -{ - glCopyTexSubImage2D( - static_cast(target), - static_cast(level), - static_cast(destination_x), - static_cast(destination_y), - static_cast(source_x), - static_cast(source_y), - static_cast(width), - static_cast(height)); -} - -} - template<> std::vector poly_remove_duplicate(const std::vector& v, const float tollerance) { @@ -761,9 +680,7 @@ bool copy_framebuffer_to_texture_target( .width = width, .height = height, }, - pp::renderer::gl::OpenGlTexture2DFramebufferCopyDispatch { - .copy_tex_sub_image_2d = copy_opengl_tex_sub_image_2d, - }); + pp::legacy::gl_framebuffer::framebuffer_to_texture_copy_dispatch()); if (!status.ok()) { LOG("OpenGL framebuffer-to-texture copy failed: %s", status.message); return false; @@ -866,10 +783,10 @@ void gl_state::save() const auto snapshot = pp::renderer::gl::snapshot_opengl_state( pp::renderer::gl::OpenGlStateSnapshotDispatch { - .is_enabled = is_opengl_enabled, - .get_integer = query_opengl_integer, - .get_float = query_opengl_float, - .active_texture = set_opengl_active_texture, + .is_enabled = pp::legacy::ui_gl::is_opengl_state_enabled, + .get_integer = pp::legacy::gl_framebuffer::query_opengl_integer, + .get_float = pp::legacy::ui_gl::get_opengl_float, + .active_texture = pp::legacy::ui_gl::activate_opengl_texture, }); if (!snapshot.ok()) { LOG("OpenGL state snapshot failed: %s", snapshot.status().message); @@ -920,15 +837,15 @@ void gl_state::restore() const auto status = pp::renderer::gl::restore_opengl_state( state, pp::renderer::gl::OpenGlStateRestoreDispatch { - .enable = enable_opengl_state, - .disable = disable_opengl_state, - .viewport = set_opengl_viewport, - .clear_color = set_opengl_clear_color, - .bind_framebuffer = bind_opengl_framebuffer, - .use_program = use_opengl_program, - .active_texture = set_opengl_active_texture, - .bind_texture = bind_opengl_texture, - .bind_sampler = bind_opengl_sampler, + .enable = pp::legacy::ui_gl::enable_opengl_state, + .disable = pp::legacy::ui_gl::disable_opengl_state, + .viewport = pp::legacy::ui_gl::set_opengl_viewport, + .clear_color = pp::legacy::ui_gl::set_opengl_clear_color, + .bind_framebuffer = pp::legacy::ui_gl::bind_opengl_framebuffer, + .use_program = pp::legacy::gl_shader::use_opengl_program, + .active_texture = pp::legacy::ui_gl::activate_opengl_texture, + .bind_texture = pp::legacy::ui_gl::bind_opengl_texture, + .bind_sampler = pp::legacy::gl_sampler::bind_opengl_sampler, }); if (!status.ok()) LOG("OpenGL state restore failed: %s", status.message);