mirror of
https://github.com/MaSzyna-EU07/maszyna.git
synced 2026-11-21 08:35:01 +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:
@@ -21,6 +21,14 @@ struct ITexture
|
||||
virtual void set_components_hint(int hint) = 0;
|
||||
virtual void make_from_memory(size_t width, size_t height, const uint8_t *data) = 0;
|
||||
virtual void update_from_memory(size_t width, size_t height, const uint8_t *data) = 0;
|
||||
// uploads an image from a thread with a gl context of its own, sharing the objects with the drawing one. a texture that
|
||||
// can keeps the image apart until commit_thread_upload(), called on the drawing thread, puts it in place
|
||||
virtual void upload_from_thread(size_t width, size_t height, const uint8_t *data)
|
||||
{
|
||||
update_from_memory(width, height, data);
|
||||
}
|
||||
// puts in place the image of the last upload_from_thread(), once the gpu has it. called on the drawing thread
|
||||
virtual void commit_thread_upload() { /* the image went in place right away */ }
|
||||
static ITexture *null_texture()
|
||||
{
|
||||
struct NullTexture : public ITexture
|
||||
|
||||
Reference in New Issue
Block a user