Thin app dialog and renderer adapter ownership

This commit is contained in:
2026-06-17 18:43:43 +02:00
parent dd638e5af4
commit 1a64118b2c
11 changed files with 181 additions and 178 deletions

View File

@@ -5,6 +5,7 @@
#include "legacy_ui_gl_dispatch.h"
#include "log.h"
#include "renderer_gl/opengl_capabilities.h"
#include "renderer_gl/render_runtime_dispatch.h"
#include "rtt.h"
#include "util.h"
@@ -105,7 +106,7 @@ TextureCube Layer::gen_cube()
ret.create(w);
for (int i = 0; i < 6; i++)
{
App::I->render_task([&]
pp::renderer::gl::render_runtime_dispatch().render_task([&]
{
ret.bind();
rtt(i).bindFramebuffer();
@@ -120,7 +121,7 @@ Texture2D Layer::gen_equirect(glm::ivec2 size /*= { 0, 0 }*/)
{
Texture2D ret;
App::I->render_task([&]
pp::renderer::gl::render_runtime_dispatch().render_task([&]
{
gl_state gl;
gl.save();
@@ -177,7 +178,7 @@ PBO Layer::gen_equirect_pbo(glm::ivec2 size /*= { 0, 0 }*/)
latlong.create(size.x, size.y);
std::this_thread::yield();
App::I->render_task([&]
pp::renderer::gl::render_runtime_dispatch().render_task([&]
{
apply_layer_capability(pp::renderer::gl::blend_state(), false);
@@ -317,7 +318,7 @@ void Layer::duplicate_frame(int frame)
void Layer::frames_gpu_update()
{
App::I->render_task_async([=]
pp::renderer::gl::render_runtime_dispatch().render_task_async([=]
{
for (int j = 0; j < m_frames.size(); j++)
{
@@ -471,22 +472,6 @@ LayerFrame& LayerFrame::operator=(LayerFrame&& other)
bool LayerFrame::create(int width, int height, int duration /*= 1*/)
{
bool success = true;
//App::I->render_task([&]
//{
// for (int i = 0; i < 6; i++)
// {
// if (!m_rtt[i].create(width, height))
// {
// success = false;
// return;
// }
// m_rtt[i].bindFramebuffer();
// m_rtt[i].clear();
// m_rtt[i].unbindFramebuffer();
// m_dirty_box[i] = glm::vec4(width, height, 0, 0); // reset bounding box
// m_dirty_face[i] = false;
// }
//});
for (int i = 0; i < 6; i++)
{
m_dirty_box[i] = glm::vec4(width, height, 0, 0); // reset bounding box
@@ -517,7 +502,7 @@ bool LayerFrame::resize(int width, int height)
void LayerFrame::clear(const glm::vec4& c)
{
App::I->render_task([&]
pp::renderer::gl::render_runtime_dispatch().render_task([&]
{
// push clear color state
const auto cc = query_layer_clear_color();
@@ -566,7 +551,7 @@ LayerFrame LayerFrame::clone() noexcept
void LayerFrame::restore(const Snapshot& snap)
{
App::I->render_task([this, &snap]
pp::renderer::gl::render_runtime_dispatch().render_task([this, &snap]
{
clear({ 0, 0, 0, 0 });
for (int i = 0; i < 6; i++)
@@ -605,7 +590,7 @@ LayerFrame::Snapshot LayerFrame::snapshot(std::array<glm::vec4, 6>* dirty_box /*
Snapshot snap;
snap.width = w;
snap.height = h;
App::I->render_task([this, &snap, dirty_face, dirty_box]
pp::renderer::gl::render_runtime_dispatch().render_task([this, &snap, dirty_face, dirty_box]
{
for (int i = 0; i < 6; i++)
{