forks
/
dlangui
mirror of https://github.com/buggins/dlangui.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix X11 OpenGL support

This commit is contained in:
Grim Maple 2022-10-25 18:54:45 +03:00
parent af36d0d76c
commit 65d74b2945
2 changed files with 29 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dub.json
View File

@ -120,13 +120,15 @@
}, },
{ {
"name": "x11", "name": "x11",
"versions": ["USE_X11", "USE_FREETYPE", "EmbedStandardResources", "GL_32"], "versions": ["USE_X11", "USE_FREETYPE", "EmbedStandardResources", "USE_OPENGL", "GL_32"],
"versions-windows": ["Unicode"], "versions-windows": ["Unicode"],
"libs-posix": ["GLX"],
"dependencies": { "dependencies": {
"bindbc-opengl": "~>1.0.0", "bindbc-opengl": "~>1.0.0",
"bindbc-freetype": "~>1.0.0", "bindbc-freetype": "~>1.0.0",
"x11": "~>1.0.21", "x11": "~>1.0.21",
"icontheme": "~>1.2.3" "icontheme": "~>1.2.3",
"glx-d": "~>1.0.0"
} }
}, },
{ {

43
src/dlangui/platforms/x11/x11app.d
View File

@ -28,13 +28,12 @@ import x11.Xatom;
import x11.X; import x11.X;
static if (ENABLE_OPENGL) { static if (ENABLE_OPENGL) {
import derelict.opengl3.gl3; import bindbc.opengl;
import derelict.opengl3.gl;
import dlangui.graphics.gldrawbuf; import dlangui.graphics.gldrawbuf;
import dlangui.graphics.glsupport; import dlangui.graphics.glsupport;
import derelict.opengl3.glx; import glx.glx;
private __gshared derelict.util.xtypes.XVisualInfo * x11visual; private __gshared XVisualInfo * x11visual;
private __gshared Colormap x11cmap; private __gshared Colormap x11cmap;
private __gshared bool _gl3Reloaded = false; private __gshared bool _gl3Reloaded = false;
} }
@ -1292,6 +1291,8 @@ private immutable int TIMER_EVENT = 8;
class X11Platform : Platform { class X11Platform : Platform {
this() { this() {
static if(ENABLE_OPENGL)
_enableOpengl = true;
import std.file : thisExePath; import std.file : thisExePath;
import std.path : baseName; import std.path : baseName;
_classname = (baseName(thisExePath()) ~ "\0").dup.ptr; _classname = (baseName(thisExePath()) ~ "\0").dup.ptr;
@ -1947,20 +1948,26 @@ extern(C) int DLANGUImain(string[] args)
static if (ENABLE_OPENGL) { static if (ENABLE_OPENGL) {
try { try {
DerelictGL3.missingSymbolCallback = &gl3MissingSymFunc; import bindbc.opengl : GLVersion = GLSupport;
DerelictGL3.load(); GLVersion support = loadOpenGL();
DerelictGL.missingSymbolCallback = &gl3MissingSymFunc; if(support == GLVersion.badLibrary)
DerelictGL.load(); {
Log.d("OpenGL library loaded ok"); _enableOpengl = false;
GLint[] att = [ GLX_RGBA, GLX_DEPTH_SIZE, 24, GLX_DOUBLEBUFFER, None ]; Log.e("Error loading OpenGL library");
XWindow root; }
root = DefaultRootWindow(x11display); else
x11visual = glXChooseVisual(x11display, 0, cast(int*)att.ptr); {
if (x11visual) { Log.d("OpenGL library loaded ok");
x11cmap = XCreateColormap(x11display, root, cast(Visual*)x11visual.visual, AllocNone); GLint[] att = [ GLX_RGBA, GLX_DEPTH_SIZE, 24, GLX_DOUBLEBUFFER, None ];
_enableOpengl = true; XWindow root;
} else { root = DefaultRootWindow(x11display);
Log.e("Cannot find suitable Visual for using of OpenGL"); x11visual = glXChooseVisual(x11display, 0, cast(int*)att.ptr);
if (x11visual) {
x11cmap = XCreateColormap(x11display, root, cast(Visual*)x11visual.visual, AllocNone);
_enableOpengl = true;
} else {
Log.e("Cannot find suitable Visual for using of OpenGL");
}
} }
} catch (Exception e) { } catch (Exception e) {
Log.e("Cannot load OpenGL library", e); Log.e("Cannot load OpenGL library", e);