TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-15 16:44:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix running on Linux / Intel Mesa drivers

Browse source 
* Explicitly request a GL 3.2 context
* Enable 'experimental' extensions on glew (This appears necessary to get glew to work with explictly set GL versions)
This commit is contained in:
Hein-Pieter van Braam 2015-07-07 21:11:26 +02:00
parent 63ae781d24
commit 5d91cf90b3
3 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Engine/source/gfx/gl/sdl/gfxGLDevice.sdl.cpp
View file

@ -83,6 +83,10 @@ void GFXGLDevice::enumerateAdapters( Vector<GFXAdapter*> &adapterList )
); );
SDL_ClearError(); SDL_ClearError();
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 3);
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 2);
SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_CORE);
SDL_GLContext tempContext = SDL_GL_CreateContext( tempWindow ); SDL_GLContext tempContext = SDL_GL_CreateContext( tempWindow );
if( !tempContext ) if( !tempContext )
{ {

1
Engine/source/gfx/gl/tGL/tGL.cpp
View file

@ -29,6 +29,7 @@ namespace GL
{ {
void gglPerformBinds() void gglPerformBinds()
{ {
glewExperimental = GL_TRUE;
GLenum err = glewInit(); GLenum err = glewInit();
AssertFatal(GLEW_OK == err, avar("Error: %s\n", glewGetErrorString(err)) ); AssertFatal(GLEW_OK == err, avar("Error: %s\n", glewGetErrorString(err)) );
} }

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

@ -13,18 +13,16 @@ namespace PlatformGL
return; return;
inited = true; inited = true;
const U32 majorOGL = 4; const U32 majorOGL = 3;
const U32 minorOGL = 2; const U32 minorOGL = 2;
U32 debugFlag = 0; U32 debugFlag = 0;
#ifdef TORQUE_DEBUG #ifdef TORQUE_DEBUG
debugFlag |= SDL_GL_CONTEXT_DEBUG_FLAG; debugFlag |= SDL_GL_CONTEXT_DEBUG_FLAG;
#endif #endif
#if 0 // cause problem with glew, no extension load
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, majorOGL); SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, majorOGL);
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, minorOGL); 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_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_CORE);
#endif
SDL_GL_SetAttribute(SDL_GL_CONTEXT_FLAGS, debugFlag); SDL_GL_SetAttribute(SDL_GL_CONTEXT_FLAGS, debugFlag);
SDL_ClearError(); SDL_ClearError();