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

SDL support for glad

Browse source
This commit is contained in:
Jeff Hutchinson 2016-09-11 21:59:48 -04:00
parent 8fc96e8744
commit cfb3ad598f
2 changed files with 5 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -106,6 +106,10 @@ void GFXGLDevice::enumerateAdapters( Vector<GFXAdapter*> &adapterList )
AssertFatal(0, err ); AssertFatal(0, err );
} }
// Init GL
loadGLCore();
loadGLExtensions(tempContext);
//check minimun Opengl 3.2 //check minimun Opengl 3.2
int major, minor; int major, minor;
glGetIntegerv(GL_MAJOR_VERSION, &major); glGetIntegerv(GL_MAJOR_VERSION, &major);
@ -115,8 +119,6 @@ void GFXGLDevice::enumerateAdapters( Vector<GFXAdapter*> &adapterList )
return; return;
} }
loadGLCore();
GFXAdapter *toAdd = new GFXAdapter; GFXAdapter *toAdd = new GFXAdapter;
toAdd->mIndex = 0; toAdd->mIndex = 0;
@ -163,7 +165,7 @@ void GFXGLDevice::init( const GFXVideoMode &mode, PlatformWindow *window )
PlatformGL::MakeCurrentGL( x11Window, mContext ); PlatformGL::MakeCurrentGL( x11Window, mContext );
loadGLCore(); loadGLCore();
loadGLExtensions(0); loadGLExtensions(mContext);
// It is very important that extensions be loaded before we call initGLState() // It is very important that extensions be loaded before we call initGLState()
initGLState(); initGLState();

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

@ -68,11 +68,6 @@ namespace PlatformGL
Con::printf( err ); Con::printf( err );
AssertFatal(0, err ); AssertFatal(0, err );
} }
#ifdef TORQUE_OS_WIN
// JTH: Update the internals of epoxy on windows.
epoxy_handle_external_wglMakeCurrent();
#endif
} }
void setVSync(const int i) void setVSync(const int i)