From 84e63c0d340566b45acd88511aa20cbd9154f45d Mon Sep 17 00:00:00 2001 From: omigamedev Date: Fri, 5 Jun 2026 14:35:45 +0200 Subject: [PATCH] Share retained framebuffer dispatch bridge --- docs/modernization/build-inventory.md | 5 +- docs/modernization/debt.md | 8 +- docs/modernization/roadmap.md | 10 +- src/legacy_gl_framebuffer_dispatch.h | 161 ++++++++++++++++++++++++++ src/rtt.cpp | 151 +++--------------------- src/texture.cpp | 71 +----------- 6 files changed, 196 insertions(+), 210 deletions(-) create mode 100644 src/legacy_gl_framebuffer_dispatch.h diff --git a/docs/modernization/build-inventory.md b/docs/modernization/build-inventory.md index 65ec5d6..24ca2db 100644 --- a/docs/modernization/build-inventory.md +++ b/docs/modernization/build-inventory.md @@ -437,7 +437,10 @@ powershell -ExecutionPolicy Bypass -File scripts\automation\apple-remote-build.p framebuffer targets, binding queries, attachment points, render-target framebuffer allocation/delete, binding restore, and completion status used by `RTT::create`/`RTT::destroy` and framebuffer bind/restore paths, plus RTT - clear color/depth masks. RTT render-target clear, masked color clear with + clear color/depth masks. Retained `Texture2D` readback and RTT framebuffer + allocation, deletion, bind/restore, blit, readback, and PBO readback dispatch + now share the retained `legacy_gl_framebuffer_dispatch` raw callback bridge. + 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 diff --git a/docs/modernization/debt.md b/docs/modernization/debt.md index d9907f9..1309457 100644 --- a/docs/modernization/debt.md +++ b/docs/modernization/debt.md @@ -366,6 +366,12 @@ agent or engineer to remove them without reconstructing context from chat. `legacy_gl_texture_dispatch`, so `src/texture.cpp` and `src/rtt.cpp` no longer carry duplicated raw texture callbacks. Renderer services still need to own texture resource lifetime before this bridge can be removed. +- 2026-06-05: DEBT-0036 was narrowed again. Retained `Texture2D` readback plus + RTT framebuffer allocation, deletion, bind/restore, blit, readback, and PBO + readback dispatch now share `legacy_gl_framebuffer_dispatch`, so + `src/texture.cpp` and `src/rtt.cpp` no longer carry duplicated raw + framebuffer/readback callbacks. Renderer services still need to own + framebuffer and readback lifetime before this bridge can be removed. ## Open Debt @@ -404,7 +410,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, 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, 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 31f091f..2858279 100644 --- a/docs/modernization/roadmap.md +++ b/docs/modernization/roadmap.md @@ -1152,7 +1152,10 @@ render-target texture parameters and parameter dispatch, texture/renderbuffer targets, depth format, framebuffer targets, binding queries, attachment points, render-target framebuffer allocation/delete, binding restore, and completion status used by `RTT::create`/`RTT::destroy` and framebuffer bind/restore paths, -also live in `pp_renderer_gl`. Depth renderbuffer allocation/storage/delete and +also live in `pp_renderer_gl`; retained `Texture2D` readback and RTT +framebuffer allocation, deletion, bind/restore, blit, readback, and PBO +readback dispatch now share the retained `legacy_gl_framebuffer_dispatch` raw +callback bridge. 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 and share the retained `legacy_gl_renderbuffer_dispatch` raw callback @@ -2555,6 +2558,11 @@ Results: `legacy_gl_texture_dispatch`, removing duplicated raw texture callbacks from `src/texture.cpp` and `src/rtt.cpp` while texture resource ownership remains retained under DEBT-0036. +- Retained `Texture2D` readback plus RTT framebuffer allocation, deletion, + bind/restore, blit, readback, and PBO readback dispatch now share + `legacy_gl_framebuffer_dispatch`, removing duplicated raw framebuffer and + readback callbacks from `src/texture.cpp` and `src/rtt.cpp` while + framebuffer/readback ownership remains retained under DEBT-0036. - Canvas draw-merge shader-blend selection now consumes the extracted `pp_paint_renderer` stroke composite planner for current layer and primary brush blend modes, while preserving legacy OpenGL compositing execution under diff --git a/src/legacy_gl_framebuffer_dispatch.h b/src/legacy_gl_framebuffer_dispatch.h new file mode 100644 index 0000000..92155dd --- /dev/null +++ b/src/legacy_gl_framebuffer_dispatch.h @@ -0,0 +1,161 @@ +#pragma once + +#include + +#include "legacy_gl_texture_dispatch.h" +#include "renderer_gl/opengl_capabilities.h" + +namespace pp::legacy::gl_framebuffer { + +inline void query_opengl_integer(std::uint32_t name, std::int32_t* value) noexcept +{ + glGetIntegerv(static_cast(name), reinterpret_cast(value)); +} + +inline void gen_opengl_framebuffers(std::uint32_t count, std::uint32_t* ids) noexcept +{ + glGenFramebuffers(static_cast(count), reinterpret_cast(ids)); +} + +inline void delete_opengl_framebuffers(std::uint32_t count, const std::uint32_t* ids) noexcept +{ + glDeleteFramebuffers(static_cast(count), reinterpret_cast(ids)); +} + +inline void bind_opengl_framebuffer(std::uint32_t target, std::uint32_t framebuffer) noexcept +{ + glBindFramebuffer(static_cast(target), static_cast(framebuffer)); +} + +inline void attach_opengl_framebuffer_texture_2d( + std::uint32_t target, + std::uint32_t attachment, + std::uint32_t texture_target, + std::uint32_t texture, + std::int32_t level) noexcept +{ + glFramebufferTexture2D( + static_cast(target), + static_cast(attachment), + static_cast(texture_target), + static_cast(texture), + static_cast(level)); +} + +inline std::uint32_t check_opengl_framebuffer_status(std::uint32_t target) noexcept +{ + return static_cast(glCheckFramebufferStatus(static_cast(target))); +} + +inline void blit_opengl_framebuffer( + std::int32_t source_x0, + std::int32_t source_y0, + std::int32_t source_x1, + std::int32_t source_y1, + std::int32_t destination_x0, + std::int32_t destination_y0, + std::int32_t destination_x1, + std::int32_t destination_y1, + std::uint32_t mask, + std::uint32_t filter) noexcept +{ + glBlitFramebuffer( + static_cast(source_x0), + static_cast(source_y0), + static_cast(source_x1), + static_cast(source_y1), + static_cast(destination_x0), + static_cast(destination_y0), + static_cast(destination_x1), + static_cast(destination_y1), + static_cast(mask), + static_cast(filter)); +} + +inline void read_opengl_pixels( + std::int32_t x, + std::int32_t y, + std::int32_t width, + std::int32_t height, + std::uint32_t pixel_format, + std::uint32_t component_type, + void* pixels) noexcept +{ + glReadPixels( + static_cast(x), + static_cast(y), + static_cast(width), + static_cast(height), + static_cast(pixel_format), + static_cast(component_type), + pixels); +} + +inline pp::renderer::gl::OpenGlTexture2DReadbackDispatch texture_2d_readback_dispatch() noexcept +{ + return pp::renderer::gl::OpenGlTexture2DReadbackDispatch { + .bind_texture = pp::legacy::gl_texture::bind_opengl_texture, + .gen_framebuffers = gen_opengl_framebuffers, + .get_integer = query_opengl_integer, + .bind_framebuffer = bind_opengl_framebuffer, + .framebuffer_texture_2d = attach_opengl_framebuffer_texture_2d, + .check_framebuffer_status = check_opengl_framebuffer_status, + .read_pixels = read_opengl_pixels, + .delete_framebuffers = delete_opengl_framebuffers, + }; +} + +inline pp::renderer::gl::OpenGlFramebufferBlitDispatch framebuffer_blit_dispatch() noexcept +{ + return pp::renderer::gl::OpenGlFramebufferBlitDispatch { + .get_integer = query_opengl_integer, + .bind_framebuffer = bind_opengl_framebuffer, + .blit_framebuffer = blit_opengl_framebuffer, + }; +} + +inline pp::renderer::gl::OpenGlFramebufferReadbackDispatch framebuffer_readback_dispatch() noexcept +{ + return pp::renderer::gl::OpenGlFramebufferReadbackDispatch { + .get_integer = query_opengl_integer, + .bind_framebuffer = bind_opengl_framebuffer, + .read_pixels = read_opengl_pixels, + }; +} + +inline pp::renderer::gl::OpenGlFramebufferBindDispatch framebuffer_bind_dispatch() noexcept +{ + return pp::renderer::gl::OpenGlFramebufferBindDispatch { + .get_integer = query_opengl_integer, + .bind_framebuffer = bind_opengl_framebuffer, + }; +} + +inline pp::renderer::gl::OpenGlFramebufferRestoreDispatch framebuffer_restore_dispatch() noexcept +{ + return pp::renderer::gl::OpenGlFramebufferRestoreDispatch { + .bind_framebuffer = bind_opengl_framebuffer, + }; +} + +inline pp::renderer::gl::OpenGlFramebufferDeleteDispatch framebuffer_delete_dispatch() noexcept +{ + return pp::renderer::gl::OpenGlFramebufferDeleteDispatch { + .delete_framebuffers = delete_opengl_framebuffers, + }; +} + +inline pp::renderer::gl::OpenGlRenderTargetFramebufferAllocationDispatch render_target_allocation_dispatch( + pp::renderer::gl::OpenGlFramebufferRenderbufferFn framebuffer_renderbuffer) noexcept +{ + return pp::renderer::gl::OpenGlRenderTargetFramebufferAllocationDispatch { + .gen_framebuffers = gen_opengl_framebuffers, + .get_integer = query_opengl_integer, + .bind_framebuffer = bind_opengl_framebuffer, + .framebuffer_texture_2d = attach_opengl_framebuffer_texture_2d, + .framebuffer_renderbuffer = framebuffer_renderbuffer, + .check_framebuffer_status = check_opengl_framebuffer_status, + }; +} + +} // namespace pp::legacy::gl_framebuffer diff --git a/src/rtt.cpp b/src/rtt.cpp index 059d3f4..06d9e70 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_framebuffer_dispatch.h" #include "legacy_gl_renderbuffer_dispatch.h" #include "legacy_gl_texture_dispatch.h" #include "renderer_gl/opengl_capabilities.h" @@ -11,26 +12,11 @@ namespace { -[[nodiscard]] GLenum framebuffer_target() noexcept -{ - return static_cast(pp::renderer::gl::framebuffer_target()); -} - -void query_opengl_integer(std::uint32_t name, std::int32_t* value) noexcept -{ - glGetIntegerv(static_cast(name), reinterpret_cast(value)); -} - void query_opengl_boolean(std::uint32_t name, std::uint8_t* value) noexcept { glGetBooleanv(static_cast(name), reinterpret_cast(value)); } -void bind_opengl_framebuffer(std::uint32_t target, std::uint32_t framebuffer) noexcept -{ - glBindFramebuffer(static_cast(target), static_cast(framebuffer)); -} - void set_opengl_clear_color(float r, float g, float b, float a) noexcept { glClearColor(r, g, b, a); @@ -46,80 +32,6 @@ void set_opengl_color_mask(std::uint8_t r, std::uint8_t g, std::uint8_t b, std:: glColorMask(r, g, b, a); } -void gen_opengl_framebuffers(std::uint32_t count, std::uint32_t* ids) noexcept -{ - glGenFramebuffers(static_cast(count), reinterpret_cast(ids)); -} - -void delete_opengl_framebuffers(std::uint32_t count, const std::uint32_t* ids) noexcept -{ - glDeleteFramebuffers(static_cast(count), reinterpret_cast(ids)); -} - -void attach_opengl_framebuffer_texture_2d( - std::uint32_t target, - std::uint32_t attachment, - std::uint32_t texture_target, - std::uint32_t texture, - std::int32_t level) noexcept -{ - glFramebufferTexture2D( - static_cast(target), - static_cast(attachment), - static_cast(texture_target), - static_cast(texture), - static_cast(level)); -} - -std::uint32_t check_opengl_framebuffer_status(std::uint32_t target) noexcept -{ - return static_cast(glCheckFramebufferStatus(static_cast(target))); -} - -void blit_opengl_framebuffer( - std::int32_t source_x0, - std::int32_t source_y0, - std::int32_t source_x1, - std::int32_t source_y1, - std::int32_t destination_x0, - std::int32_t destination_y0, - std::int32_t destination_x1, - std::int32_t destination_y1, - std::uint32_t mask, - std::uint32_t filter) noexcept -{ - glBlitFramebuffer( - static_cast(source_x0), - static_cast(source_y0), - static_cast(source_x1), - static_cast(source_y1), - static_cast(destination_x0), - static_cast(destination_y0), - static_cast(destination_x1), - static_cast(destination_y1), - static_cast(mask), - static_cast(filter)); -} - -void read_opengl_pixels( - std::int32_t x, - std::int32_t y, - std::int32_t width, - std::int32_t height, - std::uint32_t pixel_format, - std::uint32_t component_type, - void* pixels) noexcept -{ - glReadPixels( - static_cast(x), - static_cast(y), - static_cast(width), - static_cast(height), - static_cast(pixel_format), - static_cast(component_type), - pixels); -} - void gen_opengl_buffers(std::uint32_t count, std::uint32_t* ids) noexcept { glGenBuffers(static_cast(count), reinterpret_cast(ids)); @@ -253,11 +165,7 @@ bool RTT::resize(int width, int height) .mask = pp::renderer::gl::framebuffer_color_buffer_mask(), .filter = pp::renderer::gl::framebuffer_blit_filter(true), }, - pp::renderer::gl::OpenGlFramebufferBlitDispatch { - .get_integer = query_opengl_integer, - .bind_framebuffer = bind_opengl_framebuffer, - .blit_framebuffer = blit_opengl_framebuffer, - }); + pp::legacy::gl_framebuffer::framebuffer_blit_dispatch()); if (!status.ok()) { LOG("RTT::resize blit failed because: %s", status.message); ret = false; @@ -302,9 +210,7 @@ void RTT::destroy() //unbindFramebuffer(); const auto status = pp::renderer::gl::delete_opengl_framebuffer( static_cast(fboID), - pp::renderer::gl::OpenGlFramebufferDeleteDispatch { - .delete_framebuffers = delete_opengl_framebuffers, - }); + pp::legacy::gl_framebuffer::framebuffer_delete_dispatch()); if (!status.ok()) LOG("RTT::destroy framebuffer delete failed because: %s", status.message); //LOG("RTT DESTROY %d", fboID); @@ -332,11 +238,7 @@ void RTT::copy(const RTT & source) .mask = pp::renderer::gl::framebuffer_color_buffer_mask(), .filter = pp::renderer::gl::framebuffer_blit_filter(true), }, - pp::renderer::gl::OpenGlFramebufferBlitDispatch { - .get_integer = query_opengl_integer, - .bind_framebuffer = bind_opengl_framebuffer, - .blit_framebuffer = blit_opengl_framebuffer, - }); + pp::legacy::gl_framebuffer::framebuffer_blit_dispatch()); if (!status.ok()) LOG("RTT::copy blit failed because: %s", status.message); }); @@ -368,11 +270,7 @@ void RTT::copy(const RTT& source, const glm::vec4& rect) .mask = pp::renderer::gl::framebuffer_color_buffer_mask(), .filter = pp::renderer::gl::framebuffer_blit_filter(false), }, - pp::renderer::gl::OpenGlFramebufferBlitDispatch { - .get_integer = query_opengl_integer, - .bind_framebuffer = bind_opengl_framebuffer, - .blit_framebuffer = blit_opengl_framebuffer, - }); + pp::legacy::gl_framebuffer::framebuffer_blit_dispatch()); if (!status.ok()) LOG("RTT::copy region blit failed because: %s", status.message); }); @@ -470,14 +368,8 @@ bool RTT::create(int width, int height, int tex/* = -1*/, GLint internal_format, const auto framebuffer = pp::renderer::gl::allocate_opengl_render_target_framebuffer( static_cast(texID), static_cast(rboID), - pp::renderer::gl::OpenGlRenderTargetFramebufferAllocationDispatch { - .gen_framebuffers = gen_opengl_framebuffers, - .get_integer = query_opengl_integer, - .bind_framebuffer = bind_opengl_framebuffer, - .framebuffer_texture_2d = attach_opengl_framebuffer_texture_2d, - .framebuffer_renderbuffer = pp::legacy::gl_renderbuffer::attach_opengl_framebuffer_renderbuffer, - .check_framebuffer_status = check_opengl_framebuffer_status, - }); + pp::legacy::gl_framebuffer::render_target_allocation_dispatch( + pp::legacy::gl_renderbuffer::attach_opengl_framebuffer_renderbuffer)); if (!framebuffer.ok()) { LOG("RTT::create framebuffer allocation failed because: %s", framebuffer.status().message); @@ -514,10 +406,7 @@ void RTT::bindFramebuffer() #endif // _DEBUG const auto binding = pp::renderer::gl::bind_opengl_framebuffer_for_draw_read( static_cast(fboID), - pp::renderer::gl::OpenGlFramebufferBindDispatch { - .get_integer = query_opengl_integer, - .bind_framebuffer = bind_opengl_framebuffer, - }); + pp::legacy::gl_framebuffer::framebuffer_bind_dispatch()); if (!binding.ok()) { LOG("RTT::bindFramebuffer() failed because: %s", binding.status().message); return; @@ -538,9 +427,7 @@ void RTT::unbindFramebuffer() .draw_framebuffer = oldDFboID, .read_framebuffer = oldRFboID, }, - pp::renderer::gl::OpenGlFramebufferRestoreDispatch { - .bind_framebuffer = bind_opengl_framebuffer, - }); + pp::legacy::gl_framebuffer::framebuffer_restore_dispatch()); if (!status.ok()) { LOG("RTT::unbindFramebuffer() failed because: %s", status.message); return; @@ -632,11 +519,7 @@ bool RTT::readPixelsRgba8(int x, int y, int width, int height, void* buffer) con .format = readback, .pixels = buffer, }, - pp::renderer::gl::OpenGlFramebufferReadbackDispatch { - .get_integer = query_opengl_integer, - .bind_framebuffer = bind_opengl_framebuffer, - .read_pixels = read_opengl_pixels, - }); + pp::legacy::gl_framebuffer::framebuffer_readback_dispatch()); if (!status.ok()) { LOG("RTT::readPixelsRgba8() failed because: %s", status.message); ret = false; @@ -685,11 +568,7 @@ uint8_t* RTT::readTextureData(uint8_t* buffer) const noexcept .format = readback, .pixels = buffer, }, - pp::renderer::gl::OpenGlFramebufferReadbackDispatch { - .get_integer = query_opengl_integer, - .bind_framebuffer = bind_opengl_framebuffer, - .read_pixels = read_opengl_pixels, - }); + pp::legacy::gl_framebuffer::framebuffer_readback_dispatch()); if (!status.ok()) LOG("RTT::readTextureData() failed because: %s", status.message); }); @@ -713,11 +592,7 @@ float* RTT::readTextureDataFloat(float* buffer) const noexcept .format = readback, .pixels = buffer, }, - pp::renderer::gl::OpenGlFramebufferReadbackDispatch { - .get_integer = query_opengl_integer, - .bind_framebuffer = bind_opengl_framebuffer, - .read_pixels = read_opengl_pixels, - }); + pp::legacy::gl_framebuffer::framebuffer_readback_dispatch()); if (!status.ok()) LOG("RTT::readTextureDataFloat() failed because: %s", status.message); }); @@ -838,7 +713,7 @@ bool PBO::create(RTT& rtt) noexcept .gen_buffers = gen_opengl_buffers, .bind_buffer = bind_opengl_buffer, .buffer_data = set_opengl_buffer_data, - .read_pixels = read_opengl_pixels, + .read_pixels = pp::legacy::gl_framebuffer::read_opengl_pixels, }); rtt.unbindFramebuffer(); if (!result.ok()) { diff --git a/src/texture.cpp b/src/texture.cpp index 0f3dd13..db6029d 100644 --- a/src/texture.cpp +++ b/src/texture.cpp @@ -3,6 +3,7 @@ #include "texture.h" #include "util.h" #include "app.h" +#include "legacy_gl_framebuffer_dispatch.h" #include "legacy_gl_texture_dispatch.h" #include "renderer_gl/opengl_capabilities.h" @@ -10,65 +11,6 @@ namespace { -void gen_opengl_framebuffers(std::uint32_t count, std::uint32_t* ids) noexcept -{ - glGenFramebuffers(static_cast(count), reinterpret_cast(ids)); -} - -void delete_opengl_framebuffers(std::uint32_t count, const std::uint32_t* ids) noexcept -{ - glDeleteFramebuffers(static_cast(count), reinterpret_cast(ids)); -} - -void query_opengl_integer(std::uint32_t name, std::int32_t* value) noexcept -{ - glGetIntegerv(static_cast(name), reinterpret_cast(value)); -} - -void bind_opengl_framebuffer(std::uint32_t target, std::uint32_t framebuffer) noexcept -{ - glBindFramebuffer(static_cast(target), static_cast(framebuffer)); -} - -void attach_opengl_framebuffer_texture_2d( - std::uint32_t target, - std::uint32_t attachment, - std::uint32_t texture_target, - std::uint32_t texture, - std::int32_t level) noexcept -{ - glFramebufferTexture2D( - static_cast(target), - static_cast(attachment), - static_cast(texture_target), - static_cast(texture), - static_cast(level)); -} - -std::uint32_t check_opengl_framebuffer_status(std::uint32_t target) noexcept -{ - return static_cast(glCheckFramebufferStatus(static_cast(target))); -} - -void read_opengl_pixels( - std::int32_t x, - std::int32_t y, - std::int32_t width, - std::int32_t height, - std::uint32_t pixel_format, - std::uint32_t component_type, - void* pixels) noexcept -{ - glReadPixels( - static_cast(x), - static_cast(y), - static_cast(width), - static_cast(height), - static_cast(pixel_format), - static_cast(component_type), - pixels); -} - void gen_opengl_samplers(std::uint32_t count, std::uint32_t* ids) noexcept { #if USE_SAMPLER @@ -265,16 +207,7 @@ Image Texture2D::get_image() const noexcept .format = pp::renderer::gl::rgba8_readback_format(), .pixels = ret.m_data.get(), }, - pp::renderer::gl::OpenGlTexture2DReadbackDispatch { - .bind_texture = pp::legacy::gl_texture::bind_opengl_texture, - .gen_framebuffers = gen_opengl_framebuffers, - .get_integer = query_opengl_integer, - .bind_framebuffer = bind_opengl_framebuffer, - .framebuffer_texture_2d = attach_opengl_framebuffer_texture_2d, - .check_framebuffer_status = check_opengl_framebuffer_status, - .read_pixels = read_opengl_pixels, - .delete_framebuffers = delete_opengl_framebuffers, - }); + pp::legacy::gl_framebuffer::texture_2d_readback_dispatch()); if (!readback.ok()) { LOG("Texture2D::get_image() failed because: %s", readback.status().message); return;