kiss-lang/lime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Enable ANGLE by default (thanks @larsiusprime)

Browse Source
This commit is contained in:
Joshua Granick
2015-12-01 18:16:35 -08:00
parent 189f29b5d5
commit 8ef9b28939
6 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
dependencies/angle/d3dcompiler_47.dll vendored Normal file
View File

Binary file not shown.

BIN
dependencies/angle/libegl.dll vendored Normal file
View File

Binary file not shown.

BIN
dependencies/angle/libglesv2.dll vendored Normal file
View File

Binary file not shown.

3
include.xml
View File

@@ -58,6 +58,9 @@
<dependency name="extension-api" path="dependencies/extension-api" if="android" />
<dependency path="dependencies/webgl-debug.js" if="html5 debug" />
<dependency path="dependencies/stats.min.js" if="html5 stats" />
<dependency path="dependencies/angle/d3dcompiler_47.dll" if="windows" unless="static_link" />
<dependency path="dependencies/angle/libegl.dll" if="windows" unless="static_link" />
<dependency path="dependencies/angle/libglesv2.dll" if="windows" unless="static_link" />
<haxedef name="native-trace" if="flash" unless="haxe-trace || haxetrace" />

1
project/Build.xml
View File

@@ -24,6 +24,7 @@
<set name="LIME_PIXMAN" value="1" />
<set name="LIME_PNG" value="1" />
<set name="LIME_SDL" value="1" />
<set name="LIME_SDL_ANGLE" value="1" if="windows" unless="static_link" />
<set name="LIME_VORBIS" value="1" />
<set name="LIME_ZLIB" value="1" />

14
project/src/backend/sdl/SDLWindow.cpp
View File

@@ -22,6 +22,20 @@ namespace lime {
if (flags & WINDOW_FLAG_RESIZABLE) sdlFlags |= SDL_WINDOW_RESIZABLE;
if (flags & WINDOW_FLAG_BORDERLESS) sdlFlags |= SDL_WINDOW_BORDERLESS;
#if defined (HX_WINDOWS) && defined (NATIVE_TOOLKIT_SDL_ANGLE)
OSVERSIONINFOEXW osvi = { sizeof (osvi), 0, 0, 0, 0, {0}, 0, 0 };
DWORDLONG const dwlConditionMask = VerSetConditionMask (VerSetConditionMask (VerSetConditionMask (0, VER_MAJORVERSION, VER_GREATER_EQUAL), VER_MINORVERSION, VER_GREATER_EQUAL), VER_SERVICEPACKMAJOR, VER_GREATER_EQUAL);
osvi.dwMajorVersion = HIBYTE (_WIN32_WINNT_VISTA);
osvi.dwMinorVersion = LOBYTE (_WIN32_WINNT_VISTA);
osvi.wServicePackMajor = 0;
if (VerifyVersionInfoW (&osvi, VER_MAJORVERSION | VER_MINORVERSION | VER_SERVICEPACKMAJOR, dwlConditionMask) == FALSE) {
flags &= ~WINDOW_FLAG_HARDWARE;
}
#endif
if (flags & WINDOW_FLAG_HARDWARE) {
sdlFlags |= SDL_WINDOW_OPENGL;