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

Own main workers and narrow Apple render hooks

Browse Source
This commit is contained in:
omigamedev
2026-06-16 07:43:44 +02:00
parent 6f4bd4b26f
commit 0c72aa0312
9 changed files with 167 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/legacy_canvas_draw_merge_services.h
View File

@@ -118,6 +118,16 @@ struct LegacyCanvasDrawMergeTemporaryCompositeExecution {
std::function<void()> unbind_textures;
};
struct LegacyCanvasDrawMergeBackgroundSetupUniforms {
bool draw_merged = false;
bool use_blend = false;
};
struct LegacyCanvasDrawMergeBackgroundSetupExecution {
std::function<void()> disable_blend;
std::function<void(int)> draw_checkerboard_plane;
};
template <
typename Setup,
typename BindSamplers,
@@ -485,6 +495,21 @@ inline void execute_legacy_canvas_draw_merge_temporary_composite(
execution.unbind_textures();
}
inline void execute_legacy_canvas_draw_merge_background_setup(
const LegacyCanvasDrawMergeBackgroundSetupUniforms& uniforms,
const LegacyCanvasDrawMergeBackgroundSetupExecution& execution)
{
if (uniforms.draw_merged) {
execution.disable_blend();
}
if (uniforms.draw_merged || !uniforms.use_blend) {
for (int plane_index = 0; plane_index < 6; ++plane_index) {
execution.draw_checkerboard_plane(plane_index);
}
}
}
inline void execute_legacy_canvas_draw_merge_plane_setup(
const LegacyCanvasDrawMergePlaneSetupUniforms& uniforms,
const LegacyCanvasDrawMergePlaneSetupExecution& execution)

18
src/main.cpp
View File

@@ -30,6 +30,7 @@
#include <iomanip>
#include <ctime>
#include <sstream>
#include <stop_token>
#define WM_USER_CLOSE (WM_USER + 1)
#define WM_USER_WAKEUP (WM_USER + 2)
@@ -47,7 +48,7 @@ std::thread::id gl_thread;
std::map<kKey, int> vkey_map;
static wchar_t window_title[512];
std::thread hmd_renderer;
std::jthread hmd_renderer;
int vr_frames = 0;
int running = -1;
int vr_running = 0;
@@ -535,8 +536,11 @@ bool win32_vr_start()
}
if (hmd_renderer.joinable())
{
hmd_renderer.request_stop();
hmd_renderer.join();
hmd_renderer = std::thread([&] {
}
hmd_renderer = std::jthread([&](std::stop_token stop_token) {
if (!vive)
return;
@@ -558,7 +562,7 @@ bool win32_vr_start()
auto t0 = GetTickCount64();
float one_sec_timer = 0;
int frames = 0;
while (vr_running && running == 1 && vive->Valid())
while (!stop_token.stop_requested() && vr_running && running == 1 && vive->Valid())
{
std::unique_lock<std::mutex> lock(hmd_render_mutex);
auto t1 = GetTickCount64();
@@ -606,7 +610,10 @@ void win32_vr_stop()
{
vr_running = false;
if (hmd_renderer.joinable())
{
hmd_renderer.request_stop();
hmd_renderer.join();
}
vive->Terminate();
delete vive;
vive = nullptr;
@@ -764,7 +771,7 @@ int main(int argc, char** argv)
LOG("data files ok");
}
std::thread dialog_thread(splash_thread_loop);
std::jthread dialog_thread(splash_thread_loop);
init_vk_map();
@@ -1034,7 +1041,10 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp)
case WM_USER_CLOSE:
running = 0;
if (hmd_renderer.joinable())
{
hmd_renderer.request_stop();
hmd_renderer.join();
}
App::I->runtime().ui_thread_stop();
App::I->runtime().render_thread_stop();
App::I->terminate();

66
src/node_canvas.cpp
View File

@@ -365,24 +365,35 @@ void NodeCanvas::draw()
bool draw_merged = !(m_canvas->m_current_mode == kCanvasMode::Camera);
draw_merged = false;
const auto draw_background_plane = [&](int plane_index) {
auto plane_mvp = proj * camera *
glm::scale(glm::vec3(m_canvas->m_layers.size() + 500)) *
m_canvas->m_plane_transform[plane_index] *
glm::translate(glm::vec3(0, 0, -1));
pp::panopainter::setup_legacy_canvas_draw_merge_checkerboard_shader(
pp::panopainter::LegacyCanvasDrawMergeCheckerboardUniforms {
.mvp = plane_mvp,
.colorize = false,
});
m_face_plane.draw_fill();
};
if (draw_merged)
{
apply_node_canvas_capability(pp::renderer::gl::blend_state(), false);
// draw the grid
pp::panopainter::execute_legacy_canvas_draw_merge_background_setup(
{
.draw_merged = true,
},
{
.disable_blend = [&] {
apply_node_canvas_capability(pp::renderer::gl::blend_state(), false);
},
.draw_checkerboard_plane = draw_background_plane,
});
for (int plane_index = 0; plane_index < 6; plane_index++)
{
auto plane_mvp = proj * camera *
glm::scale(glm::vec3(m_canvas->m_layers.size() + 500)) *
m_canvas->m_plane_transform[plane_index] *
glm::translate(glm::vec3(0, 0, -1));
pp::panopainter::setup_legacy_canvas_draw_merge_checkerboard_shader(
pp::panopainter::LegacyCanvasDrawMergeCheckerboardUniforms {
.mvp = plane_mvp,
.colorize = false,
});
m_face_plane.draw_fill();
int z = 1;
auto plane_mvp_z = proj * camera *
//glm::scale(glm::vec3(z + 1)) *
@@ -421,24 +432,17 @@ void NodeCanvas::draw()
m_cache_rtt.bindFramebuffer();
m_cache_rtt.clear({ 1, 1, 1, 0 });
}
else
{
// draw the grid
for (int plane_index = 0; plane_index < 6; plane_index++)
{
auto plane_mvp = proj * camera *
glm::scale(glm::vec3(m_canvas->m_layers.size() + 500)) *
m_canvas->m_plane_transform[plane_index] *
glm::translate(glm::vec3(0, 0, -1));
pp::panopainter::setup_legacy_canvas_draw_merge_checkerboard_shader(
pp::panopainter::LegacyCanvasDrawMergeCheckerboardUniforms {
.mvp = plane_mvp,
.colorize = false,
});
m_face_plane.draw_fill();
}
}
pp::panopainter::execute_legacy_canvas_draw_merge_background_setup(
{
.use_blend = use_blend,
},
{
.disable_blend = [&] {
apply_node_canvas_capability(pp::renderer::gl::blend_state(), false);
},
.draw_checkerboard_plane = draw_background_plane,
});
// if not using shader blend, use gl rasterizer blend
use_blend ? apply_node_canvas_capability(pp::renderer::gl::blend_state(), false) : apply_node_canvas_capability(pp::renderer::gl::blend_state(), true);

24
src/platform_apple/apple_platform_services.cpp
View File

@@ -183,6 +183,30 @@ void AppleDocumentPlatformServices::set_cursor_visible(bool visible) const
#endif
}
void AppleDocumentPlatformServices::acquire_render_context() const
{
if (bridge_.acquire_render_context)
bridge_.acquire_render_context();
}
void AppleDocumentPlatformServices::release_render_context() const
{
if (bridge_.release_render_context)
bridge_.release_render_context();
}
void AppleDocumentPlatformServices::present_render_context() const
{
if (bridge_.present_render_context)
bridge_.present_render_context();
}
void AppleDocumentPlatformServices::bind_main_render_target() const
{
if (bridge_.bind_main_render_target)
bridge_.bind_main_render_target();
}
void AppleDocumentPlatformServices::save_prepared_file(
std::string_view path,
std::string_view suggested_name,

8
src/platform_apple/apple_platform_services.h
View File

@@ -22,6 +22,10 @@ struct AppleDocumentPickerBridge {
std::function<void(std::string path)> display_file;
std::function<void(std::string path)> share_file;
std::function<void(bool visible)> set_cursor_visible;
std::function<void()> acquire_render_context;
std::function<void()> release_render_context;
std::function<void()> present_render_context;
std::function<void()> bind_main_render_target;
std::function<void(std::string path, std::string suggested_name, PreparedFileCallback callback)> save_prepared_file;
std::function<void()> save_ui_state;
};
@@ -49,6 +53,10 @@ public:
void display_file(std::string_view path) const;
void share_file(std::string_view path) const;
void set_cursor_visible(bool visible) const;
void acquire_render_context() const;
void release_render_context() const;
void present_render_context() const;
void bind_main_render_target() const;
void save_prepared_file(
std::string_view path,
std::string_view suggested_name,

41
src/platform_legacy/legacy_platform_services.cpp
View File

@@ -143,6 +143,18 @@ public:
[ios_view hide_keyboard];
});
};
bridge.acquire_render_context = [ios_view] {
[ios_view async_lock];
};
bridge.release_render_context = [ios_view] {
[ios_view async_unlock];
};
bridge.present_render_context = [ios_view] {
[ios_view async_swap];
};
bridge.bind_main_render_target = [ios_view] {
[ios_view->glview bindDrawable];
};
bridge.display_file = [ios_view](std::string path) {
dispatch_async(dispatch_get_main_queue(), ^{
[ios_view display_file:path];
@@ -197,6 +209,15 @@ public:
[osx_view share_file:[NSString stringWithUTF8String:path.c_str()]];
});
};
bridge.acquire_render_context = [osx_view] {
[osx_view async_lock];
};
bridge.release_render_context = [osx_view] {
[osx_view async_unlock];
};
bridge.present_render_context = [osx_view] {
[osx_view async_swap];
};
bridge.set_cursor_visible = [osx_view](bool visible) {
[osx_view show_cursor:visible];
};
@@ -372,10 +393,8 @@ public:
void acquire_render_context() override
{
#if __OSX__
[App::I->osx_view async_lock];
#elif __IOS__
[App::I->ios_view async_lock];
#if defined(__IOS__) || defined(__OSX__)
active_apple_document_platform_services().acquire_render_context();
#elif __ANDROID__
android_async_lock();
#elif __LINUX__ || __WEB__
@@ -385,10 +404,8 @@ public:
void release_render_context() override
{
#if __OSX__
[App::I->osx_view async_unlock];
#elif __IOS__
[App::I->ios_view async_unlock];
#if defined(__IOS__) || defined(__OSX__)
active_apple_document_platform_services().release_render_context();
#elif __ANDROID__
android_async_unlock();
#endif
@@ -396,10 +413,8 @@ public:
void present_render_context() override
{
#if __OSX__
[App::I->osx_view async_swap];
#elif __IOS__
[App::I->ios_view async_swap];
#if defined(__IOS__) || defined(__OSX__)
active_apple_document_platform_services().present_render_context();
#elif __ANDROID__
android_async_swap();
#elif __LINUX__ || __WEB__
@@ -417,7 +432,7 @@ public:
void bind_main_render_target() override
{
#if __IOS__
[App::I->ios_view->glview bindDrawable];
active_apple_document_platform_services().bind_main_render_target();
#else
bind_default_render_target();
#endif