pyrite-dev/milsko
pyrite-dev/milsko
12
1
Fork 3
Code Issues 5 Pull requests Projects Releases 7 Packages Wiki Activity Actions

undo HAS_OPENGL stuff

Browse source
This commit is contained in:
IoIxD 2025-12-30 22:38:01 -07:00
commit f3683dece3
3 changed files with 5 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

4
pl/rules.pl
View file

@ -53,10 +53,6 @@ if (param_get("stb-truetype")) {
add_cflags("-DUSE_STB_TRUETYPE"); add_cflags("-DUSE_STB_TRUETYPE");
} }
if (param_get("opengl")) {
add_cflags("-DHAS_OPENGL");
}
if (param_get("freetype2")) { if (param_get("freetype2")) {
add_cflags("-DUSE_FREETYPE2"); add_cflags("-DUSE_FREETYPE2");
if ($cross) { if ($cross) {

13
src/backend/wayland.c
View file

@ -1468,14 +1468,11 @@ static int MwLLPendingImpl(MwLL handle) {
} }
static void MwLLNextEventImpl(MwLL handle) { static void MwLLNextEventImpl(MwLL handle) {
if(!handle->wayland.always_render) { if(handle->wayland.events_pending) {
event_loop(handle); handle->wayland.events_pending = 0;
if(handle->wayland.events_pending) { }
handle->wayland.events_pending = 0; if(handle->wayland.force_render) {
} handle->wayland.force_render = 0;
if(handle->wayland.force_render) {
handle->wayland.force_render = 0;
}
} }
} }

75
src/widget/opengl.c
View file

@ -1,7 +1,6 @@
#include <Mw/Milsko.h> #include <Mw/Milsko.h>
#include <Mw/Widget/OpenGL.h> #include <Mw/Widget/OpenGL.h>
#ifdef HAS_OPENGL
#ifdef USE_GDI #ifdef USE_GDI
typedef HGLRC(WINAPI* MWwglCreateContext)(HDC); typedef HGLRC(WINAPI* MWwglCreateContext)(HDC);
typedef BOOL(WINAPI* MWwglMakeCurrent)(HDC, HGLRC); typedef BOOL(WINAPI* MWwglMakeCurrent)(HDC, HGLRC);
@ -320,80 +319,6 @@ static void* mwOpenGLGetProcAddressImpl(MwWidget handle, const char* name) {
#endif #endif
return NULL; return NULL;
} }
#else
#ifdef USE_GDI
typedef HGLRC(WINAPI* MWwglCreateContext)(HDC);
typedef BOOL(WINAPI* MWwglMakeCurrent)(HDC, HGLRC);
typedef PROC(WINAPI* MWwglGetProcAddress)(LPCSTR);
typedef BOOL(WINAPI* MWwglDeleteContext)(HGLRC);
typedef struct gdiopengl {
HDC dc;
HGLRC gl;
void* lib;
MWwglCreateContext wglCreateContext;
MWwglMakeCurrent wglMakeCurrent;
MWwglDeleteContext wglDeleteContext;
MWwglGetProcAddress wglGetProcAddress;
} gdiopengl_t;
#endif
#ifdef USE_X11
typedef XVisualInfo* (*MWglXChooseVisual)(Display* dpy, int screen, int* attribList);
typedef GLXContext (*MWglXCreateContext)(Display* dpy, XVisualInfo* vis, GLXContext shareList, Bool direct);
typedef void (*MWglXDestroyContext)(Display* dpy, GLXContext ctx);
typedef Bool (*MWglXMakeCurrent)(Display* dpy, GLXDrawable drawable, GLXContext ctx);
typedef void (*MWglXSwapBuffers)(Display* dpy, GLXDrawable drawable);
typedef void* (*MWglXGetProcAddress)(const GLubyte* procname);
typedef struct x11opengl {
XVisualInfo* visual;
GLXContext gl;
void* lib;
MWglXChooseVisual glXChooseVisual;
MWglXCreateContext glXCreateContext;
MWglXDestroyContext glXDestroyContext;
MWglXMakeCurrent glXMakeCurrent;
MWglXSwapBuffers glXSwapBuffers;
MWglXGetProcAddress glXGetProcAddress;
} x11opengl_t;
#endif
#ifdef USE_WAYLAND
#include <EGL/egl.h>
#include <wayland-egl.h>
typedef struct waylandopengl {
struct wl_egl_window* egl_window_native;
EGLDisplay egl_display;
EGLContext egl_context;
EGLSurface egl_surface;
EGLConfig egl_config;
} waylandopengl_t;
#endif
static int create(MwWidget handle) {
printf("Milsko compiled without OpenGL support! OpenGL widgets will not work properly.\n");
return 1;
}
static void destroy(MwWidget handle) {
}
static void mwOpenGLMakeCurrentImpl(MwWidget handle) {
}
static void mwOpenGLSwapBufferImpl(MwWidget handle) {
}
static void* mwOpenGLGetProcAddressImpl(MwWidget handle, const char* name) {
return NULL;
}
#endif
static void func_handler(MwWidget handle, const char* name, void* out, va_list va) { static void func_handler(MwWidget handle, const char* name, void* out, va_list va) {
if(strcmp(name, "mwOpenGLMakeCurrent") == 0) { if(strcmp(name, "mwOpenGLMakeCurrent") == 0) {