Commit d6c32fd9 authored by hybrid's avatar hybrid

Push the params also for OSX.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1379 dfc29bdd-3216-0410-991c-e03cc46cb475
parent 97577f9b
...@@ -163,18 +163,17 @@ bool COpenGLDriver::initDriver(const core::dimension2d<s32>& screenSize, ...@@ -163,18 +163,17 @@ bool COpenGLDriver::initDriver(const core::dimension2d<s32>& screenSize,
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
#ifdef _IRR_USE_OSX_DEVICE_ #ifdef _IRR_USE_OSX_DEVICE_
//! Windows constructor and init code //! Windows constructor and init code
COpenGLDriver::COpenGLDriver(const core::dimension2d<s32>& screenSize, COpenGLDriver::COpenGLDriver(const SIrrlichtCreationParameters& params,
bool fullscreen, bool stencilBuffer, CIrrDeviceMacOSX *device, io::IFileSystem* io, CIrrDeviceMacOSX *device)
io::IFileSystem* io, bool vsync, bool antiAlias) : CNullDriver(io, params.WindowSize), COpenGLExtensionHandler(),
: CNullDriver(io, screenSize), COpenGLExtensionHandler(),
CurrentRenderMode(ERM_NONE), ResetRenderStates(true), Transformation3DChanged(true), CurrentRenderMode(ERM_NONE), ResetRenderStates(true), Transformation3DChanged(true),
AntiAlias(antiAlias), RenderTargetTexture(0), LastSetLight(-1), AntiAlias(params.AntiAlias), RenderTargetTexture(0), LastSetLight(-1),
CurrentRendertargetSize(0,0), _device(device) CurrentRendertargetSize(0,0), _device(device)
{ {
#ifdef _DEBUG #ifdef _DEBUG
setDebugName("COpenGLDriver"); setDebugName("COpenGLDriver");
#endif #endif
genericDriverInit(screenSize, stencilBuffer); genericDriverInit(params.WindowSize, params.Stencilbuffer);
} }
#endif #endif
...@@ -2726,13 +2725,11 @@ IVideoDriver* createOpenGLDriver(const core::dimension2d<s32>& screenSize, ...@@ -2726,13 +2725,11 @@ IVideoDriver* createOpenGLDriver(const core::dimension2d<s32>& screenSize,
// MACOSX VERSION // MACOSX VERSION
// ----------------------------------- // -----------------------------------
#if defined(_IRR_USE_OSX_DEVICE_) #if defined(_IRR_USE_OSX_DEVICE_)
IVideoDriver* createOpenGLDriver(const core::dimension2d<s32>& screenSize, IVideoDriver* createOpenGLDriver(const SIrrlichtCreationParameters& params,
CIrrDeviceMacOSX *device, bool fullscreen, bool stencilBuffer, io::IFileSystem* io, CIrrDeviceMacOSX *device)
io::IFileSystem* io, bool vsync, bool antiAlias)
{ {
#ifdef _IRR_COMPILE_WITH_OPENGL_ #ifdef _IRR_COMPILE_WITH_OPENGL_
return new COpenGLDriver(screenSize, fullscreen, stencilBuffer, return new COpenGLDriver(params, io, device);
device, io, vsync, antiAlias);
#else #else
return 0; return 0;
#endif // _IRR_COMPILE_WITH_OPENGL_ #endif // _IRR_COMPILE_WITH_OPENGL_
......
...@@ -86,8 +86,8 @@ namespace video ...@@ -86,8 +86,8 @@ namespace video
#endif #endif
#ifdef _IRR_USE_OSX_DEVICE_ #ifdef _IRR_USE_OSX_DEVICE_
COpenGLDriver(const core::dimension2d<s32>& screenSize, bool fullscreen, COpenGLDriver(const SIrrlichtCreationParameters& params,
bool stencilBuffer, CIrrDeviceMacOSX *device,io::IFileSystem* io, bool vsync, bool antiAlias); io::IFileSystem* io, CIrrDeviceMacOSX *device);
#endif #endif
//! destructor //! destructor
......
...@@ -61,7 +61,7 @@ namespace irr ...@@ -61,7 +61,7 @@ namespace irr
{ {
namespace video namespace video
{ {
IVideoDriver* createOpenGLDriver(const core::dimension2d<s32>& screenSize, CIrrDeviceMacOSX *device, bool fullscreen, bool stencilBuffer, io::IFileSystem* io, bool vsync, bool antiAlias); IVideoDriver* createOpenGLDriver(const SIrrlichtCreationParameters& param, io::IFileSystem* io, CIrrDeviceMacOSX *device);
} }
} // end namespace irr } // end namespace irr
...@@ -332,7 +332,7 @@ void CIrrDeviceMacOSX::createDriver() ...@@ -332,7 +332,7 @@ void CIrrDeviceMacOSX::createDriver()
case video::EDT_OPENGL: case video::EDT_OPENGL:
#ifdef _IRR_COMPILE_WITH_OPENGL_ #ifdef _IRR_COMPILE_WITH_OPENGL_
VideoDriver = video::createOpenGLDriver(CreationParams.WindowSize, this, CreationParams.Fullscreen, CreationParams.Stencilbuffer, FileSystem, CreationParams.Vsync, creationParams.AntiAlias); VideoDriver = video::createOpenGLDriver(CreationParams, FileSystem, this);
#else #else
os::Printer::log("No OpenGL support compiled in.", ELL_ERROR); os::Printer::log("No OpenGL support compiled in.", ELL_ERROR);
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment