Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Fixed: Crash and bug if not supporting GL_ARB_texture_cube_map

Browse source
This commit is contained in:
kervala 2010-12-20 17:00:58 +01:00
parent 673cd93bc9
commit ad15dbfc75
2 changed files with 20 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
code/nel/src/3d/driver/opengl/driver_opengl.cpp
View file

@ -1250,10 +1250,13 @@ void CDriverGL::copyFrameBufferToTexture(ITexture *tex,
_DriverGLStates.setTextureMode(textureMode);
if (tex->isTextureCube())
{
if(_Extensions.ARBTextureCubeMap)
{
glBindTexture(GL_TEXTURE_CUBE_MAP_ARB, gltext->ID);
glCopyTexSubImage2D(NLCubeFaceToGLCubeFace[cubeFace], level, offsetx, offsety, x, y, width, height);
}
}
else
{
glBindTexture(gltext->TextureMode, gltext->ID);

8
code/nel/src/3d/driver/opengl/driver_opengl_texture.cpp
View file

@ -529,11 +529,14 @@ void CDriverGL::bindTextureWithMode(ITexture &tex)
// system of "backup the previous binded texture" seems to not work with some drivers....
_DriverGLStates.activeTextureARB(0);
if(tex.isTextureCube())
{
if (_Extensions.ARBTextureCubeMap)
{
_DriverGLStates.setTextureMode(CDriverGLStates::TextureCubeMap);
// Bind this texture
glBindTexture(GL_TEXTURE_CUBE_MAP_ARB, gltext->ID);
}
}
else
{
CDriverGLStates::TTextureMode textureMode= CDriverGLStates::Texture2D;
@ -561,6 +564,8 @@ void CDriverGL::setupTextureBasicParameters(ITexture &tex)
gltext->MagFilter= tex.getMagFilter();
gltext->MinFilter= tex.getMinFilter();
if(tex.isTextureCube())
{
if (_Extensions.ARBTextureCubeMap)
{
glTexParameteri(GL_TEXTURE_CUBE_MAP_ARB,GL_TEXTURE_WRAP_S, translateWrapToGl(ITexture::Clamp, _Extensions));
glTexParameteri(GL_TEXTURE_CUBE_MAP_ARB,GL_TEXTURE_WRAP_T, translateWrapToGl(ITexture::Clamp, _Extensions));
@ -568,6 +573,7 @@ void CDriverGL::setupTextureBasicParameters(ITexture &tex)
glTexParameteri(GL_TEXTURE_CUBE_MAP_ARB,GL_TEXTURE_MAG_FILTER, translateMagFilterToGl(gltext));
glTexParameteri(GL_TEXTURE_CUBE_MAP_ARB,GL_TEXTURE_MIN_FILTER, translateMinFilterToGl(gltext));
}
}
else
{
glTexParameteri(gltext->TextureMode,GL_TEXTURE_WRAP_S, translateWrapToGl(gltext->WrapS, _Extensions));
@ -1161,7 +1167,7 @@ bool CDriverGL::activateTexture(uint stage, ITexture *tex)
if (this->_CurrentTexture[stage]!=tex)
{
_DriverGLStates.activeTextureARB(stage);
if(tex)
if(tex && tex->TextureDrvShare)
{
// get the drv info. should be not NULL.
CTextureDrvInfosGL* gltext;