From 421f2713dbaa6dfe27f9bbebd2d3bf47e30be833 Mon Sep 17 00:00:00 2001 From: omigamedev Date: Fri, 5 Jun 2026 14:29:59 +0200 Subject: [PATCH] Share retained texture dispatch bridge --- docs/modernization/build-inventory.md | 4 +- docs/modernization/debt.md | 8 +- docs/modernization/roadmap.md | 10 +- src/legacy_gl_texture_dispatch.h | 242 ++++++++++++++++++++++++++ src/rtt.cpp | 139 +++------------ src/texture.cpp | 153 +++------------- 6 files changed, 306 insertions(+), 250 deletions(-) create mode 100644 src/legacy_gl_texture_dispatch.h diff --git a/docs/modernization/build-inventory.md b/docs/modernization/build-inventory.md index 57ae11b..65ec5d6 100644 --- a/docs/modernization/build-inventory.md +++ b/docs/modernization/build-inventory.md @@ -427,7 +427,9 @@ powershell -ExecutionPolicy Bypass -File scripts\automation\apple-remote-build.p used by `RTT` and `Texture2D` diagnostics. It also owns the 2D texture target, framebuffer setup, readback format, mipmap target, and update component-type tokens used by `Texture2D`, plus cube-map binding and allocation face targets - used by `TextureCube`. It also owns and + used by `TextureCube`. Retained `Texture2D`, `TextureCube`, and RTT texture + allocation, bind, parameter, update, mipmap, and delete dispatch now share + the retained `legacy_gl_texture_dispatch` raw callback bridge. It also owns and validates framebuffer blit color mask and linear/nearest filters used by `RTT::resize` and `RTT::copy`, renderer API blit-filter to OpenGL token mapping, plus the default linear clamp-to-edge render-target texture diff --git a/docs/modernization/debt.md b/docs/modernization/debt.md index f4891e5..d9907f9 100644 --- a/docs/modernization/debt.md +++ b/docs/modernization/debt.md @@ -360,6 +360,12 @@ agent or engineer to remove them without reconstructing context from chat. 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. +- 2026-06-05: DEBT-0036 was narrowed again. Retained `Texture2D`, + `TextureCube`, and RTT texture allocation, deletion, binding, parameter + setup, 2D update, and mipmap dispatch now share + `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. ## Open Debt @@ -398,7 +404,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, 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, 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 46102ae..31f091f 100644 --- a/docs/modernization/roadmap.md +++ b/docs/modernization/roadmap.md @@ -1137,7 +1137,10 @@ format mapping for `Texture2D` image uploads and framebuffer status naming for OpenGL internal/pixel/component token mapping, including depth-stencil formats, for future backend texture objects. `Texture2D` 2D texture binding, upload, mipmap generation, framebuffer readback setup, and update component-type tokens -now delegate to `pp_renderer_gl`. `TextureCube` cube-map binding, allocation +now delegate to `pp_renderer_gl`; retained `Texture2D`, `TextureCube`, and +`RTT` texture allocation, bind, parameter, update, mipmap, and delete dispatch +now share the retained `legacy_gl_texture_dispatch` raw callback bridge. +`TextureCube` cube-map binding, allocation face targets, RGBA allocation format, and unsigned-byte component type also delegate to `pp_renderer_gl`. RGBA8/RGBA32F readback formats, checked byte-count math, PBO pixel-buffer target/usage/access tokens, and PBO allocation/readback/map/unmap/delete @@ -2547,6 +2550,11 @@ Results: `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. +- Retained `Texture2D`, `TextureCube`, and RTT texture allocation, deletion, + binding, parameter setup, 2D update, and mipmap dispatch now share + `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. - 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_texture_dispatch.h b/src/legacy_gl_texture_dispatch.h new file mode 100644 index 0000000..32c91f3 --- /dev/null +++ b/src/legacy_gl_texture_dispatch.h @@ -0,0 +1,242 @@ +#pragma once + +#include +#include + +#include "log.h" +#include "renderer_gl/opengl_capabilities.h" + +namespace pp::legacy::gl_texture { + +inline void gen_opengl_textures(std::uint32_t count, std::uint32_t* ids) noexcept +{ + glGenTextures(static_cast(count), reinterpret_cast(ids)); +} + +inline void delete_opengl_textures(std::uint32_t count, const std::uint32_t* ids) noexcept +{ + glDeleteTextures(static_cast(count), reinterpret_cast(ids)); +} + +inline void bind_opengl_texture(std::uint32_t target, std::uint32_t texture) noexcept +{ + glBindTexture(static_cast(target), static_cast(texture)); +} + +inline void upload_opengl_texture_2d( + std::uint32_t target, + std::int32_t level, + std::int32_t internal_format, + std::int32_t width, + std::int32_t height, + std::int32_t border, + std::uint32_t pixel_format, + std::uint32_t component_type, + const void* data) noexcept +{ + glTexImage2D( + static_cast(target), + static_cast(level), + static_cast(internal_format), + static_cast(width), + static_cast(height), + static_cast(border), + static_cast(pixel_format), + static_cast(component_type), + data); +} + +inline void update_opengl_texture_2d_region( + std::uint32_t target, + std::int32_t level, + 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, + const void* data) noexcept +{ + glTexSubImage2D( + static_cast(target), + static_cast(level), + static_cast(x), + static_cast(y), + static_cast(width), + static_cast(height), + static_cast(pixel_format), + static_cast(component_type), + data); +} + +inline void set_opengl_texture_parameter_f(std::uint32_t target, std::uint32_t parameter, float value) noexcept +{ + glTexParameterf(static_cast(target), static_cast(parameter), static_cast(value)); +} + +inline void generate_opengl_mipmap(std::uint32_t target) noexcept +{ + glGenerateMipmap(static_cast(target)); +} + +inline pp::renderer::gl::OpenGlTexture2DAllocationDispatch texture_2d_allocation_dispatch() noexcept +{ + return pp::renderer::gl::OpenGlTexture2DAllocationDispatch { + .gen_textures = gen_opengl_textures, + .bind_texture = bind_opengl_texture, + .tex_image_2d = upload_opengl_texture_2d, + }; +} + +inline pp::renderer::gl::OpenGlTextureCubeAllocationDispatch texture_cube_allocation_dispatch() noexcept +{ + return pp::renderer::gl::OpenGlTextureCubeAllocationDispatch { + .gen_textures = gen_opengl_textures, + .bind_texture = bind_opengl_texture, + .tex_image_2d = upload_opengl_texture_2d, + }; +} + +inline pp::renderer::gl::OpenGlTexture2DDeleteDispatch texture_delete_dispatch() noexcept +{ + return pp::renderer::gl::OpenGlTexture2DDeleteDispatch { + .delete_textures = delete_opengl_textures, + }; +} + +inline pp::renderer::gl::OpenGlTexture2DBindDispatch texture_bind_dispatch() noexcept +{ + return pp::renderer::gl::OpenGlTexture2DBindDispatch { + .bind_texture = bind_opengl_texture, + }; +} + +inline pp::renderer::gl::OpenGlTexture2DUpdateDispatch texture_update_dispatch() noexcept +{ + return pp::renderer::gl::OpenGlTexture2DUpdateDispatch { + .bind_texture = bind_opengl_texture, + .tex_sub_image_2d = update_opengl_texture_2d_region, + }; +} + +inline pp::renderer::gl::OpenGlTexture2DParameterDispatch texture_parameter_dispatch() noexcept +{ + return pp::renderer::gl::OpenGlTexture2DParameterDispatch { + .bind_texture = bind_opengl_texture, + .tex_parameter_f = set_opengl_texture_parameter_f, + }; +} + +inline pp::renderer::gl::OpenGlTexture2DMipmapDispatch texture_mipmap_dispatch() noexcept +{ + return pp::renderer::gl::OpenGlTexture2DMipmapDispatch { + .bind_texture = bind_opengl_texture, + .generate_mipmap = generate_opengl_mipmap, + }; +} + +inline std::uint32_t allocate_texture_2d( + pp::renderer::gl::OpenGlTexture2DAllocation allocation, + const char* context) +{ + const auto result = pp::renderer::gl::allocate_opengl_texture_2d(allocation, texture_2d_allocation_dispatch()); + if (!result.ok()) { + LOG("%s failed because: %s", context, result.status().message); + return 0U; + } + return result.value(); +} + +inline std::uint32_t allocate_texture_cube( + pp::renderer::gl::OpenGlTextureCubeAllocation allocation, + const char* context) +{ + const auto result = pp::renderer::gl::allocate_opengl_texture_cube( + allocation, + texture_cube_allocation_dispatch()); + if (!result.ok()) { + LOG("%s failed because: %s", context, result.status().message); + return 0U; + } + return result.value(); +} + +inline bool delete_texture_2d(std::uint32_t texture_id, const char* context) +{ + const auto status = pp::renderer::gl::delete_opengl_texture_2d(texture_id, texture_delete_dispatch()); + if (!status.ok()) { + LOG("%s failed because: %s", context, status.message); + return false; + } + return true; +} + +inline bool delete_texture_objects(std::span texture_ids, const char* context) +{ + const auto status = pp::renderer::gl::delete_opengl_texture_objects(texture_ids, texture_delete_dispatch()); + if (!status.ok()) { + LOG("%s failed because: %s", context, status.message); + return false; + } + return true; +} + +inline bool bind_texture_2d(std::uint32_t texture_id, const char* context) +{ + const auto status = pp::renderer::gl::bind_opengl_texture_2d(texture_id, texture_bind_dispatch()); + if (!status.ok()) { + LOG("%s failed because: %s", context, status.message); + return false; + } + return true; +} + +inline bool bind_texture_cube(std::uint32_t texture_id, const char* context) +{ + const auto status = pp::renderer::gl::bind_opengl_texture_cube(texture_id, texture_bind_dispatch()); + if (!status.ok()) { + LOG("%s failed because: %s", context, status.message); + return false; + } + return true; +} + +inline bool update_texture_2d(pp::renderer::gl::OpenGlTexture2DUpdate update, const char* context) +{ + const auto status = pp::renderer::gl::update_opengl_texture_2d(update, texture_update_dispatch()); + if (!status.ok()) { + LOG("%s failed because: %s", context, status.message); + return false; + } + return true; +} + +inline bool set_texture_2d_parameters( + std::uint32_t texture_id, + std::span parameters, + const char* context) +{ + const auto status = pp::renderer::gl::set_opengl_texture_2d_parameters( + texture_id, + parameters, + texture_parameter_dispatch()); + if (!status.ok()) { + LOG("%s failed because: %s", context, status.message); + return false; + } + return true; +} + +inline bool generate_texture_2d_mipmaps(std::uint32_t texture_id, const char* context) +{ + const auto status = pp::renderer::gl::generate_opengl_texture_2d_mipmaps( + texture_id, + texture_mipmap_dispatch()); + if (!status.ok()) { + LOG("%s failed because: %s", context, status.message); + return false; + } + return true; +} + +} // namespace pp::legacy::gl_texture diff --git a/src/rtt.cpp b/src/rtt.cpp index 0e8d00d..059d3f4 100644 --- a/src/rtt.cpp +++ b/src/rtt.cpp @@ -4,17 +4,13 @@ #include "util.h" #include "app.h" #include "legacy_gl_renderbuffer_dispatch.h" +#include "legacy_gl_texture_dispatch.h" #include "renderer_gl/opengl_capabilities.h" #include namespace { -[[nodiscard]] GLenum texture_2d_target() noexcept -{ - return static_cast(pp::renderer::gl::texture_2d_target()); -} - [[nodiscard]] GLenum framebuffer_target() noexcept { return static_cast(pp::renderer::gl::framebuffer_target()); @@ -50,72 +46,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_textures(std::uint32_t count, std::uint32_t* ids) noexcept -{ - glGenTextures(static_cast(count), reinterpret_cast(ids)); -} - -void delete_opengl_textures(std::uint32_t count, const std::uint32_t* ids) noexcept -{ - glDeleteTextures(static_cast(count), reinterpret_cast(ids)); -} - -void bind_opengl_texture(std::uint32_t target, std::uint32_t texture) noexcept -{ - glBindTexture(static_cast(target), static_cast(texture)); -} - -void set_opengl_texture_2d_image( - std::uint32_t target, - std::int32_t level, - std::int32_t internal_format, - std::int32_t width, - std::int32_t height, - std::int32_t border, - std::uint32_t pixel_format, - std::uint32_t component_type, - const void* data) noexcept -{ - glTexImage2D( - static_cast(target), - static_cast(level), - static_cast(internal_format), - static_cast(width), - static_cast(height), - static_cast(border), - static_cast(pixel_format), - static_cast(component_type), - data); -} - -void set_opengl_texture_2d_sub_image( - std::uint32_t target, - std::int32_t level, - 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, - const void* data) noexcept -{ - glTexSubImage2D( - static_cast(target), - static_cast(level), - static_cast(x), - static_cast(y), - static_cast(width), - static_cast(height), - static_cast(pixel_format), - static_cast(component_type), - data); -} - -void set_opengl_texture_parameter_f(std::uint32_t target, std::uint32_t parameter, float value) noexcept -{ - glTexParameterf(static_cast(target), static_cast(parameter), static_cast(value)); -} - void gen_opengl_framebuffers(std::uint32_t count, std::uint32_t* ids) noexcept { glGenFramebuffers(static_cast(count), reinterpret_cast(ids)); @@ -362,13 +292,9 @@ void RTT::destroy() if (texID) { //unbindTexture(); - const auto status = pp::renderer::gl::delete_opengl_texture_2d( + pp::legacy::gl_texture::delete_texture_2d( static_cast(texID), - pp::renderer::gl::OpenGlTexture2DDeleteDispatch { - .delete_textures = delete_opengl_textures, - }); - if (!status.ok()) - LOG("RTT::destroy texture delete failed because: %s", status.message); + "RTT::destroy texture delete"); //LOG("TEX rtt destroy %d", texID) } if (fboID) @@ -492,7 +418,7 @@ bool RTT::create(int width, int height, int tex/* = -1*/, GLint internal_format, if (tex == -1) { - const auto texture = pp::renderer::gl::allocate_opengl_texture_2d( + const auto texture = pp::legacy::gl_texture::allocate_texture_2d( pp::renderer::gl::OpenGlTexture2DAllocation { .width = width, .height = height, @@ -502,18 +428,13 @@ bool RTT::create(int width, int height, int tex/* = -1*/, GLint internal_format, static_cast(internal_format)), .data = nullptr, }, - pp::renderer::gl::OpenGlTexture2DAllocationDispatch { - .gen_textures = gen_opengl_textures, - .bind_texture = bind_opengl_texture, - .tex_image_2d = set_opengl_texture_2d_image, - }); - if (!texture.ok()) + "RTT::create texture allocation"); + if (texture == 0U) { - LOG("RTT::create texture allocation failed because: %s", texture.status().message); status = 0; return; } - texID = static_cast(texture.value()); + texID = static_cast(texture); //LOG("TEX rtt create %d", texID); } else @@ -521,16 +442,11 @@ bool RTT::create(int width, int height, int tex/* = -1*/, GLint internal_format, texID = tex; } - const auto parameter_status = pp::renderer::gl::set_opengl_texture_2d_parameters( + if (!pp::legacy::gl_texture::set_texture_2d_parameters( static_cast(texID), pp::renderer::gl::default_render_target_texture_parameters(), - pp::renderer::gl::OpenGlTexture2DParameterDispatch { - .bind_texture = bind_opengl_texture, - .tex_parameter_f = set_opengl_texture_parameter_f, - }); - if (!parameter_status.ok()) + "RTT::create texture parameter setup")) { - LOG("RTT::create texture parameter setup failed because: %s", parameter_status.message); status = 0; return; } @@ -734,23 +650,18 @@ bool RTT::updateRgba8(int x, int y, int width, int height, const void* data) noe if (!valid() || data == nullptr) return false; - const auto status = pp::renderer::gl::update_opengl_texture_2d( - pp::renderer::gl::OpenGlTexture2DUpdate { - .texture_id = texID, - .x = x, + if (!pp::legacy::gl_texture::update_texture_2d( + pp::renderer::gl::OpenGlTexture2DUpdate { + .texture_id = texID, + .x = x, .y = y, .width = width, .height = height, .pixel_format = pp::renderer::gl::rgba_pixel_format(), - .component_type = pp::renderer::gl::unsigned_byte_component_type(), - .data = data, - }, - pp::renderer::gl::OpenGlTexture2DUpdateDispatch { - .bind_texture = bind_opengl_texture, - .tex_sub_image_2d = set_opengl_texture_2d_sub_image, - }); - if (!status.ok()) { - LOG("RTT::updateRgba8() failed because: %s", status.message); + .component_type = pp::renderer::gl::unsigned_byte_component_type(), + .data = data, + }, + "RTT::updateRgba8()")) { return false; } unbindTexture(); @@ -835,25 +746,17 @@ float * RTT::createBufferFloat() const noexcept void RTT::bindTexture() { assert(App::I->is_render_thread()); - const auto status = pp::renderer::gl::bind_opengl_texture_2d( + pp::legacy::gl_texture::bind_texture_2d( static_cast(texID), - pp::renderer::gl::OpenGlTexture2DBindDispatch { - .bind_texture = bind_opengl_texture, - }); - if (!status.ok()) - LOG("RTT::bindTexture() failed because: %s", status.message); + "RTT::bindTexture()"); } void RTT::unbindTexture() { assert(App::I->is_render_thread()); - const auto status = pp::renderer::gl::bind_opengl_texture_2d( + pp::legacy::gl_texture::bind_texture_2d( 0U, - pp::renderer::gl::OpenGlTexture2DBindDispatch { - .bind_texture = bind_opengl_texture, - }); - if (!status.ok()) - LOG("RTT::unbindTexture() failed because: %s", status.message); + "RTT::unbindTexture()"); } Image RTT::get_image() const noexcept diff --git a/src/texture.cpp b/src/texture.cpp index 346dc6b..0f3dd13 100644 --- a/src/texture.cpp +++ b/src/texture.cpp @@ -3,78 +3,13 @@ #include "texture.h" #include "util.h" #include "app.h" +#include "legacy_gl_texture_dispatch.h" #include "renderer_gl/opengl_capabilities.h" #include namespace { -void gen_opengl_textures(std::uint32_t count, std::uint32_t* ids) noexcept -{ - glGenTextures(static_cast(count), reinterpret_cast(ids)); -} - -void delete_opengl_textures(std::uint32_t count, const std::uint32_t* ids) noexcept -{ - glDeleteTextures(static_cast(count), reinterpret_cast(ids)); -} - -void bind_opengl_texture(std::uint32_t target, std::uint32_t texture) noexcept -{ - glBindTexture(static_cast(target), static_cast(texture)); -} - -void upload_opengl_texture_2d( - std::uint32_t target, - std::int32_t level, - std::int32_t internal_format, - std::int32_t width, - std::int32_t height, - std::int32_t border, - std::uint32_t pixel_format, - std::uint32_t component_type, - const void* data) noexcept -{ - glTexImage2D( - static_cast(target), - static_cast(level), - static_cast(internal_format), - static_cast(width), - static_cast(height), - static_cast(border), - static_cast(pixel_format), - static_cast(component_type), - data); -} - -void update_opengl_texture_2d_region( - std::uint32_t target, - std::int32_t level, - 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, - const void* data) noexcept -{ - glTexSubImage2D( - static_cast(target), - static_cast(level), - static_cast(x), - static_cast(y), - static_cast(width), - static_cast(height), - static_cast(pixel_format), - static_cast(component_type), - data); -} - -void generate_opengl_mipmap(std::uint32_t target) noexcept -{ - glGenerateMipmap(static_cast(target)); -} - void gen_opengl_framebuffers(std::uint32_t count, std::uint32_t* ids) noexcept { glGenFramebuffers(static_cast(count), reinterpret_cast(ids)); @@ -227,24 +162,19 @@ bool TextureCube::create(int resolution) noexcept destroy(); m_resolution = resolution; const auto format = pp::renderer::gl::texture_format_for_channel_count(4U); - const auto texture = pp::renderer::gl::allocate_opengl_texture_cube( + const auto texture = pp::legacy::gl_texture::allocate_texture_cube( pp::renderer::gl::OpenGlTextureCubeAllocation { .resolution = m_resolution, .internal_format = static_cast(format.internal_format), .pixel_format = format.pixel_format, .component_type = pp::renderer::gl::unsigned_byte_component_type(), }, - pp::renderer::gl::OpenGlTextureCubeAllocationDispatch { - .gen_textures = gen_opengl_textures, - .bind_texture = bind_opengl_texture, - .tex_image_2d = upload_opengl_texture_2d, - }); - if (!texture.ok()) + "TextureCube::create()"); + if (texture == 0U) { - LOG("TextureCube::create() failed because: %s", texture.status().message); return; } - m_cubetex_id = static_cast(texture.value()); + m_cubetex_id = static_cast(texture); }); return m_cubetex_id != 0; } @@ -259,13 +189,9 @@ void TextureCube::destroy() noexcept for (std::size_t i = 0U; i < f.size(); ++i) texture_ids[i] = static_cast(f[i]); texture_ids[f.size()] = static_cast(id); - const auto status = pp::renderer::gl::delete_opengl_texture_objects( + pp::legacy::gl_texture::delete_texture_objects( texture_ids, - pp::renderer::gl::OpenGlTexture2DDeleteDispatch { - .delete_textures = delete_opengl_textures, - }); - if (!status.ok()) - LOG("TextureCube::destroy() failed because: %s", status.message); + "TextureCube::destroy()"); }); m_cubetex_id = 0; m_faces.fill(0); @@ -276,13 +202,9 @@ void TextureCube::destroy() noexcept void TextureCube::bind() const noexcept { assert(App::I->is_render_thread()); - const auto status = pp::renderer::gl::bind_opengl_texture_cube( + pp::legacy::gl_texture::bind_texture_cube( static_cast(m_cubetex_id), - pp::renderer::gl::OpenGlTexture2DBindDispatch { - .bind_texture = bind_opengl_texture, - }); - if (!status.ok()) - LOG("TextureCube::bind() failed because: %s", status.message); + "TextureCube::bind()"); } bool TextureManager::load(const char* path, bool generate_mipmaps) @@ -344,7 +266,7 @@ Image Texture2D::get_image() const noexcept .pixels = ret.m_data.get(), }, pp::renderer::gl::OpenGlTexture2DReadbackDispatch { - .bind_texture = bind_opengl_texture, + .bind_texture = pp::legacy::gl_texture::bind_opengl_texture, .gen_framebuffers = gen_opengl_framebuffers, .get_integer = query_opengl_integer, .bind_framebuffer = bind_opengl_framebuffer, @@ -413,7 +335,7 @@ bool Texture2D::create(int width, int height, GLint internal_format, GLint forma destroy(); const auto component_type = pp::renderer::gl::texture_upload_type_for_internal_format( static_cast(internal_format)); - const auto texture = pp::renderer::gl::allocate_opengl_texture_2d( + const auto texture = pp::legacy::gl_texture::allocate_texture_2d( pp::renderer::gl::OpenGlTexture2DAllocation { .width = width, .height = height, @@ -422,13 +344,8 @@ bool Texture2D::create(int width, int height, GLint internal_format, GLint forma .component_type = component_type, .data = data, }, - pp::renderer::gl::OpenGlTexture2DAllocationDispatch { - .gen_textures = gen_opengl_textures, - .bind_texture = bind_opengl_texture, - .tex_image_2d = upload_opengl_texture_2d, - }); - if (!texture.ok()) { - LOG("Texture2D::create() failed because: %s", texture.status().message); + "Texture2D::create()"); + if (texture == 0U) { return; } @@ -436,7 +353,7 @@ bool Texture2D::create(int width, int height, GLint internal_format, GLint forma m_height = height; m_format = format; m_iformat = internal_format; - m_tex = static_cast(texture.value()); + m_tex = static_cast(texture); }); return true; } @@ -458,14 +375,9 @@ void Texture2D::create_mipmaps() { App::I->render_task([this] { - const auto status = pp::renderer::gl::generate_opengl_texture_2d_mipmaps( + if (!pp::legacy::gl_texture::generate_texture_2d_mipmaps( static_cast(m_tex), - pp::renderer::gl::OpenGlTexture2DMipmapDispatch { - .bind_texture = bind_opengl_texture, - .generate_mipmap = generate_opengl_mipmap, - }); - if (!status.ok()) { - LOG("Texture2D::create_mipmaps() failed because: %s", status.message); + "Texture2D::create_mipmaps()")) { return; } has_mips = true; @@ -515,13 +427,9 @@ void Texture2D::destroy() { App::I->render_task_async([id = m_tex] { - const auto status = pp::renderer::gl::delete_opengl_texture_2d( + pp::legacy::gl_texture::delete_texture_2d( static_cast(id), - pp::renderer::gl::OpenGlTexture2DDeleteDispatch { - .delete_textures = delete_opengl_textures, - }); - if (!status.ok()) - LOG("Texture2D::destroy() failed because: %s", status.message); + "Texture2D::destroy()"); }); m_tex = 0; } @@ -530,32 +438,24 @@ void Texture2D::destroy() void Texture2D::bind() const { assert(App::I->is_render_thread()); - const auto status = pp::renderer::gl::bind_opengl_texture_2d( + pp::legacy::gl_texture::bind_texture_2d( static_cast(m_tex), - pp::renderer::gl::OpenGlTexture2DBindDispatch { - .bind_texture = bind_opengl_texture, - }); - if (!status.ok()) - LOG("Texture2D::bind() failed because: %s", status.message); + "Texture2D::bind()"); } void Texture2D::unbind() const { assert(App::I->is_render_thread()); - const auto status = pp::renderer::gl::bind_opengl_texture_2d( + pp::legacy::gl_texture::bind_texture_2d( 0U, - pp::renderer::gl::OpenGlTexture2DBindDispatch { - .bind_texture = bind_opengl_texture, - }); - if (!status.ok()) - LOG("Texture2D::unbind() failed because: %s", status.message); + "Texture2D::unbind()"); } void Texture2D::update(const uint8_t* data) { App::I->render_task([this, data] { - const auto status = pp::renderer::gl::update_opengl_texture_2d( + pp::legacy::gl_texture::update_texture_2d( pp::renderer::gl::OpenGlTexture2DUpdate { .texture_id = static_cast(m_tex), .width = m_width, @@ -564,12 +464,7 @@ void Texture2D::update(const uint8_t* data) .component_type = pp::renderer::gl::unsigned_byte_component_type(), .data = data, }, - pp::renderer::gl::OpenGlTexture2DUpdateDispatch { - .bind_texture = bind_opengl_texture, - .tex_sub_image_2d = update_opengl_texture_2d_region, - }); - if (!status.ok()) - LOG("Texture2D::update() failed because: %s", status.message); + "Texture2D::update()"); }); }