diff --git a/docs/modernization/build-inventory.md b/docs/modernization/build-inventory.md index d7bb531..c9f934d 100644 --- a/docs/modernization/build-inventory.md +++ b/docs/modernization/build-inventory.md @@ -490,12 +490,11 @@ powershell -ExecutionPolicy Bypass -File scripts\automation\apple-remote-build.p `Shader` no longer spells GL enum names directly. It also owns the PanoPainter shader uniform catalog and legacy hash mapping used by `Shader` active-uniform discovery and the uniform uniqueness - check. Legacy `Shader` program use/delete, uniform writes, and - attribute-location lookup now consume tested dispatch contracts here. - Legacy shader source compilation, shader deletion, program attach/link, - attribute rebinding, active-uniform count/enumeration, and uniform-location - discovery now consume tested dispatch contracts as well, leaving the retained - shader utility with thin GL adapter functions. + check. Legacy `Shader` program use/delete, uniform writes, + attribute-location lookup, shader source compilation, shader deletion, + program attach/link, attribute rebinding, active-uniform count/enumeration, + and uniform-location discovery now consume tested dispatch contracts here + through `legacy_gl_shader_dispatch`. App OpenGL initialization debug severity, debug output, GL info string, renderer API viewport/scissor rect conversion, default depth/program-point/ line-smooth state, blend factor/equation, and UI render-target RGBA8 format diff --git a/docs/modernization/debt.md b/docs/modernization/debt.md index ce38f1d..044ce57 100644 --- a/docs/modernization/debt.md +++ b/docs/modernization/debt.md @@ -385,6 +385,13 @@ agent or engineer to remove them without reconstructing context from chat. `src/node_colorwheel.cpp` no longer carry duplicated raw mesh callback clusters. Renderer services still need to own mesh resource lifetime before this bridge can be removed. +- 2026-06-05: DEBT-0036 was narrowed again. Retained shader source + compilation/deletion, program attach/link/use/delete, attribute rebinding and + location lookup, active-uniform enumeration, uniform-location discovery, and + vec/mat/scalar uniform writes now share `legacy_gl_shader_dispatch`, so + `src/shader.cpp` no longer carries raw shader/program/uniform callback + ownership. Renderer services still need to own shader-program lifetime before + this bridge can be removed. ## Open Debt @@ -423,7 +430,7 @@ agent or engineer to remove them without reconstructing context from chat. | DEBT-0033 | Open | Modernization | Tools menu planning and direct command execution dispatch now consume pure `pp_app_core` through `App::init_menu_tools`, `pano_cli plan-tools-menu`, `pano_cli plan-tools-panel`, `pano_cli plan-canvas-camera-reset`, `pano_cli plan-canvas-view-density`, `pano_cli plan-canvas-view-cursor-mode`, and the `ToolsMenuServices` boundary, direct command execution is centralized in `src/legacy_app_shell_services.*`, SonarPen availability/startup now routes through `PlatformServices`, and reset-camera, viewport-density, and cursor-mode execution now share `src/legacy_canvas_view_services.*`, but live adapters still construct legacy `NodePanelFloating` panels, mutate legacy panel nodes, clear `CanvasModeGrid`, open legacy shortcuts UI, mutate retained `Canvas` camera/density/cursor state, write retained `Settings`, and rely on the legacy platform adapter for the retained iOS SonarPen bridge | Preserve current Tools menu and canvas-view behavior while UI shell actions move toward app/UI/platform/canvas services | `pp_app_core_tools_menu_tests`; `pp_app_core_canvas_view_tests`; `pp_platform_api_tests`; `pano_cli plan-tools-menu --command shortcuts`; `pano_cli plan-tools-panel --panel layers`; `pano_cli plan-tools-panel --panel animation --already-visible`; `pano_cli plan-canvas-camera-reset`; `pano_cli plan-canvas-view-density --density 1.5`; `pano_cli plan-canvas-view-cursor-mode --mode 3`; `ctest --preset desktop-fast --build-config Debug` | Tools panel creation, submenu routing, grid clear, camera reset, viewport density, cursor mode, shortcuts dialog, and SonarPen dispatch are owned by injected app/UI/platform/canvas services with `App::init_menu_tools` and options callbacks acting only as UI adapters and no legacy Tools/canvas-view adapter | | DEBT-0034 | Open | Modernization | About menu command planning and execution dispatch now consume pure `pp_app_core` through `App::init_menu_about`, `pano_cli plan-about-menu`, and the `AboutMenuServices` boundary, and live execution is centralized in `src/legacy_app_shell_services.*`, but the bridge still opens legacy About/manual/what's-new dialogs, invokes the injected crash hook, and runs the legacy Canvas stroke performance test directly | Preserve About menu behavior while dialogs and diagnostics move toward app/UI/platform services | `pp_app_core_about_menu_tests`; `pano_cli plan-about-menu --command news --version-major 2 --version-minor 5 --version-fix 7`; `pano_cli plan-about-menu --command performance --no-canvas`; `ctest --preset desktop-fast --build-config Debug` | About/manual/what's-new dialog dispatch, crash-test dispatch, and performance-test execution are owned by injected app/UI/platform services with `App::init_menu_about` acting only as a UI adapter and no legacy About adapter | | DEBT-0035 | Open | Modernization | Main toolbar/status command planning and execution dispatch now consume pure `pp_app_core` through `App::init_toolbar_main`, `pano_cli plan-main-toolbar`, and the `MainToolbarServices` boundary; toolbar test-message dialog metadata now lives in `pp_app_core` through `plan_main_toolbar_message_dialog`, retained message-box creation routes through `src/legacy_app_dialog_services.*`, history/canvas commands now hand off through `HistoryUiServices` and `DocumentCanvasClearServices`, and live execution is centralized in `src/legacy_app_shell_services.*`, but the bridge still opens legacy open/save/settings dialogs, stores raw compatibility pointers, and delegates to legacy history/canvas adapters | Preserve reachable toolbar/status behavior while app shell commands move toward app/document/UI services | `pp_app_core_main_toolbar_tests`; `pano_cli plan-main-toolbar --command undo --undo-count 2`; `pano_cli plan-main-toolbar --command message-box`; `pano_cli plan-main-toolbar --command clear-canvas --no-canvas`; `ctest --preset desktop-fast --build-config Debug` | Open/save/settings/message-box routing, undo/redo/clear-history execution, and canvas-clear execution are owned by injected app/document/UI services with `App::init_toolbar_main` acting only as a UI adapter and no legacy toolbar adapter | -| DEBT-0036 | Open | Modernization | `pp_renderer_api`, `pp_paint_renderer`, `pano_cli plan-paint-feedback`, and `pano_cli plan-stroke-composite` can choose backend-neutral complex paint feedback strategies for fixed-function blending, framebuffer-fetch-capable renderers, or ping-pong render targets. OpenGL extension detection now stores `pp::renderer::RenderDeviceFeatures` through `ShaderManager`, using `pp_renderer_gl::query_opengl_capability_detection`, `detect_opengl_feature_state`, and `render_device_features` as the backend conversion point; that feature snapshot now includes float32-linear filtering, so canvas stroke texture format selection, renderer diagnostics, grid lightmap render planning, and grid bake target selection no longer read `ShaderManager::ext_*` flags directly. `pp_paint_renderer::plan_canvas_blend_gate` owns the compatibility mapping from persisted layer/brush blend indices to the extracted stroke-composite planner, and live `Canvas::draw_merge` plus `NodeCanvas` panorama rendering both call it with the stored renderer-neutral feature set for their existing shader-blend gates and destination-copy versus framebuffer-fetch decisions. `pp_paint_renderer::plan_canvas_stroke_feedback` also owns the current destination-feedback decision, and live `Canvas::stroke_draw`, thumbnail layer blending, and `NodeStrokePreview` brush-preview rendering use it for framebuffer-fetch versus destination-copy decisions. The retained `copy_framebuffer_to_texture_2d` utility bridge now routes 2D framebuffer-to-texture copies through tested `pp_renderer_gl` dispatch, retained `RTT::create`/`RTT::destroy` render-target texture parameter setup, optional depth renderbuffer allocation, framebuffer allocation/attachment/status checks, binding restore, and resource deletion now route through tested `pp_renderer_gl` dispatch, retained RTT clear, masked clear with color-write-mask restore, texture bind/unbind, and RGBA8 dirty-region texture writes now route through tested `pp_renderer_gl` dispatch, retained Canvas, NodeCanvas, and NodeStrokePreview texture-unit switches now route through tested active-texture dispatch, retained Canvas, NodeCanvas, NodeStrokePreview, and desktop HMD viewport/scissor/capability execution now route through tested `pp_renderer_gl` dispatch adapters, retained NodeCanvas, CanvasMode, and NodePanelGrid capability-state snapshots now route through tested `pp_renderer_gl` query dispatch, CanvasLayer cube/equirect generation plus frame clears now share `legacy_ui_gl_dispatch` for active-texture selection, cube texture binding, viewport execution, blend capability execution, clear-color query/restore, and color-buffer clear adapter endpoints backed by tested `pp_renderer_gl` dispatch helpers, while the cube-face framebuffer-to-texture copy now uses the shared retained `copy_framebuffer_to_texture_target` utility bridge backed by tested `pp_renderer_gl` dispatch and remains tracked by DEBT-0036 until renderer services own copy execution, `NodePanelGrid` live heightmap draw and bake setup now route depth/blend state, depth clears, color-write-mask toggles, active texture selection, bake viewport execution, sun-overlay viewport query, and desktop texture-resize readback through tested `pp_renderer_gl` dispatch adapters; its active-texture, depth/blend capability query/apply, viewport query/execution, depth-clear, and color-write-mask adapter endpoints now share `legacy_ui_gl_dispatch`, retained CanvasMode overlay/mask/transform paths now route active texture, depth/blend state, transform/cut viewport execution, paint-mode blend/depth state snapshots, and canvas-tip pick framebuffer readback through tested `pp_renderer_gl` dispatch adapters; their active-texture, capability query/apply, viewport, read-framebuffer query, and RGBA8 pixel-readback adapter endpoints now share `legacy_ui_gl_dispatch`, retained simple UI draw paths now share `legacy_ui_gl_dispatch` for blend-state execution, fallback 2D texture unbinds, `NodeViewport` viewport query/restore, color-buffer clears, and clear-color restore, retained `NodeCanvas` plus `NodeStrokePreview` draw-state paths now share `legacy_ui_gl_dispatch` for active-texture selection, fallback texture unbind, viewport/scissor execution, viewport and clear-color queries, color-buffer clears, clear-color restore, and capability query/apply adapter endpoints backed by tested `pp_renderer_gl` dispatch helpers, retained `Canvas` stroke/object/thumbnail/export/frame-clear state endpoints now share `legacy_ui_gl_dispatch` for active-texture selection, fallback texture unbind, viewport/scissor execution, viewport and clear-color query, clear-color restore, and capability query/apply adapter endpoints, retained Canvas and RTT depth renderbuffer allocation/attachment/delete now share `legacy_gl_renderbuffer_dispatch` while renderer-resource ownership remains retained, retained `Texture2D`, `TextureCube`, and RTT texture allocation/delete/bind/parameter/update/mipmap dispatch now share `legacy_gl_texture_dispatch` while renderer-resource ownership remains retained, retained `Texture2D` readback plus RTT framebuffer allocation/delete/bind/restore/blit/readback and PBO readback dispatch now share `legacy_gl_framebuffer_dispatch` while renderer-resource ownership remains retained, retained Sampler create/parameter/border/bind dispatch shares `legacy_gl_sampler_dispatch` and retained PBO allocation/readback/map/unmap/delete dispatch shares `legacy_gl_pixel_buffer_dispatch` while renderer-resource ownership remains retained, retained `Shape`, `TextMesh`, and `NodeColorWheel` mesh buffer/VAO creation/upload/draw/delete dispatch now share `legacy_gl_mesh_dispatch` while renderer-resource ownership remains retained, and retained `CanvasLayer` frame-clear draw-state paths route saved clear-color query and restore through the same tested helpers, but actual live stroke rasterization, dual-brush compositing, pattern feedback math, thumbnail layer compositing, brush-preview compositing, grid lightmap/heightmap mesh rendering, and the retained `ShaderManager::ext_*` compatibility fields still use legacy OpenGL canvas/UI execution | Preserve current painting behavior while the renderer boundary matures for OpenGL parity and later Vulkan/Metal experiments | `pp_renderer_api_tests`; `pp_renderer_gl_capabilities_tests`; `pp_paint_renderer_compositor_tests`; `pano_cli plan-paint-feedback --framebuffer-fetch --explicit-transitions --render-only`; `pano_cli plan-paint-feedback --texture-copy`; `pano_cli plan-stroke-composite --stroke-blend 10 --framebuffer-fetch --explicit-transitions --render-only`; `pano_cli plan-stroke-composite --layer-blend 4 --dual-blend --texture-copy`; `ctest --preset desktop-fast --build-config Debug`; `cmake --build --preset windows-msvc-default --config Debug --target PanoPainter` | Live stroke/layer compositing chooses its feedback path through `pp_paint_renderer` and renderer services, with OpenGL golden parity and Vulkan/Metal lab tests covering framebuffer-fetch and ping-pong behavior | +| DEBT-0036 | Open | Modernization | `pp_renderer_api`, `pp_paint_renderer`, `pano_cli plan-paint-feedback`, and `pano_cli plan-stroke-composite` can choose backend-neutral complex paint feedback strategies for fixed-function blending, framebuffer-fetch-capable renderers, or ping-pong render targets. OpenGL extension detection now stores `pp::renderer::RenderDeviceFeatures` through `ShaderManager`, using `pp_renderer_gl::query_opengl_capability_detection`, `detect_opengl_feature_state`, and `render_device_features` as the backend conversion point; that feature snapshot now includes float32-linear filtering, so canvas stroke texture format selection, renderer diagnostics, grid lightmap render planning, and grid bake target selection no longer read `ShaderManager::ext_*` flags directly. `pp_paint_renderer::plan_canvas_blend_gate` owns the compatibility mapping from persisted layer/brush blend indices to the extracted stroke-composite planner, and live `Canvas::draw_merge` plus `NodeCanvas` panorama rendering both call it with the stored renderer-neutral feature set for their existing shader-blend gates and destination-copy versus framebuffer-fetch decisions. `pp_paint_renderer::plan_canvas_stroke_feedback` also owns the current destination-feedback decision, and live `Canvas::stroke_draw`, thumbnail layer blending, and `NodeStrokePreview` brush-preview rendering use it for framebuffer-fetch versus destination-copy decisions. The retained `copy_framebuffer_to_texture_2d` utility bridge now routes 2D framebuffer-to-texture copies through tested `pp_renderer_gl` dispatch, retained `RTT::create`/`RTT::destroy` render-target texture parameter setup, optional depth renderbuffer allocation, framebuffer allocation/attachment/status checks, binding restore, and resource deletion now route through tested `pp_renderer_gl` dispatch, retained RTT clear, masked clear with color-write-mask restore, texture bind/unbind, and RGBA8 dirty-region texture writes now route through tested `pp_renderer_gl` dispatch, retained Canvas, NodeCanvas, and NodeStrokePreview texture-unit switches now route through tested active-texture dispatch, retained Canvas, NodeCanvas, NodeStrokePreview, and desktop HMD viewport/scissor/capability execution now route through tested `pp_renderer_gl` dispatch adapters, retained NodeCanvas, CanvasMode, and NodePanelGrid capability-state snapshots now route through tested `pp_renderer_gl` query dispatch, CanvasLayer cube/equirect generation plus frame clears now share `legacy_ui_gl_dispatch` for active-texture selection, cube texture binding, viewport execution, blend capability execution, clear-color query/restore, and color-buffer clear adapter endpoints backed by tested `pp_renderer_gl` dispatch helpers, while the cube-face framebuffer-to-texture copy now uses the shared retained `copy_framebuffer_to_texture_target` utility bridge backed by tested `pp_renderer_gl` dispatch and remains tracked by DEBT-0036 until renderer services own copy execution, `NodePanelGrid` live heightmap draw and bake setup now route depth/blend state, depth clears, color-write-mask toggles, active texture selection, bake viewport execution, sun-overlay viewport query, and desktop texture-resize readback through tested `pp_renderer_gl` dispatch adapters; its active-texture, depth/blend capability query/apply, viewport query/execution, depth-clear, and color-write-mask adapter endpoints now share `legacy_ui_gl_dispatch`, retained CanvasMode overlay/mask/transform paths now route active texture, depth/blend state, transform/cut viewport execution, paint-mode blend/depth state snapshots, and canvas-tip pick framebuffer readback through tested `pp_renderer_gl` dispatch adapters; their active-texture, capability query/apply, viewport, read-framebuffer query, and RGBA8 pixel-readback adapter endpoints now share `legacy_ui_gl_dispatch`, retained simple UI draw paths now share `legacy_ui_gl_dispatch` for blend-state execution, fallback 2D texture unbinds, `NodeViewport` viewport query/restore, color-buffer clears, and clear-color restore, retained `NodeCanvas` plus `NodeStrokePreview` draw-state paths now share `legacy_ui_gl_dispatch` for active-texture selection, fallback texture unbind, viewport/scissor execution, viewport and clear-color queries, color-buffer clears, clear-color restore, and capability query/apply adapter endpoints backed by tested `pp_renderer_gl` dispatch helpers, retained `Canvas` stroke/object/thumbnail/export/frame-clear state endpoints now share `legacy_ui_gl_dispatch` for active-texture selection, fallback texture unbind, viewport/scissor execution, viewport and clear-color query, clear-color restore, and capability query/apply adapter endpoints, retained Canvas and RTT depth renderbuffer allocation/attachment/delete now share `legacy_gl_renderbuffer_dispatch` while renderer-resource ownership remains retained, retained `Texture2D`, `TextureCube`, and RTT texture allocation/delete/bind/parameter/update/mipmap dispatch now share `legacy_gl_texture_dispatch` while renderer-resource ownership remains retained, retained `Texture2D` readback plus RTT framebuffer allocation/delete/bind/restore/blit/readback and PBO readback dispatch now share `legacy_gl_framebuffer_dispatch` while renderer-resource ownership remains retained, retained Sampler create/parameter/border/bind dispatch shares `legacy_gl_sampler_dispatch` and retained PBO allocation/readback/map/unmap/delete dispatch shares `legacy_gl_pixel_buffer_dispatch` while renderer-resource ownership remains retained, retained `Shape`, `TextMesh`, and `NodeColorWheel` mesh buffer/VAO creation/upload/draw/delete dispatch now share `legacy_gl_mesh_dispatch` while renderer-resource ownership remains retained, retained shader source compilation/deletion, program attach/link/use/delete, attribute rebinding/location lookup, active-uniform enumeration, uniform-location discovery, and uniform writes now share `legacy_gl_shader_dispatch` while shader-program ownership remains retained, 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 a6b3f5b..584d26d 100644 --- a/docs/modernization/roadmap.md +++ b/docs/modernization/roadmap.md @@ -1193,7 +1193,11 @@ mapping, including mirrored-repeat, and aggregate renderer API sampler-state to OpenGL min/mag/wrap mapping are also tested there. The PanoPainter shader attribute binding catalog, shader stage tokens, compile/link status queries, active-uniform count query, and matrix-uniform transpose token also live in `pp_renderer_gl` -and are consumed by legacy `Shader` creation. Renderer API blend factor/op to +and are consumed by legacy `Shader` creation; retained shader source +compilation/deletion, program attach/link/use/delete, attribute rebinding and +location lookup, active-uniform enumeration, uniform-location discovery, and +uniform writes now share the retained `legacy_gl_shader_dispatch` raw callback +bridge. Renderer API blend factor/op to OpenGL token mapping also lives in `pp_renderer_gl`, with explicit support flags so `GL_ZERO` remains distinguishable from unsupported enum values. Aggregate renderer API blend-state to OpenGL enable/factor/equation/color-mask mapping, @@ -2317,12 +2321,11 @@ Results: uniform catalog validation covers the 43 legacy uniform names used by `Shader`, preserves the legacy hash ids, and rejects empty, unnamed, null-name, mismatched-hash, and duplicate-name catalogs. - Legacy `Shader` program use/delete, uniform writes, and attribute-location - lookups now execute through tested `pp_renderer_gl` dispatch contracts. - Legacy shader source compilation, shader deletion, program attach/link, + Legacy `Shader` program use/delete, uniform writes, attribute-location + lookups, shader source compilation, shader deletion, program attach/link, attribute rebinding, active-uniform count/enumeration, and uniform-location - discovery also execute through tested `pp_renderer_gl` dispatch contracts, - leaving only thin GL adapter functions in the retained `Shader` utility. + discovery now execute through tested `pp_renderer_gl` dispatch contracts via + `legacy_gl_shader_dispatch`. Retained `Shape`, `TextMesh`, and `NodeColorWheel` mesh buffer/VAO creation, zero-byte dynamic-buffer creation, dynamic buffer uploads, indexed and non-indexed draws, and resource deletion now execute through tested @@ -2576,6 +2579,12 @@ Results: now share `legacy_gl_mesh_dispatch`, removing duplicated raw mesh callback clusters from `src/shape.cpp`, `src/font.cpp`, and `src/node_colorwheel.cpp` while mesh resource ownership remains retained under DEBT-0036. +- Retained shader source compilation/deletion, program attach/link/use/delete, + attribute rebinding and location lookup, active-uniform enumeration, + uniform-location discovery, and vec/mat/scalar uniform writes now share + `legacy_gl_shader_dispatch`, removing duplicated raw shader/program/uniform + callback ownership from `src/shader.cpp` while shader-program ownership + remains retained under DEBT-0036. - 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_shader_dispatch.h b/src/legacy_gl_shader_dispatch.h new file mode 100644 index 0000000..f716668 --- /dev/null +++ b/src/legacy_gl_shader_dispatch.h @@ -0,0 +1,298 @@ +#pragma once + +#include + +#include "renderer_gl/opengl_capabilities.h" + +namespace pp::legacy::gl_shader { + +inline void use_opengl_program(std::uint32_t program) noexcept +{ + glUseProgram(static_cast(program)); +} + +inline void delete_opengl_program(std::uint32_t program) noexcept +{ + glDeleteProgram(static_cast(program)); +} + +inline void set_opengl_uniform_4fv(std::int32_t location, std::int32_t count, const float* values) noexcept +{ + glUniform4fv(static_cast(location), static_cast(count), values); +} + +inline void set_opengl_uniform_3fv(std::int32_t location, std::int32_t count, const float* values) noexcept +{ + glUniform3fv(static_cast(location), static_cast(count), values); +} + +inline void set_opengl_uniform_2fv(std::int32_t location, std::int32_t count, const float* values) noexcept +{ + glUniform2fv(static_cast(location), static_cast(count), values); +} + +inline void set_opengl_uniform_matrix_4fv( + std::int32_t location, + std::int32_t count, + std::uint8_t transpose, + const float* values) noexcept +{ + glUniformMatrix4fv( + static_cast(location), + static_cast(count), + static_cast(transpose), + values); +} + +inline void set_opengl_uniform_1i(std::int32_t location, std::int32_t value) noexcept +{ + glUniform1i(static_cast(location), static_cast(value)); +} + +inline void set_opengl_uniform_1f(std::int32_t location, float value) noexcept +{ + glUniform1f(static_cast(location), value); +} + +inline std::int32_t get_opengl_attrib_location(std::uint32_t program, const char* name) noexcept +{ + return static_cast(glGetAttribLocation(static_cast(program), name)); +} + +inline std::uint32_t create_opengl_shader(std::uint32_t stage) noexcept +{ + return static_cast(glCreateShader(static_cast(stage))); +} + +inline void set_opengl_shader_source( + std::uint32_t shader, + std::int32_t count, + const char* const* sources) noexcept +{ + glShaderSource( + static_cast(shader), + static_cast(count), + reinterpret_cast(sources), + nullptr); +} + +inline void compile_opengl_shader(std::uint32_t shader) noexcept +{ + glCompileShader(static_cast(shader)); +} + +inline void query_opengl_shader_integer( + std::uint32_t shader, + std::uint32_t query, + std::int32_t* value) noexcept +{ + glGetShaderiv( + static_cast(shader), + static_cast(query), + reinterpret_cast(value)); +} + +inline void get_opengl_shader_info_log( + std::uint32_t shader, + std::int32_t capacity, + std::int32_t* length, + char* info_log) noexcept +{ + glGetShaderInfoLog( + static_cast(shader), + static_cast(capacity), + reinterpret_cast(length), + reinterpret_cast(info_log)); +} + +inline void delete_opengl_shader(std::uint32_t shader) noexcept +{ + glDeleteShader(static_cast(shader)); +} + +inline std::uint32_t create_opengl_program() noexcept +{ + return static_cast(glCreateProgram()); +} + +inline void attach_opengl_shader(std::uint32_t program, std::uint32_t shader) noexcept +{ + glAttachShader(static_cast(program), static_cast(shader)); +} + +inline void link_opengl_program(std::uint32_t program) noexcept +{ + glLinkProgram(static_cast(program)); +} + +inline void bind_opengl_attrib_location(std::uint32_t program, std::uint32_t location, const char* name) noexcept +{ + glBindAttribLocation(static_cast(program), static_cast(location), name); +} + +inline void query_opengl_program_integer( + std::uint32_t program, + std::uint32_t query, + std::int32_t* value) noexcept +{ + glGetProgramiv( + static_cast(program), + static_cast(query), + reinterpret_cast(value)); +} + +inline void get_opengl_program_info_log( + std::uint32_t program, + std::int32_t capacity, + std::int32_t* length, + char* info_log) noexcept +{ + glGetProgramInfoLog( + static_cast(program), + static_cast(capacity), + reinterpret_cast(length), + reinterpret_cast(info_log)); +} + +inline void get_opengl_active_uniform( + std::uint32_t program, + std::uint32_t index, + std::int32_t capacity, + std::int32_t* length, + std::int32_t* size, + std::uint32_t* type, + char* name) noexcept +{ + glGetActiveUniform( + static_cast(program), + static_cast(index), + static_cast(capacity), + reinterpret_cast(length), + reinterpret_cast(size), + reinterpret_cast(type), + reinterpret_cast(name)); +} + +inline std::int32_t get_opengl_uniform_location(std::uint32_t program, const char* name) noexcept +{ + return static_cast(glGetUniformLocation(static_cast(program), name)); +} + +inline pp::renderer::gl::OpenGlProgramUseDispatch program_use_dispatch() noexcept +{ + return pp::renderer::gl::OpenGlProgramUseDispatch { + .use_program = use_opengl_program, + }; +} + +inline pp::renderer::gl::OpenGlProgramDeleteDispatch program_delete_dispatch() noexcept +{ + return pp::renderer::gl::OpenGlProgramDeleteDispatch { + .use_program = use_opengl_program, + .delete_program = delete_opengl_program, + }; +} + +inline pp::renderer::gl::OpenGlUniformVec4Dispatch uniform_vec4_dispatch() noexcept +{ + return pp::renderer::gl::OpenGlUniformVec4Dispatch { + .uniform_4fv = set_opengl_uniform_4fv, + }; +} + +inline pp::renderer::gl::OpenGlUniformVec3Dispatch uniform_vec3_dispatch() noexcept +{ + return pp::renderer::gl::OpenGlUniformVec3Dispatch { + .uniform_3fv = set_opengl_uniform_3fv, + }; +} + +inline pp::renderer::gl::OpenGlUniformVec2Dispatch uniform_vec2_dispatch() noexcept +{ + return pp::renderer::gl::OpenGlUniformVec2Dispatch { + .uniform_2fv = set_opengl_uniform_2fv, + }; +} + +inline pp::renderer::gl::OpenGlUniformMat4Dispatch uniform_mat4_dispatch() noexcept +{ + return pp::renderer::gl::OpenGlUniformMat4Dispatch { + .uniform_matrix_4fv = set_opengl_uniform_matrix_4fv, + }; +} + +inline pp::renderer::gl::OpenGlUniformIntDispatch uniform_int_dispatch() noexcept +{ + return pp::renderer::gl::OpenGlUniformIntDispatch { + .uniform_1i = set_opengl_uniform_1i, + }; +} + +inline pp::renderer::gl::OpenGlUniformFloatDispatch uniform_float_dispatch() noexcept +{ + return pp::renderer::gl::OpenGlUniformFloatDispatch { + .uniform_1f = set_opengl_uniform_1f, + }; +} + +inline pp::renderer::gl::OpenGlAttributeLocationDispatch attribute_location_dispatch() noexcept +{ + return pp::renderer::gl::OpenGlAttributeLocationDispatch { + .get_attrib_location = get_opengl_attrib_location, + }; +} + +inline pp::renderer::gl::OpenGlShaderCompileDispatch shader_compile_dispatch() noexcept +{ + return pp::renderer::gl::OpenGlShaderCompileDispatch { + .create_shader = create_opengl_shader, + .shader_source = set_opengl_shader_source, + .compile_shader = compile_opengl_shader, + .get_shader_integer = query_opengl_shader_integer, + .get_shader_info_log = get_opengl_shader_info_log, + }; +} + +inline pp::renderer::gl::OpenGlShaderDeleteDispatch shader_delete_dispatch() noexcept +{ + return pp::renderer::gl::OpenGlShaderDeleteDispatch { + .delete_shader = delete_opengl_shader, + }; +} + +inline pp::renderer::gl::OpenGlProgramLinkDispatch program_link_dispatch() noexcept +{ + return pp::renderer::gl::OpenGlProgramLinkDispatch { + .create_program = create_opengl_program, + .attach_shader = attach_opengl_shader, + .delete_shader = delete_opengl_shader, + .link_program = link_opengl_program, + .get_attrib_location = get_opengl_attrib_location, + .bind_attrib_location = bind_opengl_attrib_location, + .get_program_integer = query_opengl_program_integer, + .get_program_info_log = get_opengl_program_info_log, + }; +} + +inline pp::renderer::gl::OpenGlProgramIntegerDispatch program_integer_dispatch() noexcept +{ + return pp::renderer::gl::OpenGlProgramIntegerDispatch { + .get_program_integer = query_opengl_program_integer, + }; +} + +inline pp::renderer::gl::OpenGlActiveUniformDispatch active_uniform_dispatch() noexcept +{ + return pp::renderer::gl::OpenGlActiveUniformDispatch { + .get_active_uniform = get_opengl_active_uniform, + }; +} + +inline pp::renderer::gl::OpenGlUniformLocationDispatch uniform_location_dispatch() noexcept +{ + return pp::renderer::gl::OpenGlUniformLocationDispatch { + .get_uniform_location = get_opengl_uniform_location, + }; +} + +} // namespace pp::legacy::gl_shader diff --git a/src/shader.cpp b/src/shader.cpp index ee8d92c..585144e 100644 --- a/src/shader.cpp +++ b/src/shader.cpp @@ -3,212 +3,12 @@ #include "shader.h" #include "asset.h" #include "app.h" +#include "legacy_gl_shader_dispatch.h" #include "renderer_gl/opengl_capabilities.h" #include "renderer_gl/shader_bindings.h" #include -namespace { - -[[nodiscard]] GLenum vertex_shader_stage() noexcept -{ - return static_cast(pp::renderer::gl::vertex_shader_stage()); -} - -[[nodiscard]] GLenum fragment_shader_stage() noexcept -{ - return static_cast(pp::renderer::gl::fragment_shader_stage()); -} - -[[nodiscard]] GLenum shader_compile_status_query() noexcept -{ - return static_cast(pp::renderer::gl::shader_compile_status_query()); -} - -[[nodiscard]] GLenum program_link_status_query() noexcept -{ - return static_cast(pp::renderer::gl::program_link_status_query()); -} - -[[nodiscard]] GLenum active_uniform_count_query() noexcept -{ - return static_cast(pp::renderer::gl::active_uniform_count_query()); -} - -void use_opengl_program(std::uint32_t program) noexcept -{ - glUseProgram(static_cast(program)); -} - -void delete_opengl_program(std::uint32_t program) noexcept -{ - glDeleteProgram(static_cast(program)); -} - -void set_opengl_uniform_4fv(std::int32_t location, std::int32_t count, const float* values) noexcept -{ - glUniform4fv(static_cast(location), static_cast(count), values); -} - -void set_opengl_uniform_3fv(std::int32_t location, std::int32_t count, const float* values) noexcept -{ - glUniform3fv(static_cast(location), static_cast(count), values); -} - -void set_opengl_uniform_2fv(std::int32_t location, std::int32_t count, const float* values) noexcept -{ - glUniform2fv(static_cast(location), static_cast(count), values); -} - -void set_opengl_uniform_matrix_4fv( - std::int32_t location, - std::int32_t count, - std::uint8_t transpose, - const float* values) noexcept -{ - glUniformMatrix4fv( - static_cast(location), - static_cast(count), - static_cast(transpose), - values); -} - -void set_opengl_uniform_1i(std::int32_t location, std::int32_t value) noexcept -{ - glUniform1i(static_cast(location), static_cast(value)); -} - -void set_opengl_uniform_1f(std::int32_t location, float value) noexcept -{ - glUniform1f(static_cast(location), value); -} - -std::int32_t get_opengl_attrib_location(std::uint32_t program, const char* name) noexcept -{ - return static_cast(glGetAttribLocation(static_cast(program), name)); -} - -std::uint32_t create_opengl_shader(std::uint32_t stage) noexcept -{ - return static_cast(glCreateShader(static_cast(stage))); -} - -void set_opengl_shader_source( - std::uint32_t shader, - std::int32_t count, - const char* const* sources) noexcept -{ - glShaderSource( - static_cast(shader), - static_cast(count), - reinterpret_cast(sources), - nullptr); -} - -void compile_opengl_shader(std::uint32_t shader) noexcept -{ - glCompileShader(static_cast(shader)); -} - -void query_opengl_shader_integer( - std::uint32_t shader, - std::uint32_t query, - std::int32_t* value) noexcept -{ - glGetShaderiv( - static_cast(shader), - static_cast(query), - reinterpret_cast(value)); -} - -void get_opengl_shader_info_log( - std::uint32_t shader, - std::int32_t capacity, - std::int32_t* length, - char* info_log) noexcept -{ - glGetShaderInfoLog( - static_cast(shader), - static_cast(capacity), - reinterpret_cast(length), - reinterpret_cast(info_log)); -} - -void delete_opengl_shader(std::uint32_t shader) noexcept -{ - glDeleteShader(static_cast(shader)); -} - -std::uint32_t create_opengl_program() noexcept -{ - return static_cast(glCreateProgram()); -} - -void attach_opengl_shader(std::uint32_t program, std::uint32_t shader) noexcept -{ - glAttachShader(static_cast(program), static_cast(shader)); -} - -void link_opengl_program(std::uint32_t program) noexcept -{ - glLinkProgram(static_cast(program)); -} - -void bind_opengl_attrib_location(std::uint32_t program, std::uint32_t location, const char* name) noexcept -{ - glBindAttribLocation(static_cast(program), static_cast(location), name); -} - -void query_opengl_program_integer( - std::uint32_t program, - std::uint32_t query, - std::int32_t* value) noexcept -{ - glGetProgramiv( - static_cast(program), - static_cast(query), - reinterpret_cast(value)); -} - -void get_opengl_program_info_log( - std::uint32_t program, - std::int32_t capacity, - std::int32_t* length, - char* info_log) noexcept -{ - glGetProgramInfoLog( - static_cast(program), - static_cast(capacity), - reinterpret_cast(length), - reinterpret_cast(info_log)); -} - -void get_opengl_active_uniform( - std::uint32_t program, - std::uint32_t index, - std::int32_t capacity, - std::int32_t* length, - std::int32_t* size, - std::uint32_t* type, - char* name) noexcept -{ - glGetActiveUniform( - static_cast(program), - static_cast(index), - static_cast(capacity), - reinterpret_cast(length), - reinterpret_cast(size), - reinterpret_cast(type), - reinterpret_cast(name)); -} - -std::int32_t get_opengl_uniform_location(std::uint32_t program, const char* name) noexcept -{ - return static_cast(glGetUniformLocation(static_cast(program), name)); -} - -} - std::map ShaderManager::m_shaders; Shader* ShaderManager::m_current; pp::renderer::RenderDeviceFeatures ShaderManager::m_render_device_features {}; @@ -373,13 +173,7 @@ bool Shader::create(const std::string& vertex, const std::string& fragment) vertex.c_str(), infolog, static_cast(sizeof(infolog)), - pp::renderer::gl::OpenGlShaderCompileDispatch { - .create_shader = create_opengl_shader, - .shader_source = set_opengl_shader_source, - .compile_shader = compile_opengl_shader, - .get_shader_integer = query_opengl_shader_integer, - .get_shader_info_log = get_opengl_shader_info_log, - }); + pp::legacy::gl_shader::shader_compile_dispatch()); if (!vertex_shader.ok()) { ret = false; @@ -395,9 +189,7 @@ bool Shader::create(const std::string& vertex, const std::string& fragment) { const auto status = pp::renderer::gl::delete_opengl_shader( vertex_shader.value().shader_id, - pp::renderer::gl::OpenGlShaderDeleteDispatch { - .delete_shader = delete_opengl_shader, - }); + pp::legacy::gl_shader::shader_delete_dispatch()); if (!status.ok()) LOG("Shader::create() vertex shader cleanup failed because: %s", status.message); ret = false; @@ -409,20 +201,12 @@ bool Shader::create(const std::string& vertex, const std::string& fragment) fragment.c_str(), infolog, static_cast(sizeof(infolog)), - pp::renderer::gl::OpenGlShaderCompileDispatch { - .create_shader = create_opengl_shader, - .shader_source = set_opengl_shader_source, - .compile_shader = compile_opengl_shader, - .get_shader_integer = query_opengl_shader_integer, - .get_shader_info_log = get_opengl_shader_info_log, - }); + pp::legacy::gl_shader::shader_compile_dispatch()); if (!fragment_shader.ok()) { const auto status = pp::renderer::gl::delete_opengl_shader( vertex_shader.value().shader_id, - pp::renderer::gl::OpenGlShaderDeleteDispatch { - .delete_shader = delete_opengl_shader, - }); + pp::legacy::gl_shader::shader_delete_dispatch()); if (!status.ok()) LOG("Shader::create() vertex shader cleanup failed because: %s", status.message); ret = false; @@ -438,14 +222,10 @@ bool Shader::create(const std::string& vertex, const std::string& fragment) { const auto vertex_cleanup = pp::renderer::gl::delete_opengl_shader( vertex_shader.value().shader_id, - pp::renderer::gl::OpenGlShaderDeleteDispatch { - .delete_shader = delete_opengl_shader, - }); + pp::legacy::gl_shader::shader_delete_dispatch()); const auto fragment_cleanup = pp::renderer::gl::delete_opengl_shader( fragment_shader.value().shader_id, - pp::renderer::gl::OpenGlShaderDeleteDispatch { - .delete_shader = delete_opengl_shader, - }); + pp::legacy::gl_shader::shader_delete_dispatch()); if (!vertex_cleanup.ok()) LOG("Shader::create() vertex shader cleanup failed because: %s", vertex_cleanup.message); if (!fragment_cleanup.ok()) @@ -460,28 +240,15 @@ bool Shader::create(const std::string& vertex, const std::string& fragment) pp::renderer::gl::panopainter_shader_attribute_bindings(), infolog, static_cast(sizeof(infolog)), - pp::renderer::gl::OpenGlProgramLinkDispatch { - .create_program = create_opengl_program, - .attach_shader = attach_opengl_shader, - .delete_shader = delete_opengl_shader, - .link_program = link_opengl_program, - .get_attrib_location = get_opengl_attrib_location, - .bind_attrib_location = bind_opengl_attrib_location, - .get_program_integer = query_opengl_program_integer, - .get_program_info_log = get_opengl_program_info_log, - }); + pp::legacy::gl_shader::program_link_dispatch()); if (!program.ok()) { const auto vertex_cleanup = pp::renderer::gl::delete_opengl_shader( vertex_shader.value().shader_id, - pp::renderer::gl::OpenGlShaderDeleteDispatch { - .delete_shader = delete_opengl_shader, - }); + pp::legacy::gl_shader::shader_delete_dispatch()); const auto fragment_cleanup = pp::renderer::gl::delete_opengl_shader( fragment_shader.value().shader_id, - pp::renderer::gl::OpenGlShaderDeleteDispatch { - .delete_shader = delete_opengl_shader, - }); + pp::legacy::gl_shader::shader_delete_dispatch()); if (!vertex_cleanup.ok()) LOG("Shader::create() vertex shader cleanup failed because: %s", vertex_cleanup.message); if (!fragment_cleanup.ok()) @@ -496,10 +263,7 @@ bool Shader::create(const std::string& vertex, const std::string& fragment) { const auto status = pp::renderer::gl::delete_opengl_program( program.value().program_id, - pp::renderer::gl::OpenGlProgramDeleteDispatch { - .use_program = use_opengl_program, - .delete_program = delete_opengl_program, - }); + pp::legacy::gl_shader::program_delete_dispatch()); if (!status.ok()) LOG("Shader::create() program cleanup failed because: %s", status.message); ret = false; @@ -509,10 +273,7 @@ bool Shader::create(const std::string& vertex, const std::string& fragment) const auto cleanup_program = [](std::uint32_t program_id) noexcept { const auto status = pp::renderer::gl::delete_opengl_program( program_id, - pp::renderer::gl::OpenGlProgramDeleteDispatch { - .use_program = use_opengl_program, - .delete_program = delete_opengl_program, - }); + pp::legacy::gl_shader::program_delete_dispatch()); if (!status.ok()) LOG("Shader::create() program cleanup failed because: %s", status.message); }; @@ -522,9 +283,7 @@ bool Shader::create(const std::string& vertex, const std::string& fragment) const auto uniform_count = pp::renderer::gl::query_opengl_program_integer( program.value().program_id, pp::renderer::gl::active_uniform_count_query(), - pp::renderer::gl::OpenGlProgramIntegerDispatch { - .get_program_integer = query_opengl_program_integer, - }); + pp::legacy::gl_shader::program_integer_dispatch()); if (!uniform_count.ok()) { LOG("Shader::create() uniform discovery failed because: %s", uniform_count.status().message); @@ -542,9 +301,7 @@ bool Shader::create(const std::string& vertex, const std::string& fragment) static_cast(i), uniform_name, bufSize, - pp::renderer::gl::OpenGlActiveUniformDispatch { - .get_active_uniform = get_opengl_active_uniform, - }); + pp::legacy::gl_shader::active_uniform_dispatch()); if (!uniform.ok()) { LOG("Shader::create() active uniform discovery failed because: %s", uniform.status().message); @@ -558,9 +315,7 @@ bool Shader::create(const std::string& vertex, const std::string& fragment) const auto location = pp::renderer::gl::get_opengl_uniform_location( program.value().program_id, uniform_name, - pp::renderer::gl::OpenGlUniformLocationDispatch { - .get_uniform_location = get_opengl_uniform_location, - }); + pp::legacy::gl_shader::uniform_location_dispatch()); if (!location.ok()) { LOG("Shader::create() uniform location failed because: %s", location.status().message); @@ -586,10 +341,7 @@ void Shader::destroy() { const auto status = pp::renderer::gl::delete_opengl_program( static_cast(prog), - pp::renderer::gl::OpenGlProgramDeleteDispatch { - .use_program = use_opengl_program, - .delete_program = delete_opengl_program, - }); + pp::legacy::gl_shader::program_delete_dispatch()); if (!status.ok()) LOG("Shader::destroy() failed because: %s", status.message); }); @@ -602,9 +354,7 @@ void Shader::use() { const auto status = pp::renderer::gl::use_opengl_program( static_cast(prog), - pp::renderer::gl::OpenGlProgramUseDispatch { - .use_program = use_opengl_program, - }); + pp::legacy::gl_shader::program_use_dispatch()); if (!status.ok()) LOG("Shader::use() failed because: %s", status.message); } @@ -617,9 +367,7 @@ void Shader::u_vec4(kShaderUniform id, const glm::vec4& v) const auto status = pp::renderer::gl::set_opengl_uniform_vec4( static_cast(m_umap[id]), glm::value_ptr(v), - pp::renderer::gl::OpenGlUniformVec4Dispatch { - .uniform_4fv = set_opengl_uniform_4fv, - }); + pp::legacy::gl_shader::uniform_vec4_dispatch()); if (!status.ok()) LOG("Shader::u_vec4() failed because: %s", status.message); } @@ -633,9 +381,7 @@ void Shader::u_vec3(kShaderUniform id, const glm::vec3& v) const auto status = pp::renderer::gl::set_opengl_uniform_vec3( static_cast(m_umap[id]), glm::value_ptr(v), - pp::renderer::gl::OpenGlUniformVec3Dispatch { - .uniform_3fv = set_opengl_uniform_3fv, - }); + pp::legacy::gl_shader::uniform_vec3_dispatch()); if (!status.ok()) LOG("Shader::u_vec3() failed because: %s", status.message); } @@ -650,9 +396,7 @@ void Shader::u_vec2(kShaderUniform id, const glm::vec2& v) const auto status = pp::renderer::gl::set_opengl_uniform_vec2( static_cast(m_umap[id]), glm::value_ptr(v), - pp::renderer::gl::OpenGlUniformVec2Dispatch { - .uniform_2fv = set_opengl_uniform_2fv, - }); + pp::legacy::gl_shader::uniform_vec2_dispatch()); if (!status.ok()) LOG("Shader::u_vec2() failed because: %s", status.message); } @@ -667,9 +411,7 @@ void Shader::u_mat4(kShaderUniform id, const glm::mat4& m) const auto status = pp::renderer::gl::set_opengl_uniform_mat4( static_cast(m_umap[id]), glm::value_ptr(m), - pp::renderer::gl::OpenGlUniformMat4Dispatch { - .uniform_matrix_4fv = set_opengl_uniform_matrix_4fv, - }); + pp::legacy::gl_shader::uniform_mat4_dispatch()); if (!status.ok()) LOG("Shader::u_mat4() failed because: %s", status.message); } @@ -683,9 +425,7 @@ void Shader::u_int(kShaderUniform id, int i) const auto status = pp::renderer::gl::set_opengl_uniform_int( static_cast(m_umap[id]), static_cast(i), - pp::renderer::gl::OpenGlUniformIntDispatch { - .uniform_1i = set_opengl_uniform_1i, - }); + pp::legacy::gl_shader::uniform_int_dispatch()); if (!status.ok()) LOG("Shader::u_int() failed because: %s", status.message); } @@ -695,9 +435,7 @@ void Shader::u_int(const char* uniform_name, int i) const auto location = pp::renderer::gl::get_opengl_attribute_location( static_cast(prog), uniform_name, - pp::renderer::gl::OpenGlAttributeLocationDispatch { - .get_attrib_location = get_opengl_attrib_location, - }); + pp::legacy::gl_shader::attribute_location_dispatch()); if (!location.ok()) { LOG("Shader::u_int(name) lookup failed because: %s", location.status().message); @@ -706,9 +444,7 @@ void Shader::u_int(const char* uniform_name, int i) const auto status = pp::renderer::gl::set_opengl_uniform_int( location.value(), static_cast(i), - pp::renderer::gl::OpenGlUniformIntDispatch { - .uniform_1i = set_opengl_uniform_1i, - }); + pp::legacy::gl_shader::uniform_int_dispatch()); if (!status.ok()) LOG("Shader::u_int(name) failed because: %s", status.message); } @@ -721,9 +457,7 @@ void Shader::u_float(kShaderUniform id, float f) const auto status = pp::renderer::gl::set_opengl_uniform_float( static_cast(m_umap[id]), f, - pp::renderer::gl::OpenGlUniformFloatDispatch { - .uniform_1f = set_opengl_uniform_1f, - }); + pp::legacy::gl_shader::uniform_float_dispatch()); if (!status.ok()) LOG("Shader::u_float() failed because: %s", status.message); } @@ -733,9 +467,7 @@ GLint Shader::GetAttribLocation(const char* attribute_name) const auto location = pp::renderer::gl::get_opengl_attribute_location( static_cast(prog), attribute_name, - pp::renderer::gl::OpenGlAttributeLocationDispatch { - .get_attrib_location = get_opengl_attrib_location, - }); + pp::legacy::gl_shader::attribute_location_dispatch()); if (!location.ok()) { LOG("Shader::GetAttribLocation() failed because: %s", location.status().message);