dormouse/CX
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Now I'm kinda happy with the threads.

Browse source
This commit is contained in:
Marcel Plch 2024-11-14 12:19:53 +01:00
parent e47a6d26cd
commit 9fe8afb68a
Signed by: dormouse
GPG key ID: 2CA77596BC4BDFFE
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/cx.h
View file

@ -33,6 +33,7 @@ typedef struct _cx_gl_ctx {
ModelRegistry *mr; ModelRegistry *mr;
GLuint *VertexArrayIDs; GLuint *VertexArrayIDs;
void (*free)(void *self); void (*free)(void *self);
uint8_t master_lock;
size_t VertexArray_count; size_t VertexArray_count;
size_t VertexArray_size; size_t VertexArray_size;
GLuint *programIDs; GLuint *programIDs;
@ -45,6 +46,7 @@ typedef struct _cx_nn_ctx {
float *input_buffer; float *input_buffer;
float *output_buffer; float *output_buffer;
void (*free)(void *self); void (*free)(void *self);
uint8_t master_lock;
} CX_NN_CTX; } CX_NN_CTX;
typedef struct _cx_ctx { typedef struct _cx_ctx {

11
src/cx.c
View file

@ -230,7 +230,10 @@ cx_glrun(CX_GL_CTX *ctx) {
glfwGetCursorPos(ctx->window, &xpos, &ypos); glfwGetCursorPos(ctx->window, &xpos, &ypos);
do { do {
cx_glrender(ctx->window, ctx->programIDs[0], ctx->mr); // Skip render step if context is locked.
if (!ctx->master_lock) {
cx_glrender(ctx->window, ctx->programIDs[0], ctx->mr);
}
usleep(1000000/60); usleep(1000000/60);
// Check if the ESC key was pressed or the window was closed // Check if the ESC key was pressed or the window was closed
} while(glfwGetKey(ctx->window, GLFW_KEY_ESCAPE) != GLFW_PRESS } while(glfwGetKey(ctx->window, GLFW_KEY_ESCAPE) != GLFW_PRESS
@ -287,14 +290,18 @@ cx_run(CX_Context *ctx) {
// Establish a model registry // Establish a model registry
ctx->gl_ctx->mr = modelRegistry_new(); ctx->gl_ctx->mr = modelRegistry_new();
ctx->gl_ctx->master_lock = 1;
tg[0] = cx_threadGroup_new(&cx_glthread, ctx->gl_ctx);
tg[1] = cx_threadGroup_new(&cx_nnthread, ctx->nn_ctx); tg[1] = cx_threadGroup_new(&cx_nnthread, ctx->nn_ctx);
pthread_join(tg[1]->group_manager->thread, NULL); pthread_join(tg[1]->group_manager->thread, NULL);
ctx->gl_ctx->master_lock = 0;
neural_getMesh(ctx->nn_ctx->nn, ctx->gl_ctx->mr); neural_getMesh(ctx->nn_ctx->nn, ctx->gl_ctx->mr);
tg[0] = cx_threadGroup_new(&cx_glthread, ctx->gl_ctx);
pthread_join(tg[0]->group_manager->thread, NULL); pthread_join(tg[0]->group_manager->thread, NULL);