mirror of
https://github.com/MaSzyna-EU07/maszyna.git
synced 2026-11-21 07:24:57 +01:00
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.
166 lines
4.3 KiB
C++
166 lines
4.3 KiB
C++
/*
|
|
This Source Code Form is subject to the
|
|
terms of the Mozilla Public License, v.
|
|
2.0. If a copy of the MPL was not
|
|
distributed with this file, You can
|
|
obtain one at
|
|
http://mozilla.org/MPL/2.0/.
|
|
*/
|
|
|
|
#ifndef PYINT_H
|
|
#define PYINT_H
|
|
|
|
#ifdef _POSIX_C_SOURCE
|
|
#undef _POSIX_C_SOURCE
|
|
#endif
|
|
|
|
#ifdef _XOPEN_SOURCE
|
|
#undef _XOPEN_SOURCE
|
|
#endif
|
|
|
|
#ifdef _MSC_VER
|
|
#pragma warning(push)
|
|
#pragma warning(disable : 5033)
|
|
#endif
|
|
#ifdef __GNUC__
|
|
#pragma GCC diagnostic push
|
|
#pragma GCC diagnostic ignored "-Wregister"
|
|
#endif
|
|
|
|
#ifdef WITH_PYTHON
|
|
#ifdef _DEBUG
|
|
#undef _DEBUG // bez tego macra Py_DECREF powoduja problemy przy linkowaniu
|
|
#include "Python.h"
|
|
#define _DEBUG
|
|
#else
|
|
#include "Python.h"
|
|
#endif
|
|
#else
|
|
#define PyObject void
|
|
#define PyThreadState void
|
|
#endif
|
|
|
|
#ifdef __GNUC__
|
|
#pragma GCC diagnostic pop
|
|
#endif
|
|
#ifdef _MSC_VER
|
|
#pragma warning(pop)
|
|
#endif
|
|
|
|
#include "utilities/Classes.h"
|
|
#include "utilities/utilities.h"
|
|
#include "model/Texture.h"
|
|
#include <thread>
|
|
|
|
#define PyGetFloat(param) PyFloat_FromDouble(param)
|
|
#define PyGetBool(param) param ? Py_True : Py_False
|
|
|
|
// python rendertarget
|
|
struct python_rt
|
|
{
|
|
std::mutex mutex;
|
|
|
|
ITexture *shared_tex;
|
|
|
|
int format;
|
|
int components;
|
|
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;
|
|
};
|
|
|
|
// TODO: extract common base and inherit specialization from it
|
|
class render_task
|
|
{
|
|
|
|
public:
|
|
// constructors
|
|
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>
|
|
{
|
|
return m_target;
|
|
}
|
|
|
|
private:
|
|
// members
|
|
PyObject *m_renderer{nullptr};
|
|
std::shared_ptr<dictionary_source> m_input{nullptr};
|
|
std::shared_ptr<python_rt> m_target{nullptr};
|
|
};
|
|
|
|
class python_taskqueue
|
|
{
|
|
|
|
public:
|
|
// types
|
|
struct task_request
|
|
{
|
|
|
|
std::string const &renderer;
|
|
std::shared_ptr<dictionary_source> input;
|
|
std::shared_ptr<python_rt> target;
|
|
};
|
|
// constructors
|
|
python_taskqueue() = default;
|
|
// methods
|
|
// initializes the module. returns true on success
|
|
auto init() -> bool;
|
|
// shuts down the module
|
|
void exit();
|
|
// adds specified task along with provided collection of data to the work queue. returns true on success
|
|
auto insert(task_request const &Task) -> bool;
|
|
// executes python script stored in specified file. returns true on success
|
|
auto run_file(std::string const &File, std::string const &Path = "") -> bool;
|
|
// acquires the python gil and sets the main thread as current
|
|
void acquire_lock();
|
|
// releases the python gil and swaps the main thread out
|
|
void release_lock() const;
|
|
|
|
void update();
|
|
|
|
private:
|
|
// types
|
|
static int const WORKERCOUNT{1};
|
|
using worker_array = std::array<std::jthread, WORKERCOUNT>;
|
|
using rendertask_sequence = threading::lockable<std::deque<std::shared_ptr<render_task>>>;
|
|
using uploadtask_sequence = threading::lockable<std::deque<std::shared_ptr<render_task>>>;
|
|
// methods
|
|
auto fetch_renderer(std::string const &Renderer) -> PyObject *;
|
|
void run(GLFWwindow *Context, rendertask_sequence &Tasks, uploadtask_sequence &Upload_Tasks, threading::condition_variable &Condition, std::atomic<bool> const &Exit);
|
|
void error();
|
|
|
|
// members
|
|
PyObject *m_main{nullptr};
|
|
PyObject *m_stderr{nullptr};
|
|
PyThreadState *m_mainthread{nullptr};
|
|
worker_array m_workers;
|
|
threading::condition_variable m_condition; // wakes up the workers
|
|
std::atomic<bool> m_exit{false}; // signals the workers to quit
|
|
std::unordered_map<std::string, PyObject *> m_renderers; // cache of python classes
|
|
rendertask_sequence m_tasks;
|
|
uploadtask_sequence m_uploadtasks;
|
|
bool m_initialized{false};
|
|
};
|
|
|
|
class python_external_utils
|
|
{
|
|
public:
|
|
static std::vector<std::string> PyObjectToStringArray(PyObject *pyList);
|
|
};
|
|
|
|
#endif
|