MoNTE48
/
irrlicht
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix compiling (part 1 - still has some library troubles) 

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5290 dfc29bdd-3216-0410-991c-e03cc46cb475
master
cutealien 2016-03-18 17:36:56 +00:00
parent 54c19cd9a2
commit d16f529f18
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/Irrlicht/COGLES2Driver.cpp
View File

@ -33,7 +33,7 @@ namespace irr
{
namespace video
{
COGLES2Driver::COGLES2Driver(const SIrrlichtCreationParameters& params, io::IFileSystem* io, IContextManager* contextManager) :
CNullDriver(io, params.WindowSize), COGLES2ExtensionHandler(), CacheHandler(0), MaterialRenderer2D(0), CurrentRenderMode(ERM_NONE),
ResetRenderStates(true), Transformation3DChanged(true), AntiAlias(params.AntiAlias), OGLES2ShaderPath(params.OGLES2ShaderPath),
@ -67,7 +67,7 @@ COGLES2Driver::COGLES2Driver(const SIrrlichtCreationParameters& params, io::IFil
)
core::dimension2d<u32> windowSize(0, 0);
if (!ContextManager)
return;
@ -76,7 +76,7 @@ COGLES2Driver::COGLES2Driver(const SIrrlichtCreationParameters& params, io::IFil
ContextManager->generateContext();
ExposedData = ContextManager->getContext();
ContextManager->activateContext(ExposedData);
windowSize = params.WindowSize;
genericDriverInit(windowSize, params.Stencilbuffer);
@ -96,7 +96,7 @@ COGLES2Driver::~COGLES2Driver()
removeAllHardwareBuffers();
delete CacheHandler;
if (ContextManager)
{
ContextManager->destroyContext();
@ -1091,7 +1091,7 @@ COGLES2Driver::~COGLES2Driver()
}
void COGLES2Driver::draw2DImage(const video::ITexture* texture, bool flip)
void COGLES2Driver::draw2DImage(const video::ITexture* texture, u32 layer, bool flip)
{
chooseMaterial2D();
Material.TextureLayer[0].Texture = const_cast<ITexture*>(texture);
@ -2822,7 +2822,7 @@ COGLES2Driver::~COGLES2Driver()
os::Printer::log("Unsupported texture format", ELL_ERROR);
break;
}
#ifdef _IRR_IOS_PLATFORM_
if (internalFormat == GL_BGRA)
internalFormat = GL_RGBA;

2
source/Irrlicht/COGLES2Driver.h
View File

@ -114,7 +114,7 @@ namespace video
const core::rect<s32>& sourceRect, const core::rect<s32>* clipRect = 0,
const video::SColor* const colors = 0, bool useAlphaChannelOfTexture = false) _IRR_OVERRIDE_;
virtual void draw2DImage(const video::ITexture* texture, bool flip);
virtual void draw2DImage(const video::ITexture* texture, u32 layer, bool flip);
//! draws a set of 2d images
virtual void draw2DImageBatch(const video::ITexture* texture,

8
source/Irrlicht/COGLESDriver.cpp
View File

@ -48,7 +48,7 @@ COGLES1Driver::COGLES1Driver(const SIrrlichtCreationParameters& params, io::IFil
ContextManager->generateContext();
ExposedData = ContextManager->getContext();
ContextManager->activateContext(ExposedData);
windowSize = params.WindowSize;
genericDriverInit(windowSize, params.Stencilbuffer);
@ -220,7 +220,7 @@ bool COGLES1Driver::endScene()
CNullDriver::endScene();
glFlush();
if (ContextManager)
return ContextManager->swapBuffers();
@ -1032,7 +1032,7 @@ void COGLES1Driver::draw2DImage(const video::ITexture* texture, const core::rect
glDisable(GL_SCISSOR_TEST);
}
void COGLES1Driver::draw2DImage(const video::ITexture* texture, bool flip)
void COGLES1Driver::draw2DImage(const video::ITexture* texture, u32 layer, bool flip)
{
if (!texture || !CacheHandler->getTextureCache().set(0, texture))
return;
@ -3197,7 +3197,7 @@ void COGLES1Driver::getColorFormatParameters(ECOLOR_FORMAT format, GLint& intern
os::Printer::log("Unsupported texture format", ELL_ERROR);
break;
}
#ifdef _IRR_IOS_PLATFORM_
if (internalFormat == GL_BGRA)
internalFormat = GL_RGBA;

2
source/Irrlicht/COGLESDriver.h
View File

@ -109,7 +109,7 @@ namespace video
const core::rect<s32>& sourceRect, const core::rect<s32>* clipRect = 0,
const video::SColor* const colors = 0, bool useAlphaChannelOfTexture = false) _IRR_OVERRIDE_;
virtual void draw2DImage(const video::ITexture* texture, bool flip);
virtual void draw2DImage(const video::ITexture* texture, u32 layer, bool flip);
//! draws a set of 2d images
virtual void draw2DImageBatch(const video::ITexture* texture,