TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-13 03:33:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix merge conflict and add check for unix and not apple for glx

Browse source 
Merge branch 'development-gg' into gladdev

# Conflicts:
#	Tools/CMake/libraries/glad.cmake
This commit is contained in:
Jeff Hutchinson 2016-11-02 21:55:24 -04:00
commit 0296e6d3fd
728 changed files with 83679 additions and 66879 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Engine/source/platformSDL/sdlPlatformGL.cpp
View file

@ -11,12 +11,6 @@ namespace PlatformGL
void init()
{
static bool inited = false;
if(inited)
return;
inited = true;
const U32 majorOGL = 3;
const U32 minorOGL = 2;
U32 debugFlag = 0;
@ -28,6 +22,9 @@ namespace PlatformGL
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, minorOGL);
SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_CORE);
SDL_GL_SetAttribute(SDL_GL_CONTEXT_FLAGS, debugFlag);
#ifdef TORQUE_GL_SOFTWARE
SDL_GL_SetAttribute(SDL_GL_ACCELERATED_VISUAL, 0);
#endif
SDL_ClearError();
}