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

Merge pull request #612 from Superbelko/migrate_bindbc 

Migrate to bindbc
This commit is contained in:
Grim Maple 2022-06-02 20:41:37 +03:00 committed by GitHub
parent 76c9e108e2 a65085d8ad
commit d92f668fbe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 297 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3rdparty/dimage/png.d vendored
View File

@ -582,7 +582,7 @@ in
{
assert (img.data.length);
}
body
do
{
Compound!(bool, string) error(string errorMsg)
{

40
3rdparty/fontconfig/functions.d vendored
View File

@ -5,48 +5,48 @@ public import fontconfig.fctypes;
extern( C ) @nogc nothrow {
alias da_FC_FcObjectSetBuild = FcObjectSet * function(const char *first, ...);
alias pFcObjectSetBuild = FcObjectSet * function(const char *first, ...);
alias da_FC_FcPatternCreate = FcPattern * function();
alias pFcPatternCreate = FcPattern * function();
alias da_FC_FcPatternAddBool = FcBool function(FcPattern *p, const char *object, FcBool b);
alias pFcPatternAddBool = FcBool function(FcPattern *p, const char *object, FcBool b);
alias da_FC_FcFontList = FcFontSet * function(FcConfig *config, FcPattern *p, FcObjectSet *os);
alias pFcFontList = FcFontSet * function(FcConfig *config, FcPattern *p, FcObjectSet *os);
alias da_FC_FcPatternDestroy = void function(FcPattern *p);
alias pFcPatternDestroy = void function(FcPattern *p);
alias da_FC_FcObjectSetDestroy = void function(FcObjectSet *os);
alias pFcObjectSetDestroy = void function(FcObjectSet *os);
alias da_FC_FcPatternGetString = FcResult function(const FcPattern *p, const char *object, int n, FcChar8 ** s);
alias pFcPatternGetString = FcResult function(const FcPattern *p, const char *object, int n, FcChar8 ** s);
alias da_FC_FcPatternGetInteger = FcResult function(const FcPattern *p, const char *object, int n, int *i);
alias pFcPatternGetInteger = FcResult function(const FcPattern *p, const char *object, int n, int *i);
alias da_FC_FcPatternGetBool = FcResult function(const FcPattern *p, const char *object, int n, FcBool *b);
alias pFcPatternGetBool = FcResult function(const FcPattern *p, const char *object, int n, FcBool *b);
alias da_FC_FcFontSetDestroy = void function(FcFontSet *s);
alias pFcFontSetDestroy = void function(FcFontSet *s);
}
__gshared {
da_FC_FcObjectSetBuild FcObjectSetBuild;
pFcObjectSetBuild FcObjectSetBuild;
da_FC_FcPatternCreate FcPatternCreate;
pFcPatternCreate FcPatternCreate;
da_FC_FcPatternAddBool FcPatternAddBool;
pFcPatternAddBool FcPatternAddBool;
da_FC_FcFontList FcFontList;
pFcFontList FcFontList;
da_FC_FcPatternDestroy FcPatternDestroy;
pFcPatternDestroy FcPatternDestroy;
da_FC_FcObjectSetDestroy FcObjectSetDestroy;
pFcObjectSetDestroy FcObjectSetDestroy;
da_FC_FcPatternGetString FcPatternGetString;
pFcPatternGetString FcPatternGetString;
da_FC_FcPatternGetInteger FcPatternGetInteger;
pFcPatternGetInteger FcPatternGetInteger;
da_FC_FcPatternGetBool FcPatternGetBool;
pFcPatternGetBool FcPatternGetBool;
da_FC_FcFontSetDestroy FcFontSetDestroy;
pFcFontSetDestroy FcFontSetDestroy;
}
/+

108
3rdparty/fontconfig/package.d vendored
View File

@ -3,42 +3,88 @@ module fontconfig;
public import fontconfig.fctypes;
public import fontconfig.functions;
import bindbc.loader;
enum FCSupport {
noLibrary,
badLibrary,
// TODO: real versions and stuff
fc100 = 100,
}
private {
import derelict.util.loader;
import derelict.util.system;
static if( Derelict_OS_Windows )
enum libNames = "libfontconfig-1.dll";
else static if( Derelict_OS_Mac )
enum libNames = "/usr/local/lib/libfontconfig.dylib";
else static if( Derelict_OS_Posix )
enum libNames = "libfontconfig.so.1, libfontconfig.so";
else
static assert( 0, "Need to implement FontConfig libNames for this operating system." );
SharedLib lib;
FCSupport loadedVersion;
}
class DerelictFCLoader : SharedLibLoader {
public this() {
super( libNames );
}
protected override void loadSymbols() {
bindFunc( cast( void** )&FcObjectSetBuild, "FcObjectSetBuild" );
bindFunc( cast( void** )&FcPatternCreate, "FcPatternCreate" );
bindFunc( cast( void** )&FcPatternAddBool, "FcPatternAddBool" );
bindFunc( cast( void** )&FcFontList, "FcFontList" );
bindFunc( cast( void** )&FcPatternDestroy, "FcPatternDestroy" );
bindFunc( cast( void** )&FcObjectSetDestroy, "FcObjectSetDestroy" );
bindFunc( cast( void** )&FcPatternGetString, "FcPatternGetString" );
bindFunc( cast( void** )&FcPatternGetInteger, "FcPatternGetInteger" );
bindFunc( cast( void** )&FcPatternGetBool, "FcPatternGetBool" );
bindFunc( cast( void** )&FcFontSetDestroy, "FcFontSetDestroy" );
}
@nogc nothrow:
void unloadFC()
{
if(lib != invalidHandle) {
lib.unload();
}
}
__gshared DerelictFCLoader DerelictFC;
shared static this() {
DerelictFC = new DerelictFCLoader();
FCSupport loadedFCVersion() { return loadedVersion; }
bool isFCLoaded()
{
return lib != invalidHandle;
}
FCSupport loadFC()
{
// #1778 prevents from using static arrays here :(
version(Windows) {
const(char)[][1] libNames = [ "libfontconfig-1.dll"];
}
else version(OSX) {
const(char)[][1] libNames = [
"/usr/local/lib/libfontconfig.dylib"
];
}
else version(Posix) {
const(char)[][2] libNames = [
"libfontconfig.so.1",
"libfontconfig.so"
];
}
else static assert(0, "bindbc-fc is not yet supported on this platform.");
FCSupport ret;
foreach(name; libNames) {
ret = loadFC(name.ptr);
if(ret != FCSupport.noLibrary) break;
}
return ret;
}
FCSupport loadFC(const(char)* libName)
{
lib = load(libName);
if(lib == invalidHandle) {
return FCSupport.noLibrary;
}
auto errCount = errorCount();
loadedVersion = FCSupport.badLibrary;
lib.bindSymbol( cast( void** )&FcObjectSetBuild, "FcObjectSetBuild" );
lib.bindSymbol( cast( void** )&FcPatternCreate, "FcPatternCreate" );
lib.bindSymbol( cast( void** )&FcPatternAddBool, "FcPatternAddBool" );
lib.bindSymbol( cast( void** )&FcFontList, "FcFontList" );
lib.bindSymbol( cast( void** )&FcPatternDestroy, "FcPatternDestroy" );
lib.bindSymbol( cast( void** )&FcObjectSetDestroy, "FcObjectSetDestroy" );
lib.bindSymbol( cast( void** )&FcPatternGetString, "FcPatternGetString" );
lib.bindSymbol( cast( void** )&FcPatternGetInteger, "FcPatternGetInteger" );
lib.bindSymbol( cast( void** )&FcPatternGetBool, "FcPatternGetBool" );
lib.bindSymbol( cast( void** )&FcFontSetDestroy, "FcFontSetDestroy" );
if(errorCount() != errCount) return FCSupport.badLibrary;
else loadedVersion = FCSupport.fc100;
return loadedVersion;
}

44
dub.json
View File

@ -30,12 +30,9 @@
"excludedSourceFiles-windows": ["3rdparty/fontconfig/*"],
"dependencies": {
"bindbc-opengl": "~>1.0.0",
"inilike": "~>1.2.1"
},
"versions": ["GL_AllowDeprecated", "GL_30"],
"subPackages": [
"./examples/helloworld/",
"./examples/example1/",
@ -52,16 +49,17 @@
"configurations": [
{
"name": "default",
"versions": ["USE_OPENGL", "EmbedStandardResources"],
"versions-posix": ["USE_SDL", "USE_FREETYPE"],
"versions": ["USE_OPENGL", "EmbedStandardResources", "GL_32"],
"versions-posix": ["USE_SDL", "USE_FREETYPE", "SDL_204"],
"versions-windows": ["Unicode"],
"libs-windows": ["opengl32"],
"dependencies": {
"derelict-ft": "~>2.0.0-beta.5",
"icontheme": "~>1.2.3"
"bindbc-opengl": "~>1.0.0",
"bindbc-freetype": "~>1.0.0"
},
"dependencies-posix": {
"derelict-sdl2": "~>3.0.0-beta.8"
"bindbc-sdl": "~>1.0.0",
"icontheme": "~>1.2.3"
},
"copyFiles-windows-x86_64": [
"libs/windows/x86_64/libfreetype-6.dll"
@ -73,6 +71,7 @@
{
"name": "console",
"versions": ["USE_CONSOLE", "EmbedStandardResources"],
"libs-windows": ["user32"],
"excludedSourceFiles": ["3rdparty/*GL*", "3rdparty/android", "3rdparty/dimage", "3rdparty/fontconfig/*", "3rdparty/icontheme", "3rdparty/jni.d"]
},
{
@ -80,8 +79,8 @@
"versions": ["USE_EXTERNAL"],
"libs-windows": ["opengl32"],
"dependencies": {
"derelict-ft": "~>2.0.0-beta.5",
"icontheme": "~>1.2.3"
"bindbc-opengl": "~>1.0.0",
"bindbc-freetype": "~>1.0.0"
}
},
{
@ -91,18 +90,21 @@
"versions-windows": ["Unicode" ,"NO_OPENGL"],
"libs-windows": ["opengl32"],
"dependencies-posix": {
"derelict-sdl2": "~>3.0.0-beta.8",
"derelict-ft": "~>2.0.0-beta.5",
"icontheme": "~>1.2.3"
"bindbc-opengl": "~>1.0.0",
"bindbc-freetype": "~>1.0.0",
"bindbc-sdl": "~>1.0.0"
}
},
{
"name": "sdl",
"versions": ["USE_SDL", "USE_OPENGL", "USE_FREETYPE", "EmbedStandardResources"],
"versions": ["USE_SDL", "USE_OPENGL", "USE_FREETYPE", "EmbedStandardResources", "GL_32", "SDL_204"],
"versions-windows": ["Unicode"],
"dependencies": {
"derelict-ft": "~>2.0.0-beta.5",
"derelict-sdl2": "~>3.0.0-beta.8",
"bindbc-opengl": "~>1.0.0",
"bindbc-freetype": "~>1.0.0",
"bindbc-sdl": "~>1.0.0"
},
"dependencies-posix": {
"icontheme": "~>1.2.3"
},
"copyFiles-windows-x86_64": [
@ -116,20 +118,22 @@
},
{
"name": "x11",
"versions": ["USE_X11", "USE_FREETYPE", "EmbedStandardResources"],
"versions": ["USE_X11", "USE_FREETYPE", "EmbedStandardResources", "GL_32"],
"versions-windows": ["Unicode"],
"dependencies": {
"derelict-ft": "~>2.0.0-beta.5",
"bindbc-opengl": "~>1.0.0",
"bindbc-freetype": "~>1.0.0",
"x11": "~>1.0.21",
"icontheme": "~>1.2.3"
}
},
{
"name": "sfml",
"versions": ["USE_DSFML", "USE_OPENGL", "USE_FREETYPE", "EmbedStandardResources"],
"versions": ["USE_DSFML", "USE_OPENGL", "USE_FREETYPE", "EmbedStandardResources", "GL_32"],
"versions-windows": ["Unicode"],
"dependencies": {
"derelict-ft": "~>2.0.0-beta.4",
"bindbc-opengl": "~>1.0.0",
"bindbc-freetype": "~>1.0.0",
"dsfml": "~>2.1.0",
"icontheme": "~>1.2.3"
},

2
examples/d3d/src/d3d.d
View File

@ -13,7 +13,7 @@ import dlangui.graphics.scene.objimport;
import dlangui.graphics.scene.fbximport;
import dlangui.graphics.glsupport;
import dlangui.graphics.gldrawbuf;
import derelict.opengl.gl;
import bindbc.opengl;
mixin APP_ENTRY_POINT;

2
examples/dminer/dub.json
View File

@ -11,6 +11,8 @@
"targetName": "dminer",
"targetType": "executable",
"sourceFiles-windows-x86": ["$PACKAGE_DIR/src/win_app.def"],
"versions": ["EmbedStandardResources"],
"dependencies": {

3
examples/example1/src/example1.d
View File

@ -1283,8 +1283,7 @@ void main()
static if (ENABLE_OPENGL) {
import derelict.opengl; //3.gl3;
//import derelict.opengl3.gl;
import bindbc.opengl;
class MyOpenglWidget : VerticalLayout {
this() {

2
examples/opengl/dub.json
View File

@ -11,7 +11,7 @@
"stringImportPaths": ["views", "views/res", "views/res/i18n", "views/res/mdpi"],
"versions": ["EmbedStandardResources"],
"versions": ["EmbedStandardResources", "GL_AllowDeprecated"],
"dependencies": {
"dlangui": {"path": "../../"}

3
examples/opengl/src/openglexample.d
View File

@ -33,6 +33,7 @@ extern (C) int UIAppMain(string[] args) {
static if (ENABLE_OPENGL):
import bindbc.opengl;
import dlangui.graphics.glsupport;
import dlangui.graphics.gldrawbuf;
@ -134,7 +135,7 @@ class MyOpenglWidget : VerticalLayout {
return;
}
bool canUseOldApi = !!glLightfv;
bool canUseNewApi = !glSupport.legacyMode;
bool canUseNewApi = true;
if (_exampleIndex == 0 || !canUseOldApi)
drawUsingNewAPI(windowRect, rc);
else if (_exampleIndex == 1 || !canUseNewApi)

2
src/dlangui/core/editable.d
View File

@ -24,7 +24,7 @@ import dlangui.core.linestream;
import dlangui.core.streams;
import std.algorithm;
import std.conv : to;
import std.uni;
static import std.uni;
// uncomment FileFormats debug symbol to dump file formats for loaded/saved files.
//debug = FileFormats;

58
src/dlangui/graphics/ftfonts.d
View File

@ -14,8 +14,7 @@ static if (ENABLE_FREETYPE):
import dlangui.graphics.fonts;
import derelict.freetype.ft;
import derelict.util.exception;
import bindbc.freetype;
import dlangui.core.logger;
import dlangui.core.collections;
import std.algorithm;
@ -23,6 +22,8 @@ import std.file;
import std.string;
import std.utf;
import loader = bindbc.loader.sharedlib;
__gshared int[string] STD_FONT_FACES;
int stdFontFacePriority(string face) {
@ -471,17 +472,27 @@ class FreeTypeFont : Font {
@property override bool isNull() { return _files.length == 0; }
}
private derelict.util.exception.ShouldThrow missingSymFunc( string symName ) {
private void ftCheckMissingSymFunc(const(loader.ErrorInfo)[] errors) {
import std.algorithm : equal;
static import derelict.util.exception;
foreach(s; ["FT_New_Face", "FT_Attach_File", "FT_Set_Pixel_Sizes",
immutable names = ["FT_New_Face", "FT_Attach_File", "FT_Set_Pixel_Sizes",
"FT_Get_Char_Index", "FT_Load_Glyph", "FT_Done_Face",
"FT_Init_FreeType", "FT_Done_FreeType", "FT_Get_Kerning"]) {
if (symName.equal(s)) // Symbol is used
return derelict.util.exception.ShouldThrow.Yes;
"FT_Init_FreeType", "FT_Done_FreeType", "FT_Get_Kerning"];
foreach(info; errors)
{
import std.array;
import std.algorithm;
import std.exception;
import core.stdc.string;
// NOTE: this has crappy complexity as it was just updated as is
// it also does not checks if the symbol was actually loaded
auto errMsg = cast(string) info.message[0 .. info.message.strlen];
bool found = names
.filter!(s => s.canFind(errMsg))
.array()
.length > 0;
enforce(!found, { return errMsg.idup; });
}
// Don't throw for unused symbol
return derelict.util.exception.ShouldThrow.No;
}
/// FreeType based font manager.
@ -576,22 +587,15 @@ class FreeTypeFontManager : FontManager {
this() {
// load dynaic library
try {
Log.v("DerelictFT: Loading FreeType library");
if (!DerelictFT) {
Log.w("DerelictFT is null. Compiler bug? Applying workaround to fix it.");
version(Android) {
//DerelictFT = new DerelictFTLoader("libft2.so");
DerelictFT = new DerelictFTLoader;
} else {
DerelictFT = new DerelictFTLoader;
}
}
DerelictFT.missingSymbolCallback = &missingSymFunc;
Log.v("DerelictFT: Missing symbols callback is registered");
DerelictFT.load();
Log.v("DerelictFT: Loaded");
import std.exception;
import std.format;
Log.v("bindbc-freetype: Loading FreeType library");
auto ftVer = loadFreeType();
enforce(ftVer != FTSupport.badLibrary && ftVer != FTSupport.noLibrary, format!"bindbc-freetype unable to find suitable library, %s minimum required"(ftSupport));
ftCheckMissingSymFunc(loader.errors);
Log.v("bindbc-freetype: Loaded");
} catch (Exception e) {
Log.e("Derelict: cannot load freetype shared library: ", e.msg);
Log.e("bindbc-freetype: cannot load freetype shared library: ", e.msg);
throw new Exception("Cannot load freetype library");
}
Log.v("Initializing FreeType library");
@ -725,9 +729,11 @@ version(Windows) {
bool registerFontConfigFonts(FreeTypeFontManager fontMan) {
import fontconfig;
import std.exception;
try {
DerelictFC.load();
auto fcVer = loadFC();
enforce(fcVer != FCSupport.badLibrary && fcVer != FCSupport.noLibrary);
} catch (Exception e) {
Log.w("Cannot load FontConfig shared library");
return false;

106
src/dlangui/graphics/glsupport.d
View File

@ -41,14 +41,40 @@ version (Android) {
static if (SUPPORT_LEGACY_OPENGL) {
public import GLES.gl : glEnableClientState, glLightfv, glColor4f, GL_ALPHA_TEST, GL_VERTEX_ARRAY,
GL_COLOR_ARRAY, glVertexPointer, glColorPointer, glDisableClientState,
GL_TEXTURE_COORD_ARRAY, glTexCoordPointer, glColorPointer, glMatrixMode,
glLoadMatrixf, glLoadIdentity, GL_PROJECTION, GL_MODELVIEW;
}
GL_COLOR_ARRAY, glVertexPointer, glColorPointer, glDisableClientState,
GL_TEXTURE_COORD_ARRAY, glTexCoordPointer, glColorPointer, glMatrixMode,
glLoadMatrixf, glLoadIdentity, GL_PROJECTION, GL_MODELVIEW;
}
} else {
enum SUPPORT_LEGACY_OPENGL = false; //true;
public import bindbc.opengl;
public import bindbc.opengl.bind.arb.core_30;
import loader = bindbc.loader.sharedlib;
private void gl3CheckMissingSymFunc(const(loader.ErrorInfo)[] errors)
{
import std.algorithm : equal;
immutable names = ["glGetError", "glShaderSource", "glCompileShader",
"glGetShaderiv", "glGetShaderInfoLog", "glGetString",
"glCreateProgram", "glUseProgram", "glDeleteProgram",
"glDeleteShader", "glEnable", "glDisable", "glBlendFunc",
"glUniformMatrix4fv", "glGetAttribLocation", "glGetUniformLocation",
"glGenVertexArrays", "glBindVertexArray", "glBufferData",
"glBindBuffer", "glBufferSubData"];
foreach(info; errors)
{
import std.array;
import std.algorithm;
import std.exception;
import core.stdc.string;
// NOTE: this has crappy complexity as it was just updated as is
// it also does not checks if the symbol was actually loaded
auto errMsg = cast(string) info.message[0 .. info.message.strlen];
bool found = names.any!(s => s.indexOf(errMsg) != -1);
enforce(!found, { return errMsg.idup; });
}
}
import dlangui.graphics.scene.mesh;
@ -639,19 +665,44 @@ __gshared bool glNoContext;
/// initialize OpenGL support helper (call when current OpenGL context is initialized)
bool initGLSupport(bool legacy = false) {
import dlangui.platforms.common.platform : setOpenglEnabled;
import loader = bindbc.loader.sharedlib;
if (_glSupport && _glSupport.valid)
return true;
version(Android) {
Log.d("initGLSupport");
} else {
auto support = loadOpenGL();
if(support < bindbc.opengl.GLSupport.gl11) // No context! Error!
{
Log.e("OpenGL wasn't loaded successfully");
static bool BINDBC_GL3_RELOADED;
static bool gl3ReloadedOk;
static bool glReloadedOk;
if (!BINDBC_GL3_RELOADED) {
BINDBC_GL3_RELOADED = true;
try {
Log.v("Reloading bindbc-opengl");
import bindbc.opengl;
loadOpenGL();
gl3CheckMissingSymFunc(loader.errors);
gl3ReloadedOk = true;
} catch (Exception e) {
Log.e("bindbc-opengl exception while reloading opengl", e);
}
try {
Log.v("Reloading bindbc-opengl");
import bindbc.opengl;
loadOpenGL();
gl3CheckMissingSymFunc(loader.errors);
glReloadedOk = true;
} catch (Exception e) {
Log.e("bindbc-opengl exception while reloading opengl", e);
}
}
if (!gl3ReloadedOk && !glReloadedOk) {
Log.e("bindbc-opengl reloaded unsuccessfully");
return false;
}
legacy = false;
if (!gl3ReloadedOk)
legacy = true;
else if (!glReloadedOk)
legacy = false;
}
if (!_glSupport) { // TODO_GRIM: Legacy looks very broken to me.
Log.d("glSupport not initialized: trying to create");
@ -701,14 +752,14 @@ final class GLSupport {
this(bool legacy = false) {
_queue = new OpenGLQueue;
version (Android) {
version (Android) {
Log.d("creating GLSupport");
} else {
if (legacy /*&& !glLightfv*/) {
Log.w("GLSupport legacy API is not supported");
legacy = false;
}
}
} else {
if (legacy /*&& !glLightfv*/) {
Log.w("GLSupport legacy API is not supported");
legacy = false;
}
}
_legacyMode = legacy;
if (!_legacyMode)
_shadersAreInitialized = initShaders();
@ -790,7 +841,7 @@ final class GLSupport {
/// This function is needed to draw custom OpenGL scene correctly (especially on legacy API)
private void resetBindings() {
import std.traits : isFunction;
import std.traits : isFunction;
if (isFunction!glUseProgram)
GLProgram.unbind();
if (isFunction!glBindVertexArray)
@ -1172,15 +1223,15 @@ class GLVertexBuffer : VertexBuffer {
protected GLuint _vao;
this() {
version (Android) {
checkgl!glGenBuffers(1, &_vertexBuffer);
checkgl!glGenBuffers(1, &_indexBuffer);
checkgl!glGenVertexArrays(1, &_vao);
} else {
assertgl!glGenBuffers(1, &_vertexBuffer);
assertgl!glGenBuffers(1, &_indexBuffer);
assertgl!glGenVertexArrays(1, &_vao);
}
version (Android) {
checkgl!glGenBuffers(1, &_vertexBuffer);
checkgl!glGenBuffers(1, &_indexBuffer);
checkgl!glGenVertexArrays(1, &_vao);
} else {
assertgl!glGenBuffers(1, &_vertexBuffer);
assertgl!glGenBuffers(1, &_indexBuffer);
assertgl!glGenVertexArrays(1, &_vao);
}
}
~this() {
@ -1618,3 +1669,4 @@ private final class OpenGLQueue {
_indices ~= cast(int[])indices;
};
}
}

32
src/dlangui/platforms/sdl/sdlapp.d
View File

@ -39,18 +39,18 @@ import dlangui.widgets.styles;
import dlangui.widgets.widget;
import dlangui.platforms.common.platform;
import derelict.sdl2.sdl;
import bindbc.sdl;
static if (ENABLE_OPENGL) {
import bindbc.opengl;
import dlangui.graphics.gldrawbuf;
import dlangui.graphics.glsupport;
import loader = bindbc.loader.sharedlib;
}
private derelict.util.exception.ShouldThrow missingSymFunc( string symName ) {
private void sdlCheckMissingSymFunc(const(loader.ErrorInfo)[] errors) {
import std.algorithm : equal;
static import derelict.util.exception;
foreach(s; ["SDL_DestroyRenderer", "SDL_GL_DeleteContext", "SDL_DestroyWindow", "SDL_PushEvent",
immutable names = ["SDL_DestroyRenderer", "SDL_GL_DeleteContext", "SDL_DestroyWindow", "SDL_PushEvent",
"SDL_GL_SetAttribute", "SDL_GL_CreateContext", "SDL_GetError",
"SDL_CreateWindow", "SDL_CreateRenderer", "SDL_GetWindowSize",
"SDL_GL_GetDrawableSize", "SDL_GetWindowID", "SDL_SetWindowSize",
@ -63,12 +63,19 @@ private derelict.util.exception.ShouldThrow missingSymFunc( string symName ) {
"SDL_RemoveTimer", "SDL_RemoveTimer", "SDL_PushEvent",
"SDL_RegisterEvents", "SDL_WaitEvent", "SDL_StartTextInput",
"SDL_Quit", "SDL_HasClipboardText", "SDL_GetClipboardText",
"SDL_free", "SDL_SetClipboardText", "SDL_Init", "SDL_GetNumVideoDisplays"]) {//"SDL_GetDisplayDPI"
if (symName.equal(s)) // Symbol is used
return derelict.util.exception.ShouldThrow.Yes;
"SDL_free", "SDL_SetClipboardText", "SDL_Init", "SDL_GetNumVideoDisplays"]; //"SDL_GetDisplayDPI"
foreach(info; errors)
{
import std.array;
import std.algorithm;
import std.exception;
import core.stdc.string;
// NOTE: this has crappy complexity as it was just updated as is
// it also does not checks if the symbol was actually loaded
auto errMsg = cast(string) info.message[0 .. info.message.strlen];
bool found = names.any!(s => s.indexOf(errMsg) != -1);
enforce(!found, { return errMsg.idup; });
}
// Don't throw for unused symbol
return derelict.util.exception.ShouldThrow.No;
}
private __gshared SDL_EventType USER_EVENT_ID;
@ -1638,9 +1645,12 @@ int sdlmain(string[] args) {
}
try {
DerelictSDL2.missingSymbolCallback = &missingSymFunc;
import std.exception;
//DerelictSDL2.missingSymbolCallback = &missingSymFunc;
// Load the SDL 2 library.
DerelictSDL2.load();
auto sdlVer = loadSDL();
enforce(sdlVer != SDLSupport.noLibrary && sdlVer != SDLSupport.badLibrary, "bindbc-sdl unable to find SDL2 library");
sdlCheckMissingSymFunc(loader.errors);
} catch (Exception e) {
Log.e("Cannot load SDL2 library", e);
return 1;

36
src/dlangui/platforms/windows/winapp.d
View File

@ -151,7 +151,7 @@ static if (ENABLE_OPENGL) {
return hPalette;
}
private __gshared bool DERELICT_GL3_RELOADED = false;
private __gshared bool BINDBC_GL3_RELOADED = false; // is this even used?
}
const uint CUSTOM_MESSAGE_ID = WM_USER + 1;
@ -323,6 +323,8 @@ class Win32Window : Window {
EndPaint(_hwnd, &ps);
import bindbc.opengl; //3.gl3;
import bindbc.opengl; //3.wgl;
import dlangui.graphics.gldrawbuf;
//Log.d("onPaint() start drawing opengl viewport: ", _dx, "x", _dy);
//PAINTSTRUCT ps;
@ -1306,6 +1308,38 @@ string[] splitCmdLine(string line) {
private __gshared Win32Platform w32platform;
static if (ENABLE_OPENGL) {
import bindbc.opengl;
import bindbc.opengl.config : GLSupportVersion = GLSupport;
void initOpenGL() {
try {
Log.d("Loading bindbc-opengl");
auto glVer = loadOpenGL();
if(glVer < GLSupportVersion.gl32) {
import std.format : format;
throw new Exception(format!"OpenGL 3.2 or higher is required, got: %s"(glVer));
}
Log.d("bindbc-opengl - loaded");
//
//// just to check OpenGL context
//Log.i("Trying to setup OpenGL context");
//Win32Window tmpWindow = new Win32Window(w32platform, ""d, null, 0);
//destroy(tmpWindow);
//if (openglEnabled)
// Log.i("OpenGL support is enabled");
//else
// Log.w("OpenGL support is disabled");
//// process messages
//platform.enterMessageLoop();
} catch (Exception e) {
Log.e("Exception while trying to init OpenGL", e);
setOpenglEnabled(false);
}
}
}
int myWinMain(void* hInstance, void* hPrevInstance, char* lpCmdLine, int iCmdShow)
{
initLogs();