Rakarake/glonkers
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

allocation of wayland state memory in main

Browse source
This commit is contained in:
Rakarake 2025-12-24 17:33:17 +01:00
parent 92ce71b5f1
commit 09ac1a0559
3 changed files with 19 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

6
glonkers.c
View file

@ -5,7 +5,6 @@
#include <stdint.h> #include <stdint.h>
#include <wayland-client.h> #include <wayland-client.h>
#include <wayland-util.h> #include <wayland-util.h>
#include <SDL3/SDL.h>
#include <pthread.h> #include <pthread.h>
#include <sys/mman.h> #include <sys/mman.h>
#include "renderer.h" #include "renderer.h"
@ -36,13 +35,14 @@ int main(int argc, char *argv[]) {
exit(1); exit(1);
} }
struct client_state state = wayland_init(); struct client_state state;
wayland_init(&state);
Renderer renderer = new_renderer(); Renderer renderer = new_renderer();
while (running) { while (running) {
double time = time_since_start(); double time = time_since_start();
render(&renderer, state.width, state.height, time, shader_path, false); render(&renderer, state.width, state.height, time, shader_path, 0);
commit(&state); commit(&state);
} }

31
wayland.c
View file

@ -156,25 +156,24 @@ static void egl_init(struct client_state *state) {
} }
/// Initializes wayland and creates an opengl context /// Initializes wayland and creates an opengl context
struct client_state wayland_init() { void wayland_init(struct client_state *state) {
int width = 700, height = 700; int width = 700, height = 700;
struct client_state state = { width, height, 0 }; state->width = width;
state.wl_display = wl_display_connect(NULL); state->height = height;
state.wl_registry = wl_display_get_registry(state.wl_display); state->wl_display = wl_display_connect(NULL);
wl_registry_add_listener(state.wl_registry, &wl_registry_listener, &state); state->wl_registry = wl_display_get_registry(state->wl_display);
wl_display_roundtrip(state.wl_display); wl_registry_add_listener(state->wl_registry, &wl_registry_listener, state);
wl_display_roundtrip(state->wl_display);
state.wl_surface = wl_compositor_create_surface(state.wl_compositor); state->wl_surface = wl_compositor_create_surface(state->wl_compositor);
state.xdg_surface = xdg_wm_base_get_xdg_surface( state->xdg_surface = xdg_wm_base_get_xdg_surface(
state.xdg_wm_base, state.wl_surface); state->xdg_wm_base, state->wl_surface);
xdg_surface_add_listener(state.xdg_surface, &xdg_surface_listener, &state); xdg_surface_add_listener(state->xdg_surface, &xdg_surface_listener, state);
state.xdg_toplevel = xdg_surface_get_toplevel(state.xdg_surface); state->xdg_toplevel = xdg_surface_get_toplevel(state->xdg_surface);
xdg_toplevel_set_title(state.xdg_toplevel, "GLONKERS!"); xdg_toplevel_set_title(state->xdg_toplevel, "GLONKERS!");
wl_surface_commit(state.wl_surface); wl_surface_commit(state->wl_surface);
egl_init(&state); egl_init(state);
return state;
} }
/// Swaps front/backbuffers and dispatches pending wayland commands. /// Swaps front/backbuffers and dispatches pending wayland commands.

2
wayland.h
View file

@ -22,6 +22,6 @@ struct client_state {
EGLContext egl_context; EGLContext egl_context;
}; };
struct client_state wayland_init(); void wayland_init(struct client_state *state);
void commit(struct client_state *state); void commit(struct client_state *state);