mirror of
https://github.com/MaSzyna-EU07/maszyna.git
synced 2026-11-21 07:24:57 +01:00
fix(python): a screen uploaded by the worker goes into a texture of its own, put in place after a fence
With python.threadedupload (the default) the worker wrote the image into the texture the drawing thread draws from, with glTexImage2D and glGenerateMipmap from its own context, and only a glFlush after. Nothing ordered the two contexts: the drawing one could sample the texture while its storage was being made anew, its level 0 half written or its mipmaps not made yet, and on a change of size the worker deleted the texture and wrote a new name into `id` with no synchronisation. The worker now uploads each image into a new texture, sets a fence after it and flushes. The drawing thread, once per frame in python_taskqueue::update(), waits for that fence on the gpu (glWaitSync, the cpu goes on), deletes the old texture and puts the new one in place. The worker no longer touches the texture drawn from, nor `id`. An image the drawing thread didn't take yet is dropped by the next one. Without sync objects the worker waits for the upload with glFinish. The windows of python.displaywindows with python.sharectx bound the texture once; they now bind the name of the last image put in place, which python_rt keeps for them. Uploads on the drawing thread (python.threadedupload no, the Lua and WebAssembly screens, the editor) are as they were.
This commit is contained in:
@@ -232,6 +232,24 @@ void render_task::upload() const
|
||||
}
|
||||
}
|
||||
|
||||
void render_task::upload_from_thread() const
|
||||
{
|
||||
if (Global.python_uploadmain && m_target && m_target->shared_tex)
|
||||
{
|
||||
m_target->shared_tex->upload_from_thread(m_target->width, m_target->height, reinterpret_cast<const uint8_t *>(m_target->image.data()));
|
||||
}
|
||||
}
|
||||
|
||||
void render_task::commit_upload() const
|
||||
{
|
||||
if (Global.python_uploadmain && m_target && m_target->shared_tex)
|
||||
{
|
||||
m_target->shared_tex->commit_thread_upload();
|
||||
std::scoped_lock lock(m_target->mutex);
|
||||
m_target->texture_id = m_target->shared_tex->get_id();
|
||||
}
|
||||
}
|
||||
|
||||
void render_task::cancel() const { /* nothing to do */ }
|
||||
|
||||
// initializes the module. returns true on success
|
||||
@@ -569,9 +587,11 @@ void python_taskqueue::run(GLFWwindow *Context, rendertask_sequence &Tasks, uplo
|
||||
// execute python code
|
||||
task->run();
|
||||
if (Context)
|
||||
task->upload();
|
||||
else
|
||||
{
|
||||
task->upload_from_thread();
|
||||
}
|
||||
{
|
||||
// the drawing thread uploads the image, or puts in place the one uploaded here
|
||||
std::scoped_lock lock(Upload_Tasks.mutex);
|
||||
Upload_Tasks.data.push_back(task);
|
||||
}
|
||||
@@ -610,7 +630,12 @@ void python_taskqueue::update()
|
||||
std::scoped_lock lock(m_uploadtasks.mutex);
|
||||
|
||||
for (auto const &task : m_uploadtasks.data)
|
||||
task->upload();
|
||||
{
|
||||
if (Global.python_threadedupload)
|
||||
task->commit_upload();
|
||||
else
|
||||
task->upload();
|
||||
}
|
||||
|
||||
m_uploadtasks.data.clear();
|
||||
}
|
||||
|
||||
@@ -67,6 +67,9 @@ struct python_rt
|
||||
int width;
|
||||
int height;
|
||||
std::string image;
|
||||
// gl name of the texture with the last image put in place, for the windows of python.displaywindows (0: none yet). the image
|
||||
// uploaded by a worker gets a texture of its own, so the name changes with each one
|
||||
size_t texture_id{0};
|
||||
|
||||
std::chrono::high_resolution_clock::time_point timestamp;
|
||||
};
|
||||
@@ -80,7 +83,12 @@ class render_task
|
||||
render_task(PyObject *Renderer, std::shared_ptr<dictionary_source> Input, std::shared_ptr<python_rt> Target) : m_renderer(Renderer), m_input(Input), m_target(Target) {}
|
||||
// methods
|
||||
void run();
|
||||
// uploads the image on the drawing thread
|
||||
void upload() const;
|
||||
// uploads the image on a worker with a gl context of its own (python.threadedupload); commit_upload() puts it in place
|
||||
void upload_from_thread() const;
|
||||
// puts the image of upload_from_thread() in place, on the drawing thread
|
||||
void commit_upload() const;
|
||||
void cancel() const;
|
||||
auto target() const -> std::shared_ptr<python_rt>
|
||||
{
|
||||
|
||||
@@ -90,7 +90,8 @@ void python_screen_viewer::threadfunc()
|
||||
glActiveTexture(GL_TEXTURE0);
|
||||
|
||||
if (Global.python_sharectx) {
|
||||
glBindTexture(GL_TEXTURE_2D, static_cast<GLuint>(m_rt->shared_tex->get_id()));
|
||||
window->shared_texture = m_rt->shared_tex->get_id();
|
||||
glBindTexture(GL_TEXTURE_2D, static_cast<GLuint>(window->shared_texture));
|
||||
}
|
||||
else {
|
||||
GLuint tex;
|
||||
@@ -146,6 +147,8 @@ void python_screen_viewer::threadfunc()
|
||||
}
|
||||
|
||||
glfwMakeContextCurrent(window->window);
|
||||
if (Global.python_sharectx)
|
||||
bind_shared_texture(*window);
|
||||
gl::program::unbind();
|
||||
gl::buffer::unbind();
|
||||
|
||||
@@ -188,6 +191,20 @@ void python_screen_viewer::threadfunc()
|
||||
}
|
||||
}
|
||||
|
||||
void python_screen_viewer::bind_shared_texture(window_state &Window) const
|
||||
{
|
||||
size_t texture;
|
||||
{
|
||||
std::scoped_lock guard(m_rt->mutex);
|
||||
texture = m_rt->texture_id;
|
||||
}
|
||||
// each image uploaded by a worker comes in a texture of its own
|
||||
if (texture == 0 || texture == Window.shared_texture)
|
||||
return;
|
||||
Window.shared_texture = texture;
|
||||
glBindTexture(GL_TEXTURE_2D, static_cast<GLuint>(texture));
|
||||
}
|
||||
|
||||
void python_screen_viewer::notify_window_fb_size(GLFWwindow const *window, int w, int h) const
|
||||
{
|
||||
for (auto const &conf : m_windows) {
|
||||
|
||||
@@ -18,6 +18,7 @@ class python_screen_viewer
|
||||
std::unique_ptr<gl::program> shader;
|
||||
|
||||
std::chrono::high_resolution_clock::time_point timestamp;
|
||||
size_t shared_texture{0}; // with python.sharectx, the texture of the screen bound in this window's context
|
||||
|
||||
window_state() = default;
|
||||
~window_state();
|
||||
@@ -33,6 +34,8 @@ class python_screen_viewer
|
||||
std::atomic_bool m_exit = false;
|
||||
|
||||
void threadfunc();
|
||||
// with python.sharectx, binds the texture with the last image of the screen, in the context of the window made current
|
||||
void bind_shared_texture(window_state &Window) const;
|
||||
|
||||
public:
|
||||
python_screen_viewer(std::shared_ptr<python_rt> rt, std::shared_ptr<std::vector<glm::vec2>> touchlist, std::string const &name);
|
||||
|
||||
Reference in New Issue
Block a user