- Added external context managers with support for WGL and GLX.(this feature...

- Added external context managers with support for WGL and GLX.(this feature was available in ogl-es branch before)

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@5199 dfc29bdd-3216-0410-991c-e03cc46cb475

include/IContextManager.h

+// Copyright (C) 2013-2015 Patryk Nadrowski
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#ifndef __IRR_I_CONTEXT_MANAGER_H_INCLUDED__
+#define __IRR_I_CONTEXT_MANAGER_H_INCLUDED__
+
+#include "SExposedVideoData.h"
+#include "SIrrCreationParameters.h"
+
+namespace irr
+{
+namespace video
+{
+	class IContextManager : public virtual IReferenceCounted
+	{
+	public:
+        //! Initialize manager with device creation parameters and device window (passed as exposed video data)
+        virtual bool initialize(const SIrrlichtCreationParameters& params, const SExposedVideoData& data) =0;
+
+        //! Terminate manager, any cleanup that is left over. Manager needs a new initialize to be usable again
+        virtual void terminate() =0;
+
+        //! Create surface based on current window set
+        virtual bool generateSurface() =0;
+
+        //! Destroy current surface
+        virtual void destroySurface() =0;
+
+        //! Create context based on current surface
+        virtual bool generateContext() =0;
+
+        //! Destroy current context
+        virtual void destroyContext() =0;
+
+		//! Get current context
+		virtual const SExposedVideoData& getContext() const =0;
+
+		//! Change render context, disable old and activate new defined by videoData
+		virtual bool activateContext(const SExposedVideoData& videoData) =0;
+
+        //! Swap buffers.
+        virtual bool swapBuffers() =0;
+	};
+
+} // end namespace video
+} // end namespace irr
+
+
+#endif

include/IrrCompileConfig.h

@@ -172,6 +172,12 @@ define out. */
 #ifdef NO_IRR_COMPILE_WITH_OPENGL_
 #undef _IRR_COMPILE_WITH_OPENGL_
 #endif
+#if defined(_IRR_COMPILE_WITH_OPENGL_) && defined(_IRR_COMPILE_WITH_WINDOWS_DEVICE_) && !defined(NO_IRR_COMPILE_WITH_WGL_MANAGER_)
+#define _IRR_COMPILE_WITH_WGL_MANAGER_
+#endif
+#if defined(_IRR_COMPILE_WITH_OPENGL_) && defined(_IRR_COMPILE_WITH_X11_DEVICE_) && !defined(NO_IRR_COMPILE_WITH_GLX_MANAGER_)
+#define _IRR_COMPILE_WITH_GLX_MANAGER_
+#endif
 
 //! Define _IRR_COMPILE_WITH_SOFTWARE_ to compile the Irrlicht engine with software driver
 /** If you do not need the software driver, or want to use Burning's Video instead,

include/IrrlichtDevice.h

@@ -34,6 +34,10 @@ namespace irr
 		class ISceneManager;
 	} // end namespace scene
 
+	namespace video {
+		class IContextManager;
+	} // end namespace video
+
 	//! The Irrlicht device. You can create it with createDevice() or createDeviceEx().
 	/** This is the most important class of the Irrlicht Engine. You can
 	access everything in the engine if you have a pointer to an instance of
@@ -115,6 +119,9 @@ namespace irr
 		by the gfx adapter. */
 		virtual video::IVideoModeList* getVideoModeList() = 0;
 
+		//! Get context manager
+		virtual video::IContextManager* getContextManager() = 0;
+
 		//! Provides access to the operation system operator object.
 		/** The OS operator provides methods for
 		getting system specific informations and doing system

include/irrlicht.h

@@ -64,6 +64,7 @@
 #include "IBillboardTextSceneNode.h"
 #include "IBoneSceneNode.h"
 #include "ICameraSceneNode.h"
+#include "IContextManager.h"
 #include "ICursorControl.h"
 #include "IDummyTransformationSceneNode.h"
 #include "IDynamicMeshBuffer.h"

source/Irrlicht/CGLXManager.h

+// Copyright (C) 2013 Christian Stehno
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in Irrlicht.h
+
+#ifndef __C_GLX_MANAGER_H_INCLUDED__
+#define __C_GLX_MANAGER_H_INCLUDED__
+
+#include "IrrCompileConfig.h"
+
+#ifdef _IRR_COMPILE_WITH_GLX_MANAGER_
+
+#include "SIrrCreationParameters.h"
+#include "SExposedVideoData.h"
+#include "IContextManager.h"
+#include "SColor.h"
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+
+// we can't include glx.h here, because gl.h has incompatible types with ogl es headers and it
+// cause redefinition errors, thats why we use ugly trick with void* types and casts.
+
+namespace irr
+{
+namespace video
+{
+    // GLX manager.
+    class CGLXManager : public IContextManager
+    {
+    public:
+        //! Constructor.
+        CGLXManager(const SIrrlichtCreationParameters& params, const SExposedVideoData& videodata, int screennr);
+
+        //! Destructor
+        ~CGLXManager();
+
+        // Initialize
+        bool initialize(const SIrrlichtCreationParameters& params, const SExposedVideoData& data);
+
+        // Terminate
+        void terminate();
+
+        // Create surface.
+        bool generateSurface();
+
+        // Destroy surface.
+        void destroySurface();
+
+        // Create context.
+        bool generateContext();
+
+        // Destroy context.
+        void destroyContext();
+
+        //! Get current context
+        const SExposedVideoData& getContext() const;
+
+        //! Change render context, disable old and activate new defined by videoData
+        bool activateContext(const SExposedVideoData& videoData);
+
+        // Swap buffers.
+        bool swapBuffers();
+
+        XVisualInfo* getVisual() const {return VisualInfo;} // return XVisualInfo
+
+    private:
+        SIrrlichtCreationParameters Params;
+        SExposedVideoData PrimaryContext;
+        SExposedVideoData CurrentContext;
+        XVisualInfo* VisualInfo;
+        void* glxFBConfig; // GLXFBConfig
+        XID GlxWin; // GLXWindow
+        ECOLOR_FORMAT ColorFormat;
+	};
+}
+}
+
+#endif
+
+#endif
+

source/Irrlicht/CIrrDeviceStub.cpp

@@ -163,6 +163,11 @@ video::IVideoModeList* CIrrDeviceStub::getVideoModeList()
 	return VideoModeList;
 }
 
+//! return the context manager
+video::IContextManager* CIrrDeviceStub::getContextManager()
+{
+	return ContextManager;
+}
 
 //! checks version of sdk and prints warning if there might be a problem
 bool CIrrDeviceStub::checkVersion(const char* version)

source/Irrlicht/CIrrDeviceStub.h

@@ -9,6 +9,7 @@
 #include "IImagePresenter.h"
 #include "SIrrCreationParameters.h"
 #include "CVideoModeList.h"
+#include "IContextManager.h"
 
 namespace irr
 {
@@ -76,6 +77,9 @@ namespace irr
 		//! Returns a pointer to a list with all video modes supported by the gfx adapter.
 		virtual video::IVideoModeList* getVideoModeList() _IRR_OVERRIDE_;
 
+		//! return the context manager
+		virtual video::IContextManager* getContextManager() _IRR_OVERRIDE_;
+
 		//! Returns a pointer to the ITimer object. With it the current Time can be received.
 		virtual ITimer* getTimer() _IRR_OVERRIDE_;
 
@@ -180,6 +184,7 @@ namespace irr
 		};
 		SMouseMultiClicks MouseMultiClicks;
 		video::CVideoModeList* VideoModeList;
+		video::IContextManager* ContextManager;
 		SIrrlichtCreationParameters CreationParams;
 		bool Close;
 	};

source/Irrlicht/CIrrDeviceWin32.cpp

@@ -34,19 +34,21 @@
 #endif
 #endif
 
+#if defined(_IRR_COMPILE_WITH_OPENGL_)
+#include "CWGLManager.h"
+#endif
+
 namespace irr
 {
 	namespace video
 	{
-		#ifdef _IRR_COMPILE_WITH_DIRECT3D_9_
-		IVideoDriver* createDirectX9Driver(const irr::SIrrlichtCreationParameters& params,
-			io::IFileSystem* io, HWND window);
-		#endif
-
-		#ifdef _IRR_COMPILE_WITH_OPENGL_
-		IVideoDriver* createOpenGLDriver(const irr::SIrrlichtCreationParameters& params,
-			io::IFileSystem* io, CIrrDeviceWin32* device);
-		#endif
+#ifdef _IRR_COMPILE_WITH_DIRECT3D_9_
+		IVideoDriver* createDirectX9Driver(const irr::SIrrlichtCreationParameters& params, io::IFileSystem* io, HWND window);
+#endif
+
+#ifdef _IRR_COMPILE_WITH_OPENGL_
+		IVideoDriver* createOpenGLDriver(const irr::SIrrlichtCreationParameters& params, io::IFileSystem* io, IContextManager* contextManager);
+#endif
 	}
 } // end namespace irr
 
@@ -1163,65 +1165,53 @@ void CIrrDeviceWin32::createDriver()
 	{
 	case video::DEPRECATED_EDT_DIRECT3D8_NO_LONGER_EXISTS:
 		os::Printer::log("DIRECT3D8 Driver is no longer supported in Irrlicht. Try another one.", ELL_ERROR);
-		break;
-
+		break;	
 	case video::EDT_DIRECT3D9:
-		#ifdef _IRR_COMPILE_WITH_DIRECT3D_9_
-
+#ifdef _IRR_COMPILE_WITH_DIRECT3D_9_
 		VideoDriver = video::createDirectX9Driver(CreationParams, FileSystem, HWnd);
 
 		if (!VideoDriver)
-		{
 			os::Printer::log("Could not create DIRECT3D9 Driver.", ELL_ERROR);
-		}
-		#else
+#else
 		os::Printer::log("DIRECT3D9 Driver was not compiled into this dll. Try another one.", ELL_ERROR);
-		#endif // _IRR_COMPILE_WITH_DIRECT3D_9_
-
+#endif
 		break;
-
 	case video::EDT_OPENGL:
-
-		#ifdef _IRR_COMPILE_WITH_OPENGL_
+#ifdef _IRR_COMPILE_WITH_OPENGL_
 		switchToFullScreen();
 
-		VideoDriver = video::createOpenGLDriver(CreationParams, FileSystem, this);
+		ContextManager = new video::CWGLManager();
+		ContextManager->initialize(CreationParams, video::SExposedVideoData(HWnd));
+
+		VideoDriver = video::createOpenGLDriver(CreationParams, FileSystem, ContextManager);
+
 		if (!VideoDriver)
-		{
 			os::Printer::log("Could not create OpenGL driver.", ELL_ERROR);
-		}
-		#else
+#else
 		os::Printer::log("OpenGL driver was not compiled in.", ELL_ERROR);
-		#endif
+#endif
 		break;
-
 	case video::EDT_SOFTWARE:
-
-		#ifdef _IRR_COMPILE_WITH_SOFTWARE_
+#ifdef _IRR_COMPILE_WITH_SOFTWARE_
 		switchToFullScreen();
 
 		VideoDriver = video::createSoftwareDriver(CreationParams.WindowSize, CreationParams.Fullscreen, FileSystem, this);
-		#else
+#else
 		os::Printer::log("Software driver was not compiled in.", ELL_ERROR);
-		#endif
-
+#endif
 		break;
-
 	case video::EDT_BURNINGSVIDEO:
-		#ifdef _IRR_COMPILE_WITH_BURNINGSVIDEO_
+#ifdef _IRR_COMPILE_WITH_BURNINGSVIDEO_
 		switchToFullScreen();
 
 		VideoDriver = video::createBurningVideoDriver(CreationParams, FileSystem, this);
-		#else
+#else
 		os::Printer::log("Burning's Video driver was not compiled in.", ELL_ERROR);
-		#endif
+#endif
 		break;
-
 	case video::EDT_NULL:
-		// create null driver
 		VideoDriver = video::createNullDriver(FileSystem, CreationParams.WindowSize);
 		break;
-
 	default:
 		os::Printer::log("Unable to create video driver of unknown type.", ELL_ERROR);
 		break;

source/Irrlicht/COpenGLDriver.h

@@ -29,6 +29,8 @@ namespace irr
 
 namespace video
 {
+	class IContextManager;
+
 	class COpenGLDriver : public CNullDriver, public IMaterialRendererServices, public COpenGLExtensionHandler
 	{
 		friend COpenGLCacheHandler;
@@ -43,30 +45,15 @@ namespace video
 			EOFPS_DISABLE_TO_ENABLE // switch from programmable to fixed pipeline.
 		};
 
-		#ifdef _IRR_COMPILE_WITH_WINDOWS_DEVICE_
-		COpenGLDriver(const SIrrlichtCreationParameters& params, io::IFileSystem* io, CIrrDeviceWin32* device);
-		//! inits the windows specific parts of the open gl driver
-		bool initDriver(CIrrDeviceWin32* device);
-		bool changeRenderContext(const SExposedVideoData& videoData, CIrrDeviceWin32* device);
-		#endif
-
-		#ifdef _IRR_COMPILE_WITH_X11_DEVICE_
-		COpenGLDriver(const SIrrlichtCreationParameters& params, io::IFileSystem* io, CIrrDeviceLinux* device);
-		//! inits the GLX specific parts of the open gl driver
-		bool initDriver(CIrrDeviceLinux* device);
-		bool changeRenderContext(const SExposedVideoData& videoData, CIrrDeviceLinux* device);
-		#endif
+#if defined(_IRR_COMPILE_WITH_WINDOWS_DEVICE_) || defined(_IRR_COMPILE_WITH_X11_DEVICE_) || defined(_IRR_COMPILE_WITH_OSX_DEVICE_)
+		COpenGLDriver(const SIrrlichtCreationParameters& params, io::IFileSystem* io, IContextManager* contextManager);
+#endif
 
-		#ifdef _IRR_COMPILE_WITH_SDL_DEVICE_
+#ifdef _IRR_COMPILE_WITH_SDL_DEVICE_
 		COpenGLDriver(const SIrrlichtCreationParameters& params, io::IFileSystem* io, CIrrDeviceSDL* device);
-		#endif
-
-		#ifdef _IRR_COMPILE_WITH_OSX_DEVICE_
-		COpenGLDriver(const SIrrlichtCreationParameters& params, io::IFileSystem* io, CIrrDeviceMacOSX *device);
-		#endif
+#endif
 
-		//! generic version which overloads the unimplemented versions
-		bool changeRenderContext(const SExposedVideoData& videoData, void* device) {return false;}
+		bool initDriver();
 
 		//! destructor
 		virtual ~COpenGLDriver();
@@ -510,25 +497,12 @@ namespace video
 		S3DVertex Quad2DVertices[4];
 		static const u16 Quad2DIndices[4];
 
-		#ifdef _IRR_WINDOWS_API_
-			HDC HDc; // Private GDI Device Context
-			HWND Window;
-		#ifdef _IRR_COMPILE_WITH_WINDOWS_DEVICE_
-			CIrrDeviceWin32 *Win32Device;
-		#endif
-		#endif
-		#ifdef _IRR_COMPILE_WITH_X11_DEVICE_
-			GLXDrawable Drawable;
-			Display* X11Display;
-			CIrrDeviceLinux *X11Device;
-		#endif
-		#ifdef _IRR_COMPILE_WITH_OSX_DEVICE_
-			CIrrDeviceMacOSX *OSXDevice;
-		#endif
 		#ifdef _IRR_COMPILE_WITH_SDL_DEVICE_
 			CIrrDeviceSDL *SDLDevice;
 		#endif
 
+		IContextManager* ContextManager;
+
 		E_DEVICE_TYPE DeviceType;
 	};
 

source/Irrlicht/CSoftwareDriver2.cpp

@@ -2351,7 +2351,7 @@ void CBurningVideoDriver::drawStencilShadow(bool clearStencilBuffer, video::SCol
 
 	for ( u32 y = 0; y < h; ++y )
 	{
-		dst = (tVideoSample*)RenderTargetSurface->lock() + ( y * w );
+		dst = (tVideoSample*)RenderTargetSurface->getData() + ( y * w );
 		stencil =  stencilBase + ( y * w );
 
 		for ( u32 x = 0; x < w; ++x )

source/Irrlicht/CSoftwareTexture.cpp

@@ -78,7 +78,7 @@ CSoftwareTexture::~CSoftwareTexture()
 //! lock function
 void* CSoftwareTexture::lock(E_TEXTURE_LOCK_MODE mode, u32 mipmapLevel)
 {
-	return Image->lock();
+	return Image->getData();
 }
 
 
@@ -91,8 +91,6 @@ void CSoftwareTexture::unlock()
 		os::Printer::log("Performance warning, slow unlock of non power of 2 texture.", ELL_WARNING);
 		Image->copyToScaling(Texture);
 	}
-
-	Image->unlock();
 }
 
 

source/Irrlicht/CWGLManager.h

+// Copyright (C) 2013 Christian Stehno
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in Irrlicht.h
+
+#ifndef __C_WGL_MANAGER_H_INCLUDED__
+#define __C_WGL_MANAGER_H_INCLUDED__
+
+#include "IrrCompileConfig.h"
+
+#ifdef _IRR_COMPILE_WITH_WGL_MANAGER_
+
+#include "SIrrCreationParameters.h"
+#include "SExposedVideoData.h"
+#include "IContextManager.h"
+#include "SColor.h"
+
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+
+namespace irr
+{
+namespace video
+{
+    // WGL manager.
+    class CWGLManager : public IContextManager
+    {
+    public:
+        //! Constructor.
+        CWGLManager();
+
+		//! Destructor
+		~CWGLManager();
+
+        // Initialize
+        bool initialize(const SIrrlichtCreationParameters& params, const SExposedVideoData& data);
+
+        // Terminate
+        void terminate();
+
+        // Create surface.
+        bool generateSurface();
+
+        // Destroy surface.
+        void destroySurface();
+
+        // Create context.
+        bool generateContext();
+
+        // Destroy EGL context.
+        void destroyContext();
+
+		//! Get current context
+		const SExposedVideoData& getContext() const;
+
+		//! Change render context, disable old and activate new defined by videoData
+		bool activateContext(const SExposedVideoData& videoData);
+
+        // Swap buffers.
+        bool swapBuffers();
+
+    private:
+        SIrrlichtCreationParameters Params;
+		SExposedVideoData PrimaryContext;
+        SExposedVideoData CurrentContext;
+		s32 PixelFormat;
+		PIXELFORMATDESCRIPTOR pfd;
+		ECOLOR_FORMAT ColorFormat;
+	};
+}
+}
+
+#endif
+
+#endif

source/Irrlicht/Irrlicht-gcc.cbp

@@ -445,6 +445,7 @@
 		<Unit filename="..\..\include\IBoneSceneNode.h" />
 		<Unit filename="..\..\include\ICameraSceneNode.h" />
 		<Unit filename="..\..\include\IColladaMeshWriter.h" />
+		<Unit filename="..\..\include\IContextManager.h" />
 		<Unit filename="..\..\include\ICursorControl.h" />
 		<Unit filename="..\..\include\IDummyTransformationSceneNode.h" />
 		<Unit filename="..\..\include\IDynamicMeshBuffer.h" />
@@ -671,6 +672,8 @@
 		<Unit filename="CFileList.h" />
 		<Unit filename="CFileSystem.cpp" />
 		<Unit filename="CFileSystem.h" />
+		<Unit filename="CGLXManager.cpp" />
+		<Unit filename="CGLXManager.h" />
 		<Unit filename="CGUIButton.cpp" />
 		<Unit filename="CGUIButton.h" />
 		<Unit filename="CGUICheckBox.cpp" />
@@ -988,6 +991,8 @@
 		<Unit filename="CWADReader.h" />
 		<Unit filename="CWaterSurfaceSceneNode.cpp" />
 		<Unit filename="CWaterSurfaceSceneNode.h" />
+		<Unit filename="CWGLManager.cpp" />
+		<Unit filename="CWGLManager.h" />
 		<Unit filename="CWriteFile.cpp" />
 		<Unit filename="CWriteFile.h" />
 		<Unit filename="CXMLReader.cpp" />
@@ -1010,8 +1015,6 @@
 		<Unit filename="ITriangleRenderer.h" />
 		<Unit filename="IZBuffer.h" />
 		<Unit filename="Irrlicht.cpp" />
-		<Unit filename="MacOSX\CIrrDeviceMacOSX.h" />
-		<Unit filename="MacOSX\CIrrDeviceMacOSX.mm" />
 		<Unit filename="Octree.h" />
 		<Unit filename="S2DVertex.h" />
 		<Unit filename="S4DVertex.h" />

source/Irrlicht/Irrlicht10.0.vcxproj

@@ -857,6 +857,7 @@
     <ClInclude Include="..\..\include\SIrrCreationParameters.h" />
     <ClInclude Include="..\..\include\SKeyMap.h" />
     <ClInclude Include="..\..\include\EDriverTypes.h" />
+    <ClInclude Include="..\..\include\IContextManager.h" />
     <ClInclude Include="..\..\include\IGeometryCreator.h" />
     <ClInclude Include="..\..\include\IGPUProgrammingServices.h" />
     <ClInclude Include="..\..\include\IImage.h" />
@@ -1006,6 +1007,7 @@
     <ClInclude Include="CDefaultSceneNodeAnimatorFactory.h" />
     <ClInclude Include="CDefaultSceneNodeFactory.h" />
     <ClInclude Include="CGeometryCreator.h" />
+    <ClInclude Include="CGLXManager.h" />
     <ClInclude Include="CMeshCache.h" />
     <ClInclude Include="CMeshManipulator.h" />
     <ClInclude Include="COGLCoreCacheHandler.h" />
@@ -1023,6 +1025,7 @@
     <ClInclude Include="COpenGLSLMaterialRenderer.h" />
     <ClInclude Include="CProfiler.h" />
     <ClInclude Include="CSceneManager.h" />
+    <ClInclude Include="CWGLManager.h" />
     <ClInclude Include="Octree.h" />
     <ClInclude Include="CSMFMeshFileLoader.h" />
     <ClInclude Include="C3DSMeshFileLoader.h" />
@@ -1257,6 +1260,7 @@
     <ClCompile Include="CDefaultSceneNodeAnimatorFactory.cpp" />
     <ClCompile Include="CDefaultSceneNodeFactory.cpp" />
     <ClCompile Include="CGeometryCreator.cpp" />
+    <ClCompile Include="CGLXManager.cpp" />
     <ClCompile Include="CMeshCache.cpp" />
     <ClCompile Include="CMeshManipulator.cpp" />
     <ClCompile Include="COpenGLCacheHandler.cpp" />
@@ -1292,6 +1296,7 @@
     <ClCompile Include="CQ3LevelMesh.cpp" />
     <ClCompile Include="CSkinnedMesh.cpp" />
     <ClCompile Include="CSTLMeshFileLoader.cpp" />
+    <ClCompile Include="CWGLManager.cpp" />
     <ClCompile Include="CXMeshFileLoader.cpp" />
     <ClCompile Include="CAnimatedMeshSceneNode.cpp" />
     <ClCompile Include="CBillboardSceneNode.cpp" />

source/Irrlicht/Irrlicht10.0.vcxproj.filters

@@ -103,6 +103,9 @@
     <Filter Include="Irrlicht\video\OpenGL Core">
       <UniqueIdentifier>{2c9c6ef7-5662-4f11-83cd-921c717d3ab0}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Irrlicht\video\OpenGL Context">
+      <UniqueIdentifier>{397439c6-ad86-45a8-b692-f3606794a075}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\include\IEventReceiver.h">
@@ -144,6 +147,9 @@
     <ClInclude Include="..\..\include\EDriverTypes.h">
       <Filter>include\video</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\include\IContextManager.h">
+      <Filter>include\video</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\include\IGeometryCreator.h">
       <Filter>include\video</Filter>
     </ClInclude>
@@ -1327,6 +1333,12 @@
     <ClInclude Include="COGLCoreTexture.h">
       <Filter>Irrlicht\video\OpenGL Core</Filter>
     </ClInclude>
+    <ClInclude Include="CGLXManager.h">
+      <Filter>Irrlicht\video\OpenGL Context</Filter>
+    </ClInclude>
+    <ClInclude Include="CWGLManager.h">
+      <Filter>Irrlicht\video\OpenGL Context</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\changes.txt">
@@ -2258,6 +2270,12 @@
     <ClCompile Include="COpenGLSLMaterialRenderer.cpp">
       <Filter>Irrlicht\video\OpenGL</Filter>
     </ClCompile>
+    <ClCompile Include="CGLXManager.cpp">
+      <Filter>Irrlicht\video\OpenGL Context</Filter>
+    </ClCompile>
+    <ClCompile Include="CWGLManager.cpp">
+      <Filter>Irrlicht\video\OpenGL Context</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="Irrlicht.rc" />

source/Irrlicht/Irrlicht11.0.vcxproj

@@ -858,6 +858,7 @@
     <ClInclude Include="..\..\include\SIrrCreationParameters.h" />
     <ClInclude Include="..\..\include\SKeyMap.h" />
     <ClInclude Include="..\..\include\EDriverTypes.h" />
+    <ClInclude Include="..\..\include\IContextManager.h" />
     <ClInclude Include="..\..\include\IGeometryCreator.h" />
     <ClInclude Include="..\..\include\IGPUProgrammingServices.h" />
     <ClInclude Include="..\..\include\IImage.h" />
@@ -1006,6 +1007,7 @@
     <ClInclude Include="CDefaultSceneNodeAnimatorFactory.h" />
     <ClInclude Include="CDefaultSceneNodeFactory.h" />
     <ClInclude Include="CGeometryCreator.h" />
+    <ClInclude Include="CGLXManager.h" />
     <ClInclude Include="CMeshCache.h" />
     <ClInclude Include="CMeshManipulator.h" />
     <ClInclude Include="COGLCoreCacheHandler.h" />
@@ -1022,6 +1024,7 @@
     <ClInclude Include="COpenGLShaderMaterialRenderer.h" />
     <ClInclude Include="COpenGLSLMaterialRenderer.h" />
     <ClInclude Include="CSceneManager.h" />
+    <ClInclude Include="CWGLManager.h" />
     <ClInclude Include="Octree.h" />
     <ClInclude Include="CSMFMeshFileLoader.h" />
     <ClInclude Include="C3DSMeshFileLoader.h" />
@@ -1257,6 +1260,7 @@
     <ClCompile Include="CDefaultSceneNodeAnimatorFactory.cpp" />
     <ClCompile Include="CDefaultSceneNodeFactory.cpp" />
     <ClCompile Include="CGeometryCreator.cpp" />
+    <ClCompile Include="CGLXManager.cpp" />
     <ClCompile Include="CMeshCache.cpp" />
     <ClCompile Include="CMeshManipulator.cpp" />
     <ClCompile Include="COpenGLCacheHandler.cpp" />
@@ -1292,6 +1296,7 @@
     <ClCompile Include="CQ3LevelMesh.cpp" />
     <ClCompile Include="CSkinnedMesh.cpp" />
     <ClCompile Include="CSTLMeshFileLoader.cpp" />
+    <ClCompile Include="CWGLManager.cpp" />
     <ClCompile Include="CXMeshFileLoader.cpp" />
     <ClCompile Include="CAnimatedMeshSceneNode.cpp" />
     <ClCompile Include="CBillboardSceneNode.cpp" />

source/Irrlicht/Irrlicht11.0.vcxproj.filters

@@ -103,6 +103,9 @@
     <Filter Include="Irrlicht\video\OpenGL Core">
       <UniqueIdentifier>{bc1d03a2-7534-4b2f-857f-be5e0ab41dde}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Irrlicht\video\OpenGL Context">
+      <UniqueIdentifier>{d16493e0-554f-49e0-b228-0e4047839dba}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\include\IEventReceiver.h">
@@ -150,6 +153,9 @@
     <ClInclude Include="..\..\include\EDriverTypes.h">
       <Filter>include\video</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\include\IContextManager.h">
+      <Filter>include\video</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\include\IGeometryCreator.h">
       <Filter>include\video</Filter>
     </ClInclude>
@@ -1327,6 +1333,12 @@
     <ClInclude Include="COGLCoreTexture.h">
       <Filter>Irrlicht\video\OpenGL Core</Filter>
     </ClInclude>
+    <ClInclude Include="CGLXManager.h">
+      <Filter>Irrlicht\video\OpenGL Context</Filter>
+    </ClInclude>
+    <ClInclude Include="CWGLManager.h">
+      <Filter>Irrlicht\video\OpenGL Context</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\changes.txt">
@@ -2258,6 +2270,12 @@
     <ClCompile Include="COpenGLSLMaterialRenderer.cpp">
       <Filter>Irrlicht\video\OpenGL</Filter>
     </ClCompile>
+    <ClCompile Include="CGLXManager.cpp">
+      <Filter>Irrlicht\video\OpenGL Context</Filter>
+    </ClCompile>
+    <ClCompile Include="CWGLManager.cpp">
+      <Filter>Irrlicht\video\OpenGL Context</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="Irrlicht.rc" />

source/Irrlicht/Irrlicht12.0.vcxproj

@@ -858,6 +858,7 @@
     <ClInclude Include="..\..\include\SIrrCreationParameters.h" />
     <ClInclude Include="..\..\include\SKeyMap.h" />
     <ClInclude Include="..\..\include\EDriverTypes.h" />
+    <ClInclude Include="..\..\include\IContextManager.h" />
     <ClInclude Include="..\..\include\IGeometryCreator.h" />
     <ClInclude Include="..\..\include\IGPUProgrammingServices.h" />
     <ClInclude Include="..\..\include\IImage.h" />
@@ -1006,6 +1007,7 @@
     <ClInclude Include="CDefaultSceneNodeAnimatorFactory.h" />
     <ClInclude Include="CDefaultSceneNodeFactory.h" />
     <ClInclude Include="CGeometryCreator.h" />
+    <ClInclude Include="CGLXManager.h" />
     <ClInclude Include="CMeshCache.h" />
     <ClInclude Include="CMeshManipulator.h" />
     <ClInclude Include="COGLCoreCacheHandler.h" />
@@ -1022,6 +1024,7 @@
     <ClInclude Include="COpenGLShaderMaterialRenderer.h" />
     <ClInclude Include="COpenGLSLMaterialRenderer.h" />
     <ClInclude Include="CSceneManager.h" />
+    <ClInclude Include="CWGLManager.h" />
     <ClInclude Include="Octree.h" />
     <ClInclude Include="CSMFMeshFileLoader.h" />
     <ClInclude Include="C3DSMeshFileLoader.h" />
@@ -1257,6 +1260,7 @@
     <ClCompile Include="CDefaultSceneNodeAnimatorFactory.cpp" />
     <ClCompile Include="CDefaultSceneNodeFactory.cpp" />
     <ClCompile Include="CGeometryCreator.cpp" />
+    <ClCompile Include="CGLXManager.cpp" />
     <ClCompile Include="CMeshCache.cpp" />
     <ClCompile Include="CMeshManipulator.cpp" />
     <ClCompile Include="COpenGLCacheHandler.cpp" />
@@ -1292,6 +1296,7 @@
     <ClCompile Include="CQ3LevelMesh.cpp" />
     <ClCompile Include="CSkinnedMesh.cpp" />
     <ClCompile Include="CSTLMeshFileLoader.cpp" />
+    <ClCompile Include="CWGLManager.cpp" />
     <ClCompile Include="CXMeshFileLoader.cpp" />
     <ClCompile Include="CAnimatedMeshSceneNode.cpp" />
     <ClCompile Include="CBillboardSceneNode.cpp" />

source/Irrlicht/Irrlicht12.0.vcxproj.filters

@@ -103,6 +103,9 @@
     <Filter Include="Irrlicht\video\OpenGL Core">
       <UniqueIdentifier>{d6b83fe4-204d-4a95-aeb7-5b8ebdec7e5d}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Irrlicht\video\OpenGL Context">
+      <UniqueIdentifier>{f1f5ce52-0b36-4934-8c51-8e73026f94cc}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\include\IEventReceiver.h">
@@ -150,6 +153,9 @@
     <ClInclude Include="..\..\include\EDriverTypes.h">
       <Filter>include\video</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\include\IContextManager.h">
+      <Filter>include\video</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\include\IGeometryCreator.h">
       <Filter>include\video</Filter>
     </ClInclude>
@@ -1327,6 +1333,12 @@
     <ClInclude Include="COGLCoreTexture.h">
       <Filter>Irrlicht\video\OpenGL Core</Filter>
     </ClInclude>
+    <ClInclude Include="CGLXManager.h">
+      <Filter>Irrlicht\video\OpenGL Context</Filter>
+    </ClInclude>
+    <ClInclude Include="CWGLManager.h">
+      <Filter>Irrlicht\video\OpenGL Context</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\changes.txt">
@@ -2258,6 +2270,12 @@
     <ClCompile Include="COpenGLSLMaterialRenderer.cpp">
       <Filter>Irrlicht\video\OpenGL</Filter>
     </ClCompile>
+    <ClCompile Include="CGLXManager.cpp">
+      <Filter>Irrlicht\video\OpenGL Context</Filter>
+    </ClCompile>
+    <ClCompile Include="CWGLManager.cpp">
+      <Filter>Irrlicht\video\OpenGL Context</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="Irrlicht.rc" />

source/Irrlicht/Irrlicht14.0.vcxproj

@@ -868,6 +868,7 @@
     <ClInclude Include="..\..\include\SIrrCreationParameters.h" />
     <ClInclude Include="..\..\include\SKeyMap.h" />
     <ClInclude Include="..\..\include\EDriverTypes.h" />
+    <ClInclude Include="..\..\include\IContextManager.h" />
     <ClInclude Include="..\..\include\IGeometryCreator.h" />
     <ClInclude Include="..\..\include\IGPUProgrammingServices.h" />
     <ClInclude Include="..\..\include\IImage.h" />
@@ -1016,6 +1017,7 @@
     <ClInclude Include="CDefaultSceneNodeAnimatorFactory.h" />
     <ClInclude Include="CDefaultSceneNodeFactory.h" />
     <ClInclude Include="CGeometryCreator.h" />
+    <ClInclude Include="CGLXManager.h" />
     <ClInclude Include="CMeshCache.h" />
     <ClInclude Include="CMeshManipulator.h" />
     <ClInclude Include="COGLCoreCacheHandler.h" />
@@ -1032,6 +1034,7 @@
     <ClInclude Include="COpenGLShaderMaterialRenderer.h" />
     <ClInclude Include="COpenGLSLMaterialRenderer.h" />
     <ClInclude Include="CSceneManager.h" />
+    <ClInclude Include="CWGLManager.h" />
     <ClInclude Include="Octree.h" />
     <ClInclude Include="CSMFMeshFileLoader.h" />
     <ClInclude Include="C3DSMeshFileLoader.h" />
@@ -1267,6 +1270,7 @@
     <ClCompile Include="CDefaultSceneNodeAnimatorFactory.cpp" />
     <ClCompile Include="CDefaultSceneNodeFactory.cpp" />
     <ClCompile Include="CGeometryCreator.cpp" />
+    <ClCompile Include="CGLXManager.cpp" />
     <ClCompile Include="CMeshCache.cpp" />
     <ClCompile Include="CMeshManipulator.cpp" />
     <ClCompile Include="COpenGLCacheHandler.cpp" />
@@ -1302,6 +1306,7 @@
     <ClCompile Include="CQ3LevelMesh.cpp" />
     <ClCompile Include="CSkinnedMesh.cpp" />
     <ClCompile Include="CSTLMeshFileLoader.cpp" />
+    <ClCompile Include="CWGLManager.cpp" />
     <ClCompile Include="CXMeshFileLoader.cpp" />
     <ClCompile Include="CAnimatedMeshSceneNode.cpp" />
     <ClCompile Include="CBillboardSceneNode.cpp" />

source/Irrlicht/Irrlicht14.0.vcxproj.filters

@@ -103,6 +103,9 @@
     <Filter Include="Irrlicht\video\OpenGL Core">
       <UniqueIdentifier>{628de03e-6872-4682-b1f6-d3cc453c9d55}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Irrlicht\video\OpenGL Context">
+      <UniqueIdentifier>{2512a519-e6c0-4b48-aae4-ded2d2500b95}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\include\IEventReceiver.h">
@@ -150,6 +153,9 @@
     <ClInclude Include="..\..\include\EDriverTypes.h">
       <Filter>include\video</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\include\IContextManager.h">
+      <Filter>include\video</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\include\IGeometryCreator.h">
       <Filter>include\video</Filter>
     </ClInclude>
@@ -1327,6 +1333,12 @@
     <ClInclude Include="COGLCoreTexture.h">
       <Filter>Irrlicht\video\OpenGL Core</Filter>
     </ClInclude>
+    <ClInclude Include="CGLXManager.h">
+      <Filter>Irrlicht\video\OpenGL Context</Filter>
+    </ClInclude>
+    <ClInclude Include="CWGLManager.h">
+      <Filter>Irrlicht\video\OpenGL Context</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\changes.txt">
@@ -2258,6 +2270,12 @@
     <ClCompile Include="COpenGLSLMaterialRenderer.cpp">
       <Filter>Irrlicht\video\OpenGL</Filter>
     </ClCompile>
+    <ClCompile Include="CGLXManager.cpp">
+      <Filter>Irrlicht\video\OpenGL Context</Filter>
+    </ClCompile>
+    <ClCompile Include="CWGLManager.cpp">
+      <Filter>Irrlicht\video\OpenGL Context</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="Irrlicht.rc" />

source/Irrlicht/Makefile

@@ -38,7 +38,7 @@ IRRMESHOBJ = $(IRRMESHLOADER) $(IRRMESHWRITER) \
 IRROBJ = CBillboardSceneNode.o CCameraSceneNode.o CDummyTransformationSceneNode.o CEmptySceneNode.o CGeometryCreator.o CLightSceneNode.o CMeshManipulator.o CMetaTriangleSelector.o COctreeSceneNode.o COctreeTriangleSelector.o CSceneCollisionManager.o CSceneManager.o CShadowVolumeSceneNode.o CSkyBoxSceneNode.o CSkyDomeSceneNode.o CTerrainSceneNode.o CTerrainTriangleSelector.o CVolumeLightSceneNode.o CCubeSceneNode.o CSphereSceneNode.o CTextSceneNode.o CTriangleBBSelector.o CTriangleSelector.o CWaterSurfaceSceneNode.o CMeshCache.o CDefaultSceneNodeAnimatorFactory.o CDefaultSceneNodeFactory.o CSceneLoaderIrr.o
 IRRPARTICLEOBJ = CParticleAnimatedMeshSceneNodeEmitter.o CParticleBoxEmitter.o CParticleCylinderEmitter.o CParticleMeshEmitter.o CParticlePointEmitter.o CParticleRingEmitter.o CParticleSphereEmitter.o CParticleAttractionAffector.o CParticleFadeOutAffector.o CParticleGravityAffector.o CParticleRotationAffector.o CParticleSystemSceneNode.o CParticleScaleAffector.o
 IRRANIMOBJ = CSceneNodeAnimatorCameraFPS.o CSceneNodeAnimatorCameraMaya.o CSceneNodeAnimatorCollisionResponse.o CSceneNodeAnimatorDelete.o CSceneNodeAnimatorFlyCircle.o CSceneNodeAnimatorFlyStraight.o CSceneNodeAnimatorFollowSpline.o CSceneNodeAnimatorRotation.o CSceneNodeAnimatorTexture.o
-IRRDRVROBJ = CNullDriver.o COpenGLCacheHandler.o COpenGLDriver.o COpenGLNormalMapRenderer.o COpenGLParallaxMapRenderer.o COpenGLShaderMaterialRenderer.o COpenGLSLMaterialRenderer.o COpenGLExtensionHandler.o CD3D9Driver.o CD3D9HLSLMaterialRenderer.o CD3D9NormalMapRenderer.o CD3D9ParallaxMapRenderer.o CD3D9ShaderMaterialRenderer.o CD3D9Texture.o
+IRRDRVROBJ = CNullDriver.o COpenGLCacheHandler.o COpenGLDriver.o COpenGLNormalMapRenderer.o COpenGLParallaxMapRenderer.o COpenGLShaderMaterialRenderer.o COpenGLSLMaterialRenderer.o COpenGLExtensionHandler.o CD3D9Driver.o CD3D9HLSLMaterialRenderer.o CD3D9NormalMapRenderer.o CD3D9ParallaxMapRenderer.o CD3D9ShaderMaterialRenderer.o CD3D9Texture.o CGLXManager.o CWGLManager.o
 IRRIMAGEOBJ = CColorConverter.o CImage.o CImageLoaderBMP.o CImageLoaderDDS.o CImageLoaderJPG.o CImageLoaderPCX.o CImageLoaderPNG.o CImageLoaderPSD.o CImageLoaderPVR.o CImageLoaderTGA.o CImageLoaderPPM.o CImageLoaderWAL.o CImageLoaderRGB.o \
 	CImageWriterBMP.o CImageWriterJPG.o CImageWriterPCX.o CImageWriterPNG.o CImageWriterPPM.o CImageWriterPSD.o CImageWriterTGA.o
 IRRVIDEOOBJ = CVideoModeList.o CFPSCounter.o $(IRRDRVROBJ) $(IRRIMAGEOBJ)