ShuriZma
/
melonDS
mirror of https://github.com/melonDS-emu/melonDS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

clean up code, attempt at shit

This commit is contained in:
StapleButter 2019-05-31 01:46:47 +02:00
parent ea669190aa
commit 27d451d07a
4 changed files with 67 additions and 396 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
src/libui_sdl/libui/unix/area.c
View File

@ -28,12 +28,11 @@ struct uiArea {
GtkWidget *areaWidget; GtkWidget *areaWidget;
GtkDrawingArea *drawingArea; GtkDrawingArea *drawingArea;
GtkGLArea *glArea;
areaWidget *area; areaWidget *area;
gboolean opengl; gboolean opengl;
uiGLContext *glContext; uiGLContext *glContext;
gboolean drawreq; unsigned int* req_versions;
int bgR, bgG, bgB; int bgR, bgG, bgB;
@ -132,8 +131,6 @@ static void loadAreaSize(uiArea *a, double *width, double *height)
} }
} }
void areaDrawGL(GtkWidget* widget, uiAreaDrawParams* dp, cairo_t* cr, uiGLContext* glctx);
void areaPreRedraw(areaWidget* widget) void areaPreRedraw(areaWidget* widget)
{ {
uiArea* a = widget->a; uiArea* a = widget->a;
@ -181,8 +178,6 @@ static gboolean areaWidget_draw(GtkWidget *w, cairo_t *cr)
else else
{ {
areaDrawGL(w, &dp, cr, a->glContext); areaDrawGL(w, &dp, cr, a->glContext);
//if (a->drawreq) uiGLEnd(a->glContext);
a->drawreq = FALSE;
} }
freeContext(dp.Context); freeContext(dp.Context);
@ -664,8 +659,6 @@ void uiAreaSetSize(uiArea *a, int width, int height)
gboolean _threadsaferefresh(gpointer data) gboolean _threadsaferefresh(gpointer data)
{ {
uiArea* a = (uiArea*)data; uiArea* a = (uiArea*)data;
a->drawreq = TRUE;
//if (a->opengl) uiGLBegin(a->glContext);
gtk_widget_queue_draw(a->areaWidget); gtk_widget_queue_draw(a->areaWidget);
return FALSE; return FALSE;
} }
@ -676,11 +669,7 @@ void uiAreaQueueRedrawAll(uiArea *a)
if (g_thread_self() != gtkthread) if (g_thread_self() != gtkthread)
g_idle_add(_threadsaferefresh, a); g_idle_add(_threadsaferefresh, a);
else else
{
a->drawreq = TRUE;
//if (a->opengl) uiGLBegin(a->glContext);
gtk_widget_queue_draw(a->areaWidget); gtk_widget_queue_draw(a->areaWidget);
}
} }
void uiAreaScrollTo(uiArea *a, double x, double y, double width, double height) void uiAreaScrollTo(uiArea *a, double x, double y, double width, double height)
@ -762,7 +751,7 @@ void uiAreaBeginUserWindowResize(uiArea *a, uiWindowResizeEdge edge)
uiArea *uiNewArea(uiAreaHandler *ah) uiArea *uiNewArea(uiAreaHandler *ah)
{ {
uiArea *a; uiArea *a;
printf("create regular area\n");
uiUnixNewControl(uiArea, a); uiUnixNewControl(uiArea, a);
a->ah = ah; a->ah = ah;
@ -782,44 +771,38 @@ printf("create regular area\n");
return a; return a;
} }
uiGLContext* FARTOMATIC(int major, int minor); void _areaCreateGLContext(GtkWidget* widget, gpointer data)
void databotte(GtkWidget* gla, uiGLContext* ctx);
void majoricc(GtkWidget* widget, gpointer data)
{ {
printf("ACTUALLY CREATE CONTEXT\n");
uiArea* a = (uiArea*)data; uiArea* a = (uiArea*)data;
uiGLContext* ctx = a->glContext;
databotte(a->widget, ctx); uiGLContext* ctx = NULL;
for (int i = 0; a->req_versions[i] && !ctx; i++)
{
int major = uiGLVerMajor(a->req_versions[i]);
int minor = uiGLVerMinor(a->req_versions[i]);
// we cannot support any version older than 3.2 via GDK
if ((major < 3) || (major == 3 && minor < 2))
break;
ctx = createGLContext(widget, major, minor);
}
a->glContext = ctx;
} }
uiArea *uiNewGLArea(uiAreaHandler *ah, const unsigned int* req_versions) uiArea *uiNewGLArea(uiAreaHandler *ah, const unsigned int* req_versions)
{ {
uiArea *a; uiArea *a;
printf("create glarea\n");
uiUnixNewControl(uiArea, a); uiUnixNewControl(uiArea, a);
a->ah = ah; a->ah = ah;
a->scrolling = FALSE; a->scrolling = FALSE;
a->opengl = TRUE; a->opengl = TRUE;
a->drawreq = FALSE;
a->glContext = NULL;
//GtkGLArea* gla = (GtkGLArea*)gtk_gl_area_new(); a->req_versions = req_versions;
uiGLContext* ctx = NULL;
printf("create sdfsf\n");
// TODO: move this elsewhere!! so we can actually try all possible versions
for (int i = 0; req_versions[i] && !ctx; i++) {
int major = uiGLVerMajor(req_versions[i]);
int minor = uiGLVerMinor(req_versions[i]);
//gtk_gl_area_set_required_version(gla, major, minor);
//ctx = createGLContext(gla, major, minor);
ctx = FARTOMATIC(major, minor);
}
printf("create jfghjjgh: %p\n", ctx);
a->glContext = ctx;
//a->areaWidget = GTK_WIDGET(gla);
//a->glArea = gla;
a->areaWidget = GTK_WIDGET(g_object_new(areaWidgetType, a->areaWidget = GTK_WIDGET(g_object_new(areaWidgetType,
"libui-area", a, "libui-area", a,
NULL)); NULL));
@ -827,7 +810,7 @@ printf("create jfghjjgh: %p\n", ctx);
a->widget = a->areaWidget; a->widget = a->areaWidget;
g_signal_connect(a->widget, "realize", G_CALLBACK(majoricc), a); g_signal_connect(a->widget, "realize", G_CALLBACK(_areaCreateGLContext), a);
uiAreaSetBackgroundColor(a, -1, -1, -1); uiAreaSetBackgroundColor(a, -1, -1, -1);

399
src/libui_sdl/libui/unix/gl.c
View File

@ -1,63 +1,29 @@
// 26 may 2019 // 26 may 2019
#include "uipriv_unix.h" #include "uipriv_unix.h"
#include <X11/Xlib.h>
#include <GL/gl.h> #include <GL/gl.h>
#include <GL/glx.h>
extern GThread* gtkthread; extern GThread* gtkthread;
extern GMutex glmutex;
/* struct uiGLContext
*(melonDS:17013): Gtk-CRITICAL **: 00:28:09.095: gtk_gl_area_set_required_version: assertion 'GTK_IS_GL_AREA (area)' failed
(melonDS:17013): GLib-GObject-WARNING **: 00:28:09.096: invalid cast from 'GtkGLArea' to 'areaWidget'
*/
// MISERABLE LITTLE PILE OF HACKS
#define HAX_GDK_GL_CONTEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_GL_CONTEXT, HAX_GdkGLContextClass))
#define HAX_GDK_IS_GL_CONTEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_GL_CONTEXT))
#define HAX_GDK_GL_CONTEXT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_GL_CONTEXT, HAX_GdkGLContextClass))
typedef struct _HAX_GdkGLContextClass HAX_GdkGLContextClass;
struct _HAX_GdkGLContextClass
{ {
GObjectClass parent_class;
gboolean (* realize) (GdkGLContext *context,
GError **error);
void (* end_frame) (GdkGLContext *context,
cairo_region_t *painted,
cairo_region_t *damage);
gboolean (* texture_from_surface) (GdkGLContext *context,
cairo_surface_t *surface,
cairo_region_t *region);
};
struct uiGLContext {
GtkGLArea *gla;
GtkWidget* widget; GtkWidget* widget;
GdkWindow* window; GdkWindow* window;
GdkGLContext *gctx; GdkGLContext *gctx;
int vermaj, vermin;
GMutex mutex; GMutex mutex;
GLsync sync;
GLsync sync2;
int zog;
Display* xdisp;
GLXPixmap glxpm;
GLXContext glxctx;
int vermaj, vermin;
int width, height; int width, height;
int scale; int scale;
GLuint renderbuffer[2][2]; GLuint renderbuffer[2][2];
GLuint framebuffer[2]; GLuint framebuffer[2];
int backbuffer;
}; };
static void areaAllocRenderbuffer(uiGLContext* glctx);
static PFNGLGENRENDERBUFFERSPROC _glGenRenderbuffers; static PFNGLGENRENDERBUFFERSPROC _glGenRenderbuffers;
static PFNGLDELETERENDERBUFFERSPROC _glDeleteRenderbuffers; static PFNGLDELETERENDERBUFFERSPROC _glDeleteRenderbuffers;
static PFNGLBINDRENDERBUFFERPROC _glBindRenderbuffer; static PFNGLBINDRENDERBUFFERPROC _glBindRenderbuffer;
@ -73,15 +39,6 @@ static PFNGLCHECKFRAMEBUFFERSTATUSPROC _glCheckFramebufferStatus;
static int _procsLoaded = 0; static int _procsLoaded = 0;
static void (*vniorp)(GdkGLContext*, cairo_region_t*, cairo_region_t*);
static void class_hax(GdkGLContext* glctx, cairo_region_t* painted, cairo_region_t* damage)
{
//printf("END FRAME HIJACK\n");
//glClearColor(0, 1, 0, 1);
vniorp(glctx, painted, damage);
}
static void _loadGLProcs(GdkGLContext* glctx) static void _loadGLProcs(GdkGLContext* glctx)
{ {
if (_procsLoaded) return; if (_procsLoaded) return;
@ -100,101 +57,31 @@ static void _loadGLProcs(GdkGLContext* glctx)
_glCheckFramebufferStatus = (PFNGLCHECKFRAMEBUFFERSTATUSPROC)uiGLGetProcAddress("glCheckFramebufferStatus"); _glCheckFramebufferStatus = (PFNGLCHECKFRAMEBUFFERSTATUSPROC)uiGLGetProcAddress("glCheckFramebufferStatus");
_procsLoaded = 1; _procsLoaded = 1;
HAX_GdkGLContextClass* class = HAX_GDK_GL_CONTEXT_GET_CLASS(glctx);
printf("HAX class = %p\n", class);
printf("class end_frame = %p\n", class->end_frame);
vniorp = class->end_frame;
class->end_frame = class_hax;
} }
Display* derp;
int nswaps = 0;
uiGLContext *createGLContext(GtkWidget* widget, int maj, int min) uiGLContext *createGLContext(GtkWidget* widget, int maj, int min)
{ {
printf("barp\n"); GdkWindow* gdkwin = gtk_widget_get_window(widget);
uiGLContext *ret = uiNew(uiGLContext);//uiAlloc(sizeof(uiGLContext), "uiGLContext");
// herp
ret->gla = widget;
ret->gctx = NULL;
//while (!ret->gctx)
/*{
gtk_widget_realize(GTK_WIDGET(gla));
printf("is area realized: %d\n", gtk_widget_get_realized(GTK_WIDGET(gla)));
ret->gla = gla;
ret->gctx = gtk_gl_area_get_context(gla);
printf("context: %p\n", ret->gctx);
}*/
/*
GtkAllocation allocation;
GdkWindow *window;
Display *display;
int id;
window = gtk_widget_get_window(widget);
display = gdk_x11_display_get_xdisplay(gdk_window_get_display(window));
id = gdk_x11_window_get_xid(window);
if (glXMakeCurrent(display, id, context) == TRUE) {*/
/*GdkWindow* window;
Display* disp;
window = gtk_widget_get_window(GTK_WIDGET(gla));
display = */
ret->vermaj = maj; ret->vermin = min;
return ret;
}
void freeGLContext(uiGLContext* glctx)
{
if (glctx == NULL) return;
gdk_gl_context_clear_current();
g_object_unref(glctx->gctx);
uiFree(glctx);
}
static void areaAllocRenderbuffer(uiGLContext* glctx);
void databotte(GtkWidget* widget, uiGLContext* ctx)
{
/*printf("is area realized: %d\n", gtk_widget_get_realized(GTK_WIDGET(gla)));
ctx->gctx = gtk_gl_area_get_context(gla);
printf("context: %p\n", ctx->gctx);*/
printf("DATABOTTE\n");
GdkWindow* gdkwin = gtk_widget_get_window(widget);
printf("window=%p\n", gdkwin);
GError* err = NULL; GError* err = NULL;
GdkGLContext* glctx = gdk_window_create_gl_context(gdkwin, &err); GdkGLContext* gctx = gdk_window_create_gl_context(gdkwin, &err);
if (err != NULL) if (err != NULL || gctx == NULL)
{ {
printf("CONTEXT SHAT ITSELF\n"); return NULL;
return;
} }
gdk_gl_context_set_use_es(glctx, FALSE); // TODO: make the set_use_es call conditional (#ifdef or smth) for older versions of gdk?
gdk_gl_context_set_required_version(glctx, 3, 2); gdk_gl_context_set_use_es(gctx, FALSE);
gdk_gl_context_set_required_version(gctx, maj, min);
gdk_gl_context_realize(glctx, &err); gboolean res = gdk_gl_context_realize(gctx, &err);
if (err != NULL) if (err != NULL || res == FALSE)
{ {
printf("CONTEXT REALIZE SHAT ITSELF\n"); return NULL;
return;
} }
uiGLContext* ctx = uiNew(uiGLContext);
GtkAllocation allocation; GtkAllocation allocation;
gtk_widget_get_allocation(widget, &allocation); gtk_widget_get_allocation(widget, &allocation);
int window_scale = gdk_window_get_scale_factor(gdkwin); int window_scale = gdk_window_get_scale_factor(gdkwin);
@ -202,13 +89,26 @@ void databotte(GtkWidget* widget, uiGLContext* ctx)
ctx->height = allocation.height; ctx->height = allocation.height;
ctx->scale = window_scale; ctx->scale = window_scale;
gdk_gl_context_make_current(glctx); gdk_gl_context_make_current(gctx);
_loadGLProcs(glctx); _loadGLProcs(gctx);
areaAllocRenderbuffer(ctx); areaAllocRenderbuffer(ctx);
ctx->backbuffer = 0;
g_mutex_init(&ctx->mutex);
ctx->widget = widget; ctx->widget = widget;
ctx->window = gdkwin; ctx->window = gdkwin;
ctx->gctx = glctx; ctx->gctx = gctx;
return ctx;
}
void freeGLContext(uiGLContext* glctx)
{
if (glctx == NULL) return;
gdk_gl_context_clear_current();
g_object_unref(glctx->gctx);
uiFree(glctx);
} }
static void areaAllocRenderbuffer(uiGLContext* glctx) static void areaAllocRenderbuffer(uiGLContext* glctx)
@ -279,41 +179,16 @@ static void areaRellocRenderbuffer(uiGLContext* glctx)
void areaPreRedrawGL(uiGLContext* glctx) void areaPreRedrawGL(uiGLContext* glctx)
{ {
g_mutex_lock(&glctx->mutex); g_mutex_lock(&glctx->mutex);
glctx->backbuffer = glctx->backbuffer ? 0 : 1;
/*gdk_gl_context_make_current(glctx->gctx);
//glClientWaitSync(glctx->sync, 0, GL_TIMEOUT_IGNORED);
glDeleteSync(glctx->sync);
glFinish();
gdk_gl_context_clear_current();*/
/*GdkGLContext* oldctx = gdk_gl_context_get_current();
gdk_gl_context_make_current(glctx->gctx);
printf("[%p] PRE DRAW\n", gdk_gl_context_get_current());
gdk_gl_context_make_current(oldctx);*/
//glClearColor(0,1,0,1); glClear(GL_COLOR_BUFFER_BIT);
//glWaitSync(glctx->sync, 0, GL_TIMEOUT_IGNORED);
/*int ret = glClientWaitSync(glctx->sync, GL_SYNC_FLUSH_COMMANDS_BIT, 1000000*50);
printf("PRE-DRAW: SYNC %p, %04X, %04X\n", glctx->sync, ret, glGetError());
glDeleteSync(glctx->sync);
glctx->sync = NULL;*/
//glFlush();
if (nswaps > 1) printf("MISSED %d FRAMES\n", nswaps-1);
nswaps = 0;
//glctx->zog ^= 1;
} }
void areaPostRedrawGL(uiGLContext* glctx) void areaPostRedrawGL(uiGLContext* glctx)
{ {
//glctx->sync2 = glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
//glFlush();
//printf("[%p] POST DRAW\n", gdk_gl_context_get_current());
g_mutex_unlock(&glctx->mutex); g_mutex_unlock(&glctx->mutex);
} }
void areaDrawGL(GtkWidget* widget, uiAreaDrawParams* dp, cairo_t* cr, uiGLContext* glctx) void areaDrawGL(GtkWidget* widget, uiAreaDrawParams* dp, cairo_t* cr, uiGLContext* glctx)
{ {
//uiGLBegin(glctx);
int window_scale = gdk_window_get_scale_factor(glctx->window); int window_scale = gdk_window_get_scale_factor(glctx->window);
if (glctx->width != dp->AreaWidth || glctx->height != dp->AreaHeight || glctx->scale != window_scale) if (glctx->width != dp->AreaWidth || glctx->height != dp->AreaHeight || glctx->scale != window_scale)
@ -325,145 +200,13 @@ void areaDrawGL(GtkWidget* widget, uiAreaDrawParams* dp, cairo_t* cr, uiGLContex
} }
gdk_cairo_draw_from_gl(cr, gtk_widget_get_window(widget), gdk_cairo_draw_from_gl(cr, gtk_widget_get_window(widget),
glctx->renderbuffer[glctx->zog][0], GL_RENDERBUFFER, glctx->renderbuffer[glctx->backbuffer][0], GL_RENDERBUFFER,
1, 0, 0, glctx->width*glctx->scale, glctx->height*glctx->scale); 1, 0, 0, glctx->width*glctx->scale, glctx->height*glctx->scale);
//uiGLEnd(glctx);
}
uiGLContext* FARTOMATIC(int major, int minor)
{
uiGLContext *_ret = uiNew(uiGLContext);
_ret->vermaj = major;
_ret->vermin = minor;
_ret->width = -1;
_ret->height = -1;
_ret->renderbuffer[0][0] = 0;
_ret->renderbuffer[0][1] = 0;
_ret->framebuffer[0] = 0;
_ret->renderbuffer[1][0] = 0;
_ret->renderbuffer[1][1] = 0;
_ret->framebuffer[1] = 0;
_ret->zog = 0;
g_mutex_init(&_ret->mutex);
return _ret;
Display* disp;
XVisualInfo* vizir;
GLXFBConfig *cfg;
Pixmap pm;
GLXPixmap glxpm;
GLXContext ctx;
disp = XOpenDisplay(NULL);
derp = disp;
int kaa, baa;
glXQueryVersion(disp, &kaa, &baa);
printf("GL VERSION: %d.%d\n", kaa, baa);
const int sbAttrib[] = { GLX_RGBA,
GLX_RED_SIZE, 1,
GLX_GREEN_SIZE, 1,
GLX_BLUE_SIZE, 1,
None };
const int dbAttrib[] = { GLX_RGBA,
GLX_RED_SIZE, 1,
GLX_GREEN_SIZE, 1,
GLX_BLUE_SIZE, 1,
GLX_DOUBLEBUFFER,
None };
int scrnum = DefaultScreen( disp );
Window root = RootWindow( disp, scrnum );
vizir = glXChooseVisual( disp, scrnum, (int *) sbAttrib );
if (!vizir) {
vizir = glXChooseVisual( disp, scrnum, (int *) dbAttrib );
if (!vizir) {
printf("Error: couldn't get an RGB visual\n");
return NULL;
}
}
const int fb_attr[] = {
GLX_RENDER_TYPE, GLX_RGBA_BIT,
GLX_DRAWABLE_TYPE, GLX_PBUFFER_BIT,
GLX_X_VISUAL_TYPE, GLX_TRUE_COLOR,
GLX_DOUBLEBUFFER, True,
GLX_X_RENDERABLE, True,
GLX_RED_SIZE, 8,
GLX_GREEN_SIZE, 8,
GLX_BLUE_SIZE, 8,
GLX_ALPHA_SIZE, 8,
GLX_DEPTH_SIZE, 24,
GLX_STENCIL_SIZE, 8,
None
};
int configs;
cfg = glXChooseFBConfig(disp, scrnum, (int *)&fb_attr, &configs);
if (!cfg)
{
printf("NO GOOD FBCONFIG\n");
return NULL;
}
/*ctx = glXCreateContext( disp, vizir, NULL, True );
if (!ctx)
{
printf("Error: glXCreateContext failed\n");
return NULL;
}*/
PFNGLXCREATECONTEXTATTRIBSARBPROC createctx;
createctx = (PFNGLXCREATECONTEXTATTRIBSARBPROC)glXGetProcAddressARB("glXCreateContextAttribsARB");
if (!createctx)
{
printf("bad shito\n");
return NULL;
}
const int ctx_attr[] =
{
GLX_CONTEXT_PROFILE_MASK_ARB, GLX_CONTEXT_CORE_PROFILE_BIT_ARB,
GLX_CONTEXT_MAJOR_VERSION_ARB, 3,//major,
GLX_CONTEXT_MINOR_VERSION_ARB, 2,//minor,
None
};
ctx = glXCreateContextAttribsARB(disp, cfg[0], 0, True, ctx_attr);
if (!ctx)
{
printf("FAILED TO CREATE FANCYPANTS GL CONTEXT\n");
return NULL;
}
//printf("CONTEXT GOOD. Direct rendering: %s\n", glXIsDirect(disp, ctx) ? "Yes" : "No");
printf("blorp: %d\n", vizir->depth);
pm = XCreatePixmap(disp, root, 256, 384, vizir->depth);
if (!pm) printf("PIXMAP SHAT ITSELF\n");
else printf("PIXMAP GOOD\n");
glxpm = glXCreateGLXPixmap(disp, vizir, pm);
if (!glxpm) printf("GLXPIXMAP SHAT ITSELF\n");
else printf("GLXPIXMAP GOOD\n");
uiGLContext *ret = uiNew(uiGLContext);
printf("CREATE CTX: %p, %p\n", ret, g_thread_self());
ret->xdisp = disp;
ret->glxpm = glxpm;
ret->glxctx = ctx;
return ret;
} }
int uiGLGetFramebuffer(uiGLContext* ctx) int uiGLGetFramebuffer(uiGLContext* ctx)
{ {
return ctx->framebuffer[ctx->zog];// ? 0:1]; return ctx->framebuffer[ctx->backbuffer];// ? 0 : 1];
} }
float uiGLGetFramebufferScale(uiGLContext* ctx) float uiGLGetFramebufferScale(uiGLContext* ctx)
@ -473,91 +216,35 @@ float uiGLGetFramebufferScale(uiGLContext* ctx)
void uiGLSwapBuffers(uiGLContext* ctx) void uiGLSwapBuffers(uiGLContext* ctx)
{ {
/*ctx->sync = glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0); // nothing to do here, GTK will take care of this
//gdk_gl_context_clear_current();
glWaitSync(ctx->sync, 0, GL_TIMEOUT_IGNORED);
glDeleteSync(ctx->sync);*/
/*printf("[%p] SWAPBUFFERS\n", gdk_gl_context_get_current());
glClearColor(0,1,0,1); glClear(GL_COLOR_BUFFER_BIT);
glFinish();*/
//ctx->sync = glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
//glFlush();
//printf("SWAP: SYNC=%p\n", ctx->sync);
//glFinish(); //glFinish();
nswaps++;
}
static volatile int _ctxset_done;
gboolean _threadsafe_ctxset(gpointer data)
{
uiGLContext* ctx = (uiGLContext*)data;
gtk_gl_area_make_current(ctx->gla);
_ctxset_done = 1;
return FALSE;
} }
void uiGLMakeContextCurrent(uiGLContext* ctx) void uiGLMakeContextCurrent(uiGLContext* ctx)
{ {
//if (!ctx) return;
/*if (g_thread_self() != gtkthread)
{
_ctxset_done = 0;
g_idle_add(_threadsafe_ctxset, ctx);
while (!_ctxset_done);
}
else*/
//gtk_gl_area_make_current(ctx->gla);
/*printf("MAKE CONTEXT CURRENT %p, %p\n", ctx, g_thread_self());
if (!ctx)
{
// BLERUGEHZFZF
glXMakeCurrent(derp, None, NULL);
return;
}
Bool ret = True;
if (glXGetCurrentContext() != ctx->glxctx)
{printf("DZJSKFLD\n");
ret = glXMakeCurrent(ctx->xdisp, ctx->glxpm, ctx->glxctx);
//glXMakeContextCurrent(ctx->xdisp, ctx->glxpm, ctx->glxpm, ctx->glxctx);
}
printf("WE MAED IT CURRENT: %d\n", ret);*/
//printf("[%p] MAKE CONTEXT CURRENT %p, %p\n", g_thread_self(), ctx, ctx?ctx->gctx:NULL);
if (!ctx) if (!ctx)
{ {
gdk_gl_context_clear_current(); gdk_gl_context_clear_current();
return; return;
} }
//gtk_gl_area_make_current(ctx->gla);
if (ctx->gctx == gdk_gl_context_get_current()) return;
gdk_gl_context_make_current(ctx->gctx); gdk_gl_context_make_current(ctx->gctx);
GdkGLContext* burp = gdk_gl_context_get_current();
//gtk_gl_area_attach_buffers(ctx->gla);
//printf("burp = %p / %p\n", burp, ctx->gctx);
} }
void uiGLBegin(uiGLContext* ctx) void uiGLBegin(uiGLContext* ctx)
{ {
//g_mutex_lock(&ctx->mutex);
if (g_thread_self() != gtkthread) if (g_thread_self() != gtkthread)
{ {
g_mutex_lock(&glmutex); g_mutex_lock(&ctx->mutex);
//int ret = glClientWaitSync(ctx->sync2, GL_SYNC_FLUSH_COMMANDS_BIT, 1000000*50);
//printf("GLBEGIN: SYNC %p, %04X, %04X\n", ctx->sync2, ret, glGetError());
//glDeleteSync(ctx->sync2);
} }
} }
void uiGLEnd(uiGLContext* ctx) void uiGLEnd(uiGLContext* ctx)
{ {
//g_mutex_unlock(&ctx->mutex);
if (g_thread_self() != gtkthread) if (g_thread_self() != gtkthread)
{ {
g_mutex_unlock(&glmutex); g_mutex_unlock(&ctx->mutex);
//ctx->sync = glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
//glFlush();
} }
} }
@ -568,7 +255,7 @@ void* a = dlsym(NULL, proc);
void* b = glXGetProcAddress(proc); void* b = glXGetProcAddress(proc);
void* c = glXGetProcAddressARB(proc); void* c = glXGetProcAddressARB(proc);
printf("%p / %p / %p\n", a, b, c); printf("%p / %p / %p\n", a, b, c);
return c; return a;
// this *will* break for older systems that don't have libglvnd! // this *will* break for older systems that don't have libglvnd!
// TODO: use a real solution // TODO: use a real solution
return dlsym(NULL /* RTLD_DEFAULT */, proc); return dlsym(NULL /* RTLD_DEFAULT */, proc);

1
src/libui_sdl/libui/unix/uipriv_unix.h
View File

@ -68,6 +68,7 @@ extern gboolean FUTURE_gtk_widget_path_iter_set_object_name(GtkWidgetPath *path,
extern uiGLContext *createGLContext(GtkWidget* widget, int maj, int min); extern uiGLContext *createGLContext(GtkWidget* widget, int maj, int min);
extern void freeGLContext(uiGLContext* glctx); extern void freeGLContext(uiGLContext* glctx);
extern void areaPreRedrawGL(uiGLContext* glctx); extern void areaPreRedrawGL(uiGLContext* glctx);
extern void areaDrawGL(GtkWidget* widget, uiAreaDrawParams* dp, cairo_t* cr, uiGLContext* glctx);
extern void areaPostRedrawGL(uiGLContext* glctx); extern void areaPostRedrawGL(uiGLContext* glctx);
// notes: // notes:

2
src/libui_sdl/main.cpp
View File

@ -66,7 +66,7 @@ uiWindow* MainWindow;
uiArea* MainDrawArea; uiArea* MainDrawArea;
uiAreaHandler MainDrawAreaHandler; uiAreaHandler MainDrawAreaHandler;
const u32 kGLVersions[] = {uiGLVersion(3,1), 0}; const u32 kGLVersions[] = {uiGLVersion(3,2), uiGLVersion(3,1), 0};
uiGLContext* GLContext; uiGLContext* GLContext;
int WindowWidth, WindowHeight; int WindowWidth, WindowHeight;