From df21d673ddf9abd787878b139e2333775e393d55 Mon Sep 17 00:00:00 2001 From: omigamedev Date: Fri, 5 Jun 2026 14:22:21 +0200 Subject: [PATCH] Share retained renderbuffer dispatch bridge --- docs/modernization/build-inventory.md | 13 ++-- docs/modernization/debt.md | 13 ++-- docs/modernization/roadmap.md | 19 +++--- src/canvas.cpp | 71 +++------------------ src/legacy_gl_renderbuffer_dispatch.h | 90 +++++++++++++++++++++++++++ src/rtt.cpp | 70 +++------------------ 6 files changed, 134 insertions(+), 142 deletions(-) create mode 100644 src/legacy_gl_renderbuffer_dispatch.h diff --git a/docs/modernization/build-inventory.md b/docs/modernization/build-inventory.md index 7dc7fd9..57ae11b 100644 --- a/docs/modernization/build-inventory.md +++ b/docs/modernization/build-inventory.md @@ -437,9 +437,11 @@ powershell -ExecutionPolicy Bypass -File scripts\automation\apple-remote-build.p `RTT::create`/`RTT::destroy` and framebuffer bind/restore paths, plus RTT clear color/depth masks. RTT render-target clear, masked color clear with color-write-mask restore, and texture bind/unbind now execute through tested - dispatch contracts here. Optional RTT depth renderbuffer allocation/storage/delete - and framebuffer depth attach/detach, plus canvas object-drawing depth - renderbuffer setup, also execute through tested dispatch contracts here. Renderer API render-pass color/depth/stencil + dispatch contracts here. Optional RTT depth renderbuffer + allocation/storage/delete and framebuffer depth attach/detach, plus canvas + object-drawing depth renderbuffer setup, also execute through tested dispatch + contracts here and share the retained `legacy_gl_renderbuffer_dispatch` raw + callback bridge. Renderer API render-pass color/depth/stencil clear-mask and clear-value mapping, and color-write-mask query tokens. `RTT` no longer spells GL enum names directly. `RTT` also exposes a retained RGBA8 region-readback helper that uses the tested framebuffer readback dispatch for @@ -559,8 +561,9 @@ powershell -ExecutionPolicy Bypass -File scripts\automation\apple-remote-build.p `pp_renderer_gl` dispatch helpers. Retained `Canvas` active texture, fallback texture unbind, viewport/scissor execution, viewport and clear-color query, clear-color restore, and capability query/apply adapter endpoints now share - `legacy_ui_gl_dispatch`; Canvas depth renderbuffer allocation/attachment/delete - remains a separate retained renderer-resource bridge. `NodeCanvas` saved + `legacy_ui_gl_dispatch`; Canvas and RTT depth renderbuffer + allocation/attachment/delete now share `legacy_gl_renderbuffer_dispatch` + while renderer-resource ownership remains retained. `NodeCanvas` saved viewport/clear-color query, density/offscreen color clear, and clear-color restore paths use the same helpers. `NodeCanvas` and `NodeStrokePreview` now share `legacy_ui_gl_dispatch` for active texture, texture unbind, viewport/scissor, diff --git a/docs/modernization/debt.md b/docs/modernization/debt.md index 83f1600..f4891e5 100644 --- a/docs/modernization/debt.md +++ b/docs/modernization/debt.md @@ -352,9 +352,14 @@ agent or engineer to remove them without reconstructing context from chat. thumbnail, object-render, export, and `LayerFrame::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. Canvas - depth renderbuffer allocation/attachment/delete remains a retained - renderer-resource bridge. + clear-color restore, and capability query/apply adapter endpoints. At that + checkpoint, Canvas depth renderbuffer allocation/attachment/delete remained a + retained renderer-resource bridge. +- 2026-06-05: DEBT-0036 was narrowed again. Retained `Canvas` and `RTT` depth + renderbuffer allocation, framebuffer depth attachment, and renderbuffer + deletion now share `legacy_gl_renderbuffer_dispatch`, so those files no + longer carry duplicated raw renderbuffer callbacks. Renderer services still + need to own renderbuffer lifetime before this bridge can be removed. ## Open Debt @@ -393,7 +398,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, while retained Canvas depth renderbuffer allocation/attachment/delete remains a renderer-resource bridge, 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, 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 2a849d8..46102ae 100644 --- a/docs/modernization/roadmap.md +++ b/docs/modernization/roadmap.md @@ -1152,7 +1152,8 @@ status used by `RTT::create`/`RTT::destroy` and framebuffer bind/restore paths, also live in `pp_renderer_gl`. Depth renderbuffer allocation/storage/delete and framebuffer depth attach/detach sequences used by retained `RTT` and canvas object-drawing helpers now execute through tested `pp_renderer_gl` dispatch -contracts. 2D framebuffer-to-texture +contracts and share the retained `legacy_gl_renderbuffer_dispatch` raw callback +bridge. 2D framebuffer-to-texture copies used by canvas, transform, layer-conversion, panorama UI, brush preview, and CanvasLayer cube-face generation paths now route through a tested `pp_renderer_gl` copy dispatch via the retained target-aware framebuffer-copy @@ -1271,8 +1272,9 @@ query plus clear-color restore paths also use tested `pp_renderer_gl` dispatch helpers. The retained `Canvas` active-texture, fallback texture unbind, viewport/scissor execution, viewport and clear-color query, clear-color restore, and capability query/apply adapter endpoints now share -`legacy_ui_gl_dispatch`; Canvas depth renderbuffer allocation/attachment/delete -remains a separate retained renderer-resource bridge under DEBT-0036. +`legacy_ui_gl_dispatch`; Canvas and RTT depth renderbuffer +allocation/attachment/delete now share `legacy_gl_renderbuffer_dispatch` while +resource lifetime ownership remains retained under DEBT-0036. `NodeCanvas` saved viewport/clear-color query, density target color clear, and clear-color restore paths use the same helpers. `NodeCanvas` and `NodeStrokePreview` now share that retained UI GL dispatch bridge for @@ -2539,9 +2541,12 @@ Results: viewport/clear-state queries from `src/canvas.cpp` and the frame clear path. Their active-texture selection, fallback 2D texture unbind, viewport/scissor execution, clear-color restore, and capability query/apply adapter endpoints - now share `legacy_ui_gl_dispatch`; retained Canvas depth renderbuffer - allocation/attachment/delete remains open as a renderer-resource bridge under - DEBT-0036. + now share `legacy_ui_gl_dispatch`. +- Retained Canvas and RTT depth renderbuffer allocation, framebuffer depth + attachment, and renderbuffer deletion now share + `legacy_gl_renderbuffer_dispatch`, removing duplicated raw renderbuffer + callbacks from `src/canvas.cpp` and `src/rtt.cpp` while resource lifetime + ownership remains open 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 @@ -2571,7 +2576,7 @@ Results: viewport/clear/blend state, active texture units, readback format/type, framebuffer copy targets, and depth renderbuffer allocation plus framebuffer depth attach/detach through tested renderer GL backend dispatch contracts; - `src/canvas.cpp` no longer contains raw `GL_*` constants. + `src/canvas.cpp` no longer owns raw renderbuffer callbacks. - Retained Canvas, NodeCanvas, NodeStrokePreview, and HMD viewport/scissor/ capability execution now compiles through the renderer GL backend dispatch adapters with `pp_legacy_paint_document`, `pp_panopainter_ui`, and diff --git a/src/canvas.cpp b/src/canvas.cpp index fef2804..47bb5d5 100644 --- a/src/canvas.cpp +++ b/src/canvas.cpp @@ -2,6 +2,7 @@ #include "log.h" #include "canvas.h" #include "app.h" +#include "legacy_gl_renderbuffer_dispatch.h" #include "legacy_ui_gl_dispatch.h" #include "texture.h" #include "node_progress_bar.h" @@ -188,84 +189,26 @@ bool query_canvas_capability(std::uint32_t state) return pp::legacy::ui_gl::query_capability(state, "Canvas"); } -void gen_opengl_renderbuffers(std::uint32_t count, std::uint32_t* ids) noexcept -{ - glGenRenderbuffers(static_cast(count), reinterpret_cast(ids)); -} - -void delete_opengl_renderbuffers(std::uint32_t count, const std::uint32_t* ids) noexcept -{ - glDeleteRenderbuffers(static_cast(count), reinterpret_cast(ids)); -} - -void bind_opengl_renderbuffer(std::uint32_t target, std::uint32_t renderbuffer) noexcept -{ - glBindRenderbuffer(static_cast(target), static_cast(renderbuffer)); -} - -void set_opengl_renderbuffer_storage( - std::uint32_t target, - std::uint32_t internal_format, - std::int32_t width, - std::int32_t height) noexcept -{ - glRenderbufferStorage( - static_cast(target), - static_cast(internal_format), - static_cast(width), - static_cast(height)); -} - -void attach_opengl_framebuffer_renderbuffer( - std::uint32_t target, - std::uint32_t attachment, - std::uint32_t renderbuffer_target, - std::uint32_t renderbuffer) noexcept -{ - glFramebufferRenderbuffer( - static_cast(target), - static_cast(attachment), - static_cast(renderbuffer_target), - static_cast(renderbuffer)); -} - GLuint allocate_canvas_depth_renderbuffer(int width, int height) { - const auto result = pp::renderer::gl::allocate_opengl_depth_renderbuffer( + return static_cast(pp::legacy::gl_renderbuffer::allocate_depth_renderbuffer( width, height, - pp::renderer::gl::OpenGlDepthRenderbufferAllocationDispatch { - .gen_renderbuffers = gen_opengl_renderbuffers, - .bind_renderbuffer = bind_opengl_renderbuffer, - .renderbuffer_storage = set_opengl_renderbuffer_storage, - }); - if (!result.ok()) { - LOG("OpenGL canvas depth renderbuffer allocation failed: %s", result.status().message); - return 0U; - } - return static_cast(result.value()); + "OpenGL canvas depth renderbuffer allocation")); } void attach_canvas_depth_renderbuffer(GLuint renderbuffer) { - const auto status = pp::renderer::gl::attach_opengl_depth_renderbuffer( + pp::legacy::gl_renderbuffer::attach_depth_renderbuffer( static_cast(renderbuffer), - pp::renderer::gl::OpenGlDepthRenderbufferAttachmentDispatch { - .framebuffer_renderbuffer = attach_opengl_framebuffer_renderbuffer, - }); - if (!status.ok()) - LOG("OpenGL canvas depth renderbuffer attachment failed: %s", status.message); + "OpenGL canvas depth renderbuffer attachment"); } void delete_canvas_renderbuffer(GLuint renderbuffer) { - const auto status = pp::renderer::gl::delete_opengl_renderbuffer( + pp::legacy::gl_renderbuffer::delete_renderbuffer( static_cast(renderbuffer), - pp::renderer::gl::OpenGlRenderbufferDeleteDispatch { - .delete_renderbuffers = delete_opengl_renderbuffers, - }); - if (!status.ok()) - LOG("OpenGL canvas renderbuffer delete failed: %s", status.message); + "OpenGL canvas renderbuffer delete"); } } diff --git a/src/legacy_gl_renderbuffer_dispatch.h b/src/legacy_gl_renderbuffer_dispatch.h new file mode 100644 index 0000000..16ab72f --- /dev/null +++ b/src/legacy_gl_renderbuffer_dispatch.h @@ -0,0 +1,90 @@ +#pragma once + +#include + +#include "log.h" +#include "renderer_gl/opengl_capabilities.h" + +namespace pp::legacy::gl_renderbuffer { + +inline void gen_opengl_renderbuffers(std::uint32_t count, std::uint32_t* ids) noexcept +{ + glGenRenderbuffers(static_cast(count), reinterpret_cast(ids)); +} + +inline void delete_opengl_renderbuffers(std::uint32_t count, const std::uint32_t* ids) noexcept +{ + glDeleteRenderbuffers(static_cast(count), reinterpret_cast(ids)); +} + +inline void bind_opengl_renderbuffer(std::uint32_t target, std::uint32_t renderbuffer) noexcept +{ + glBindRenderbuffer(static_cast(target), static_cast(renderbuffer)); +} + +inline void set_opengl_renderbuffer_storage( + std::uint32_t target, + std::uint32_t internal_format, + std::int32_t width, + std::int32_t height) noexcept +{ + glRenderbufferStorage( + static_cast(target), + static_cast(internal_format), + static_cast(width), + static_cast(height)); +} + +inline void attach_opengl_framebuffer_renderbuffer( + std::uint32_t target, + std::uint32_t attachment, + std::uint32_t renderbuffer_target, + std::uint32_t renderbuffer) noexcept +{ + glFramebufferRenderbuffer( + static_cast(target), + static_cast(attachment), + static_cast(renderbuffer_target), + static_cast(renderbuffer)); +} + +inline std::uint32_t allocate_depth_renderbuffer(std::int32_t width, std::int32_t height, const char* context) +{ + const auto result = pp::renderer::gl::allocate_opengl_depth_renderbuffer( + width, + height, + pp::renderer::gl::OpenGlDepthRenderbufferAllocationDispatch { + .gen_renderbuffers = gen_opengl_renderbuffers, + .bind_renderbuffer = bind_opengl_renderbuffer, + .renderbuffer_storage = set_opengl_renderbuffer_storage, + }); + if (!result.ok()) { + LOG("%s failed because: %s", context, result.status().message); + return 0U; + } + return result.value(); +} + +inline void attach_depth_renderbuffer(std::uint32_t renderbuffer, const char* context) +{ + const auto status = pp::renderer::gl::attach_opengl_depth_renderbuffer( + renderbuffer, + pp::renderer::gl::OpenGlDepthRenderbufferAttachmentDispatch { + .framebuffer_renderbuffer = attach_opengl_framebuffer_renderbuffer, + }); + if (!status.ok()) + LOG("%s failed because: %s", context, status.message); +} + +inline void delete_renderbuffer(std::uint32_t renderbuffer, const char* context) +{ + const auto status = pp::renderer::gl::delete_opengl_renderbuffer( + renderbuffer, + pp::renderer::gl::OpenGlRenderbufferDeleteDispatch { + .delete_renderbuffers = delete_opengl_renderbuffers, + }); + if (!status.ok()) + LOG("%s failed because: %s", context, status.message); +} + +} // namespace pp::legacy::gl_renderbuffer diff --git a/src/rtt.cpp b/src/rtt.cpp index 48b2ae6..0e8d00d 100644 --- a/src/rtt.cpp +++ b/src/rtt.cpp @@ -3,6 +3,7 @@ #include "rtt.h" #include "util.h" #include "app.h" +#include "legacy_gl_renderbuffer_dispatch.h" #include "renderer_gl/opengl_capabilities.h" #include @@ -14,11 +15,6 @@ namespace { return static_cast(pp::renderer::gl::texture_2d_target()); } -[[nodiscard]] GLenum renderbuffer_target() noexcept -{ - return static_cast(pp::renderer::gl::renderbuffer_target()); -} - [[nodiscard]] GLenum framebuffer_target() noexcept { return static_cast(pp::renderer::gl::framebuffer_target()); @@ -120,34 +116,6 @@ void set_opengl_texture_parameter_f(std::uint32_t target, std::uint32_t paramete glTexParameterf(static_cast(target), static_cast(parameter), static_cast(value)); } -void gen_opengl_renderbuffers(std::uint32_t count, std::uint32_t* ids) noexcept -{ - glGenRenderbuffers(static_cast(count), reinterpret_cast(ids)); -} - -void delete_opengl_renderbuffers(std::uint32_t count, const std::uint32_t* ids) noexcept -{ - glDeleteRenderbuffers(static_cast(count), reinterpret_cast(ids)); -} - -void bind_opengl_renderbuffer(std::uint32_t target, std::uint32_t renderbuffer) noexcept -{ - glBindRenderbuffer(static_cast(target), static_cast(renderbuffer)); -} - -void set_opengl_renderbuffer_storage( - std::uint32_t target, - std::uint32_t internal_format, - std::int32_t width, - std::int32_t height) noexcept -{ - glRenderbufferStorage( - static_cast(target), - static_cast(internal_format), - static_cast(width), - static_cast(height)); -} - void gen_opengl_framebuffers(std::uint32_t count, std::uint32_t* ids) noexcept { glGenFramebuffers(static_cast(count), reinterpret_cast(ids)); @@ -173,19 +141,6 @@ void attach_opengl_framebuffer_texture_2d( static_cast(level)); } -void attach_opengl_framebuffer_renderbuffer( - std::uint32_t target, - std::uint32_t attachment, - std::uint32_t renderbuffer_target, - std::uint32_t renderbuffer) noexcept -{ - glFramebufferRenderbuffer( - static_cast(target), - static_cast(attachment), - static_cast(renderbuffer_target), - static_cast(renderbuffer)); -} - std::uint32_t check_opengl_framebuffer_status(std::uint32_t target) noexcept { return static_cast(glCheckFramebufferStatus(static_cast(target))); @@ -400,13 +355,9 @@ void RTT::destroy() { if (rboID) { - const auto status = pp::renderer::gl::delete_opengl_renderbuffer( + pp::legacy::gl_renderbuffer::delete_renderbuffer( static_cast(rboID), - pp::renderer::gl::OpenGlRenderbufferDeleteDispatch { - .delete_renderbuffers = delete_opengl_renderbuffers, - }); - if (!status.ok()) - LOG("RTT::destroy renderbuffer delete failed because: %s", status.message); + "RTT::destroy renderbuffer delete"); } if (texID) { @@ -587,21 +538,16 @@ bool RTT::create(int width, int height, int tex/* = -1*/, GLint internal_format, // Create a renderbuffer object to store depth info if (depth_buffer) { - const auto renderbuffer = pp::renderer::gl::allocate_opengl_depth_renderbuffer( + const auto renderbuffer = pp::legacy::gl_renderbuffer::allocate_depth_renderbuffer( width, height, - pp::renderer::gl::OpenGlDepthRenderbufferAllocationDispatch { - .gen_renderbuffers = gen_opengl_renderbuffers, - .bind_renderbuffer = bind_opengl_renderbuffer, - .renderbuffer_storage = set_opengl_renderbuffer_storage, - }); - if (!renderbuffer.ok()) + "RTT::create depth renderbuffer allocation"); + if (renderbuffer == 0U) { - LOG("RTT::create depth renderbuffer allocation failed because: %s", renderbuffer.status().message); status = 0; return; } - rboID = static_cast(renderbuffer.value()); + rboID = static_cast(renderbuffer); } // Create a framebuffer object @@ -613,7 +559,7 @@ bool RTT::create(int width, int height, int tex/* = -1*/, GLint internal_format, .get_integer = query_opengl_integer, .bind_framebuffer = bind_opengl_framebuffer, .framebuffer_texture_2d = attach_opengl_framebuffer_texture_2d, - .framebuffer_renderbuffer = attach_opengl_framebuffer_renderbuffer, + .framebuffer_renderbuffer = pp::legacy::gl_renderbuffer::attach_opengl_framebuffer_renderbuffer, .check_framebuffer_status = check_opengl_framebuffer_status, }); if (!framebuffer.ok())