omar/panopainter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Route paint texture unit binding through GL backend

Browse Source
This commit is contained in:
omigamedev
2026-06-04 22:08:46 +02:00
parent 4c61a490ce
commit abe3a86cc5
9 changed files with 169 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
docs/modernization/build-inventory.md
View File

@@ -381,7 +381,10 @@ Known local toolchain state:
texture binding targets, and active texture units.
`NodeStrokePreview` brush preview rendering also consumes backend-owned
depth/scissor/blend state, viewport/clear-color queries, active texture
units, 2D texture targets, copy targets, and sampler filters/wraps.
unit execution, fallback 2D texture unbinds, 2D texture targets, copy
targets, and sampler filters/wraps. Retained `Canvas` stroke/thumbnail paths
and `NodeCanvas` panorama rendering use the same tested active-texture
dispatch for texture-unit switches.
Legacy `Texture2D`, `TextureManager`, `Sampler`, and `RTT` public headers no
longer expose raw OpenGL enum defaults; default texture formats, sampler
filters/wraps, and render-target formats resolve through backend-owned
@@ -633,6 +636,8 @@ Known local toolchain state:
color/depth attachment, status-check, and binding-restore dispatch consumed
by retained `RTT::create`/`RTT::destroy`, tested RTT render-target clear,
masked color clear with color-write-mask restore, and texture-bind dispatch,
tested active-texture dispatch consumed by retained Canvas, NodeCanvas, and
NodeStrokePreview texture-unit switches,
tested pixel-buffer allocation/readback/map/unmap/delete dispatch
consumed by retained `PBO` recording readbacks, tested framebuffer-to-texture
2D copy dispatch consumed by retained canvas/UI paint paths, tested framebuffer

2
docs/modernization/debt.md
View File

@@ -53,7 +53,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`, and the `ToolsMenuServices` boundary, and direct command execution is centralized in `src/legacy_app_shell_services.*`; SonarPen availability/startup now routes through `PlatformServices`, but live adapters still construct legacy `NodePanelFloating` panels, mutate legacy panel nodes, clear `CanvasModeGrid`, reset `NodeCanvas` camera state, open legacy shortcuts UI, and rely on the legacy platform adapter for the retained iOS SonarPen bridge | Preserve current Tools menu behavior while UI shell actions move toward app/UI/platform services | `pp_app_core_tools_menu_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`; `ctest --preset desktop-fast --build-config Debug` | Tools panel creation, submenu routing, grid clear, camera reset, shortcuts dialog, and SonarPen dispatch are owned by injected app/UI/platform services with `App::init_menu_tools` acting only as a UI adapter and no legacy Tools 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, 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/message-box dialogs 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 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, and retained RTT clear, masked clear with color-write-mask restore, and texture bind/unbind now route through tested `pp_renderer_gl` dispatch, but actual live stroke rasterization, dual-brush compositing, pattern feedback math, thumbnail layer compositing, brush-preview compositing, the retained cube-map framebuffer copy, 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, and texture bind/unbind now route through tested `pp_renderer_gl` dispatch, and retained Canvas, NodeCanvas, and NodeStrokePreview texture-unit switches now route through tested active-texture dispatch, but actual live stroke rasterization, dual-brush compositing, pattern feedback math, thumbnail layer compositing, brush-preview compositing, the retained cube-map framebuffer copy, 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 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.*`, 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 UI, 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-clears-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 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`, and the `CloudServices` boundary; live execution is centralized in `src/legacy_cloud_services.*`, the app-owned `upload`/`download`/license curl helpers now ask `PlatformServices` for the Android TLS-verification bypass policy, 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, progress/message UI, 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`; `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 |

9
docs/modernization/roadmap.md
View File

@@ -1102,9 +1102,12 @@ Legacy `util.cpp` OpenGL error naming and `gl_state` save/restore now delegate
error codes, state queries, framebuffer targets, texture binding targets, and
active texture units to `pp_renderer_gl`.
`NodeStrokePreview` brush preview rendering now delegates depth/scissor/blend
state, viewport/clear-color queries, active texture units, 2D texture targets,
copy targets, sampler filters/wraps, and destination-feedback copy/fetch
decisions to `pp_renderer_gl` and `pp_paint_renderer`.
state, viewport/clear-color queries, active texture unit execution, fallback
2D texture unbinds, 2D texture targets, copy targets, sampler filters/wraps,
and destination-feedback copy/fetch decisions to `pp_renderer_gl` and
`pp_paint_renderer`. Retained `Canvas` stroke/thumbnail paths and `NodeCanvas`
panorama rendering use the same tested active-texture dispatch for their
texture-unit switches.
Legacy `Texture2D`, `TextureManager`, `Sampler`, and `RTT` public headers no
longer expose raw OpenGL enum defaults; default texture formats, sampler
filters/wraps, and render-target formats are resolved through backend-owned

26
src/canvas.cpp
View File

@@ -166,14 +166,36 @@ pp::renderer::gl::OpenGlPixelFormat texture_format_for_image_channels(int channe
return pp::renderer::gl::texture_format_for_channel_count(static_cast<std::uint32_t>(channel_count));
}
void activate_opengl_texture(std::uint32_t texture_unit) noexcept
{
glActiveTexture(static_cast<GLenum>(texture_unit));
}
void bind_opengl_texture(std::uint32_t target, std::uint32_t texture) noexcept
{
glBindTexture(static_cast<GLenum>(target), static_cast<GLuint>(texture));
}
void set_active_texture_unit(std::uint32_t unit_index)
{
glActiveTexture(pp::renderer::gl::active_texture_unit(unit_index));
const auto status = pp::renderer::gl::activate_opengl_texture_unit(
unit_index,
pp::renderer::gl::OpenGlActiveTextureDispatch {
.active_texture = activate_opengl_texture,
});
if (!status.ok())
LOG("Canvas active texture dispatch failed because: %s", status.message);
}
void unbind_texture_2d()
{
glBindTexture(texture_2d_target(), 0);
const auto status = pp::renderer::gl::bind_opengl_texture_2d(
0U,
pp::renderer::gl::OpenGlTexture2DBindDispatch {
.bind_texture = bind_opengl_texture,
});
if (!status.ok())
LOG("Canvas texture unbind dispatch failed because: %s", status.message);
}
void gen_opengl_renderbuffers(std::uint32_t count, std::uint32_t* ids) noexcept

26
src/node_canvas.cpp
View File

@@ -20,14 +20,36 @@
namespace {
void activate_opengl_texture(std::uint32_t texture_unit) noexcept
{
glActiveTexture(static_cast<GLenum>(texture_unit));
}
void bind_opengl_texture(std::uint32_t target, std::uint32_t texture) noexcept
{
glBindTexture(static_cast<GLenum>(target), static_cast<GLuint>(texture));
}
void set_active_texture_unit(std::uint32_t unit_index)
{
glActiveTexture(pp::renderer::gl::active_texture_unit(unit_index));
const auto status = pp::renderer::gl::activate_opengl_texture_unit(
unit_index,
pp::renderer::gl::OpenGlActiveTextureDispatch {
.active_texture = activate_opengl_texture,
});
if (!status.ok())
LOG("NodeCanvas active texture dispatch failed because: %s", status.message);
}
void unbind_texture_2d()
{
glBindTexture(pp::renderer::gl::texture_2d_target(), 0);
const auto status = pp::renderer::gl::bind_opengl_texture_2d(
0U,
pp::renderer::gl::OpenGlTexture2DBindDispatch {
.bind_texture = bind_opengl_texture,
});
if (!status.ok())
LOG("NodeCanvas texture unbind dispatch failed because: %s", status.message);
}
pp::renderer::RenderDeviceFeatures node_canvas_stroke_composite_features() noexcept

78
src/node_stroke_preview.cpp
View File

@@ -40,6 +40,38 @@ pp::paint_renderer::CanvasStrokeFeedbackPlan stroke_preview_destination_feedback
return fallback;
}
void activate_opengl_texture(std::uint32_t texture_unit) noexcept
{
glActiveTexture(static_cast<GLenum>(texture_unit));
}
void bind_opengl_texture(std::uint32_t target, std::uint32_t texture) noexcept
{
glBindTexture(static_cast<GLenum>(target), static_cast<GLuint>(texture));
}
void set_active_texture_unit(std::uint32_t unit_index)
{
const auto status = pp::renderer::gl::activate_opengl_texture_unit(
unit_index,
pp::renderer::gl::OpenGlActiveTextureDispatch {
.active_texture = activate_opengl_texture,
});
if (!status.ok())
LOG("NodeStrokePreview active texture dispatch failed because: %s", status.message);
}
void unbind_texture_2d()
{
const auto status = pp::renderer::gl::bind_opengl_texture_2d(
0U,
pp::renderer::gl::OpenGlTexture2DBindDispatch {
.bind_texture = bind_opengl_texture,
});
if (!status.ok())
LOG("NodeStrokePreview texture unbind dispatch failed because: %s", status.message);
}
}
std::atomic_int NodeStrokePreview::s_instances{ 0 };
@@ -165,16 +197,16 @@ void NodeStrokePreview::stroke_draw_mix(const glm::vec2& bb_min, const glm::vec2
ShaderManager::u_float(kShaderUniform::DualAlpha, b->m_dual_opacity);
m_sampler_linear.bind(0);
glActiveTexture(pp::renderer::gl::active_texture_unit(0U));
set_active_texture_unit(0U);
m_tex_background.bind();
glActiveTexture(pp::renderer::gl::active_texture_unit(1U));
set_active_texture_unit(1U);
m_rtt.bindTexture();
glActiveTexture(pp::renderer::gl::active_texture_unit(3U));
set_active_texture_unit(3U);
m_tex_dual.bind();
glActiveTexture(pp::renderer::gl::active_texture_unit(4U));
set_active_texture_unit(4U);
b->m_pattern_texture ?
b->m_pattern_texture->bind() :
glBindTexture(pp::renderer::gl::texture_2d_target(), 0);
unbind_texture_2d();
m_plane.draw_fill();
m_rtt_mixer.unbindFramebuffer();
@@ -188,7 +220,7 @@ glm::vec4 NodeStrokePreview::stroke_draw_samples(
{
if (copy_stroke_destination)
{
glActiveTexture(pp::renderer::gl::active_texture_unit(1U));
set_active_texture_unit(1U);
blend_tex.bind(); // bg, copy of framebuffer (copied before drawing)
}
@@ -227,7 +259,7 @@ glm::vec4 NodeStrokePreview::stroke_draw_samples(
if (copy_stroke_destination)
{
glActiveTexture(pp::renderer::gl::active_texture_unit(1U));
set_active_texture_unit(1U);
blend_tex.unbind();
}
@@ -416,10 +448,10 @@ void NodeStrokePreview::draw_stroke_immediate()
ShaderManager::u_float(kShaderUniform::MixAlpha, 0);
ShaderManager::u_float(kShaderUniform::Wet, 0);
ShaderManager::u_float(kShaderUniform::Noise, 0);
glActiveTexture(pp::renderer::gl::active_texture_unit(0U));
set_active_texture_unit(0U);
dual_brush->m_tip_texture ?
dual_brush->m_tip_texture->bind() :
glBindTexture(pp::renderer::gl::texture_2d_target(), 0);
unbind_texture_2d();
auto frames_dual = stroke_draw_compute(m_dual_stroke, zoom);
for (auto& f : frames_dual)
{
@@ -430,7 +462,7 @@ void NodeStrokePreview::draw_stroke_immediate()
}
// copy raw stroke to tex
glActiveTexture(pp::renderer::gl::active_texture_unit(1U));
set_active_texture_unit(1U);
m_tex_dual.bind();
copy_framebuffer_to_texture_2d(
0,
@@ -467,19 +499,19 @@ void NodeStrokePreview::draw_stroke_immediate()
ShaderManager::u_float(kShaderUniform::Wet, b->m_tip_wet);
ShaderManager::u_float(kShaderUniform::Noise, b->m_tip_noise);
glActiveTexture(pp::renderer::gl::active_texture_unit(0U));
set_active_texture_unit(0U);
b->m_tip_texture->bind();
if (copy_stroke_destination)
{
glActiveTexture(pp::renderer::gl::active_texture_unit(1U));
set_active_texture_unit(1U);
m_tex.bind(); // tmp swap for blending
}
glActiveTexture(pp::renderer::gl::active_texture_unit(2U));
set_active_texture_unit(2U);
b->m_pattern_texture ?
b->m_pattern_texture->bind() :
glBindTexture(pp::renderer::gl::texture_2d_target(), 0);
glActiveTexture(pp::renderer::gl::active_texture_unit(3U));
b->m_tip_mix > 0.f ? m_rtt_mixer.bindTexture() : glBindTexture(pp::renderer::gl::texture_2d_target(), 0);
unbind_texture_2d();
set_active_texture_unit(3U);
b->m_tip_mix > 0.f ? m_rtt_mixer.bindTexture() : unbind_texture_2d();
auto frames = stroke_draw_compute(m_stroke, zoom);
m_rtt.clear();
for (auto& f : frames)
@@ -498,11 +530,11 @@ void NodeStrokePreview::draw_stroke_immediate()
ShaderManager::u_float(kShaderUniform::Opacity, f.opacity);
/*auto rect =*/ stroke_draw_samples(f.shapes, m_tex, copy_stroke_destination);
}
glActiveTexture(pp::renderer::gl::active_texture_unit(3U));
set_active_texture_unit(3U);
m_rtt_mixer.unbindTexture();
// copy raw stroke to tex
glActiveTexture(pp::renderer::gl::active_texture_unit(1U));
set_active_texture_unit(1U);
m_tex.bind();
copy_framebuffer_to_texture_2d(
0,
@@ -544,16 +576,16 @@ void NodeStrokePreview::draw_stroke_immediate()
m_sampler_linear.bind(3);
m_sampler_linear_repeat.bind(4);
glActiveTexture(pp::renderer::gl::active_texture_unit(0U));
set_active_texture_unit(0U);
m_tex_background.bind();
glActiveTexture(pp::renderer::gl::active_texture_unit(1U));
set_active_texture_unit(1U);
m_tex.bind();
glActiveTexture(pp::renderer::gl::active_texture_unit(3U));
set_active_texture_unit(3U);
m_tex_dual.bind();
glActiveTexture(pp::renderer::gl::active_texture_unit(4U));
set_active_texture_unit(4U);
b->m_pattern_texture ?
b->m_pattern_texture->bind() :
glBindTexture(pp::renderer::gl::texture_2d_target(), 0);
unbind_texture_2d();
m_plane.draw_fill();
// copy the result to the actual preview

12
src/renderer_gl/opengl_capabilities.cpp
View File

@@ -503,6 +503,18 @@ pp::foundation::Status clear_opengl_color_buffer_with_write_mask(
return pp::foundation::Status::success();
}
pp::foundation::Status activate_opengl_texture_unit(
std::uint32_t unit_index,
OpenGlActiveTextureDispatch dispatch) noexcept
{
if (dispatch.active_texture == nullptr) {
return pp::foundation::Status::invalid_argument("OpenGL active texture dispatch callback must not be null");
}
dispatch.active_texture(active_texture_unit(unit_index));
return pp::foundation::Status::success();
}
pp::foundation::Status apply_opengl_viewport(
OpenGlViewportRect viewport,
OpenGlViewportDispatch dispatch) noexcept

7
src/renderer_gl/opengl_capabilities.h
View File

@@ -563,6 +563,10 @@ struct OpenGlClearDispatch {
OpenGlClearFn clear = nullptr;
};
struct OpenGlActiveTextureDispatch {
OpenGlActiveTextureFn active_texture = nullptr;
};
struct OpenGlColorMaskedClearDispatch {
OpenGlGetBooleanFn get_boolean = nullptr;
OpenGlColorMaskFn color_mask = nullptr;
@@ -878,6 +882,9 @@ struct OpenGlMeshDeleteDispatch {
[[nodiscard]] pp::foundation::Status clear_opengl_color_buffer_with_write_mask(
OpenGlColorMaskedClear clear,
OpenGlColorMaskedClearDispatch dispatch) noexcept;
[[nodiscard]] pp::foundation::Status activate_opengl_texture_unit(
std::uint32_t unit_index,
OpenGlActiveTextureDispatch dispatch) noexcept;
[[nodiscard]] pp::foundation::Status apply_opengl_viewport(
OpenGlViewportRect viewport,
OpenGlViewportDispatch dispatch) noexcept;

34
tests/renderer_gl/capabilities_tests.cpp
View File

@@ -2359,6 +2359,38 @@ void rejects_invalid_render_target_clear_dispatch(pp::tests::Harness& h)
PP_EXPECT(h, missing_masked_dispatch.code == pp::foundation::StatusCode::invalid_argument);
}
void activates_texture_unit_through_dispatch(pp::tests::Harness& h)
{
recorded_active_texture_calls.clear();
const auto zero = pp::renderer::gl::activate_opengl_texture_unit(
0U,
pp::renderer::gl::OpenGlActiveTextureDispatch {
.active_texture = record_active_texture,
});
const auto four = pp::renderer::gl::activate_opengl_texture_unit(
4U,
pp::renderer::gl::OpenGlActiveTextureDispatch {
.active_texture = record_active_texture,
});
PP_EXPECT(h, zero.ok());
PP_EXPECT(h, four.ok());
PP_EXPECT(h, recorded_active_texture_calls.size() == 2U);
PP_EXPECT(h, recorded_active_texture_calls[0] == 0x84C0U);
PP_EXPECT(h, recorded_active_texture_calls[1] == 0x84C4U);
}
void rejects_incomplete_active_texture_dispatch(pp::tests::Harness& h)
{
const auto status = pp::renderer::gl::activate_opengl_texture_unit(
0U,
pp::renderer::gl::OpenGlActiveTextureDispatch {});
PP_EXPECT(h, !status.ok());
PP_EXPECT(h, status.code == pp::foundation::StatusCode::invalid_argument);
}
void applies_viewport_dispatch(pp::tests::Harness& h)
{
recorded_viewport_calls.clear();
@@ -5254,6 +5286,8 @@ int main()
harness.run("clears_render_target_through_dispatch", clears_render_target_through_dispatch);
harness.run("clears_color_buffer_with_write_mask_and_restores_previous_mask", clears_color_buffer_with_write_mask_and_restores_previous_mask);
harness.run("rejects_invalid_render_target_clear_dispatch", rejects_invalid_render_target_clear_dispatch);
harness.run("activates_texture_unit_through_dispatch", activates_texture_unit_through_dispatch);
harness.run("rejects_incomplete_active_texture_dispatch", rejects_incomplete_active_texture_dispatch);
harness.run("applies_viewport_dispatch", applies_viewport_dispatch);
harness.run("rejects_incomplete_viewport_dispatch", rejects_incomplete_viewport_dispatch);
harness.run("applies_scissor_dispatch", applies_scissor_dispatch);