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

Fixed compilation issues in OGL ES driver. 

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4568 dfc29bdd-3216-0410-991c-e03cc46cb475
master
nadro 2013-08-03 15:59:18 +00:00
parent e3fa638cdf
commit 9c2f45c738
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/Irrlicht/COGLESDriver.cpp
View File

@ -1716,7 +1716,7 @@ bool COGLES1Driver::setActiveTexture(u32 stage, const video::ITexture* texture)
if (!texture) if (!texture)
{ {
glBindTexture(0); glBindTexture(GL_TEXTURE_2D, 0);
glDisable(GL_TEXTURE_2D); glDisable(GL_TEXTURE_2D);
return true; return true;
} }

4
source/Irrlicht/COGLESTexture.cpp
View File

@ -106,11 +106,9 @@ COGLES1Texture::~COGLES1Texture()
if (Driver->CurrentTexture[i] == this) if (Driver->CurrentTexture[i] == this)
{ {
Driver->extGlActiveTexture(GL_TEXTURE0 + i); Driver->extGlActiveTexture(GL_TEXTURE0 + i);
glBindTexture(0); glBindTexture(GL_TEXTURE_2D, 0);
glDisable(GL_TEXTURE_2D); glDisable(GL_TEXTURE_2D);
Driver->setActiveTexture(i, 0);
Driver->getBridgeCalls()->setTexture(i);
Driver->CurrentTexture[i] = 0; Driver->CurrentTexture[i] = 0;
} }