IPhone device fixes by grafikrobot.
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@2822 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
parent
459595d106
commit
944368eb36
@ -20,6 +20,7 @@
|
||||
#include "CColorConverter.h"
|
||||
#include "SIrrCreationParameters.h"
|
||||
#include <CoreFoundation/CFRunLoop.h>
|
||||
#include "SExposedVideoData.h"
|
||||
|
||||
//~ #include "irr/base/DeviceIPhone_Apple.h"
|
||||
|
||||
@ -27,9 +28,8 @@ namespace irr
|
||||
{
|
||||
namespace video
|
||||
{
|
||||
IVideoDriver* createOGLES1Driver(
|
||||
const SIrrlichtCreationParameters& params,
|
||||
io::IFileSystem* io,
|
||||
IVideoDriver* createOGLES1Driver(const SIrrlichtCreationParameters& params,
|
||||
video::SExposedVideoData& data, io::IFileSystem* io,
|
||||
MIrrIPhoneDevice const & device);
|
||||
}
|
||||
}
|
||||
@ -115,8 +115,11 @@ void CIrrDeviceIPhone::createDriver()
|
||||
{
|
||||
case video::EDT_OGLES1:
|
||||
#ifdef _IRR_COMPILE_WITH_OGLES1_
|
||||
VideoDriver = video::createOGLES1Driver(
|
||||
CreationParams, FileSystem, IrrIPhoneDevice);
|
||||
{
|
||||
video::SExposedVideoData data;
|
||||
VideoDriver = video::createOGLES1Driver(
|
||||
CreationParams, data, FileSystem, IrrIPhoneDevice);
|
||||
}
|
||||
#else
|
||||
os::Printer::log("No OpenGL-ES1 support compiled in.", ELL_ERROR);
|
||||
#endif
|
||||
|
@ -22,6 +22,10 @@ static const char* const copyright = "Irrlicht Engine (c) 2002-2009 Nikolaus Geb
|
||||
#include "MacOSX/CIrrDeviceMacOSX.h"
|
||||
#endif
|
||||
|
||||
#ifdef _IRR_COMPILE_WITH_IPHONE_DEVICE_
|
||||
#include "CIrrDeviceIPhone.h"
|
||||
#endif
|
||||
|
||||
#ifdef _IRR_COMPILE_WITH_WINDOWS_CE_DEVICE_
|
||||
#include "CIrrDeviceWinCE.h"
|
||||
#endif
|
||||
@ -73,7 +77,7 @@ namespace irr
|
||||
dev = new CIrrDeviceMacOSX(params);
|
||||
#endif
|
||||
|
||||
#ifdef _IRR_COMPILE_WITH_IPHONE_DEVICE
|
||||
#ifdef _IRR_COMPILE_WITH_IPHONE_DEVICE_
|
||||
if (params.DeviceType == EIDT_IPHONE || (!dev && params.DeviceType == EIDT_BEST))
|
||||
dev = new CIrrDeviceIPhone(params);
|
||||
#endif
|
||||
|
Loading…
x
Reference in New Issue
Block a user