aleajactaest/khanat-opennel-code
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-opennel-code.git synced 2024-09-20 11:40:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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 e60ba59fec
commit aa2e1a4717
2 changed files with 20 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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

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

@ -530,9 +530,12 @@ void CDriverGL::bindTextureWithMode(ITexture &tex)
_DriverGLStates.activeTextureARB(0); _DriverGLStates.activeTextureARB(0);
if(tex.isTextureCube()) if(tex.isTextureCube())
{ {
_DriverGLStates.setTextureMode(CDriverGLStates::TextureCubeMap); if (_Extensions.ARBTextureCubeMap)
// Bind this texture {
glBindTexture(GL_TEXTURE_CUBE_MAP_ARB, gltext->ID); _DriverGLStates.setTextureMode(CDriverGLStates::TextureCubeMap);
// Bind this texture
glBindTexture(GL_TEXTURE_CUBE_MAP_ARB, gltext->ID);
}
} }
else else
{ {
@ -562,11 +565,14 @@ void CDriverGL::setupTextureBasicParameters(ITexture &tex)
gltext->MinFilter= tex.getMinFilter(); gltext->MinFilter= tex.getMinFilter();
if(tex.isTextureCube()) if(tex.isTextureCube())
{ {
glTexParameteri(GL_TEXTURE_CUBE_MAP_ARB,GL_TEXTURE_WRAP_S, translateWrapToGl(ITexture::Clamp, _Extensions)); if (_Extensions.ARBTextureCubeMap)
glTexParameteri(GL_TEXTURE_CUBE_MAP_ARB,GL_TEXTURE_WRAP_T, translateWrapToGl(ITexture::Clamp, _Extensions)); {
glTexParameteri(GL_TEXTURE_CUBE_MAP_ARB,GL_TEXTURE_WRAP_R, translateWrapToGl(ITexture::Clamp, _Extensions)); glTexParameteri(GL_TEXTURE_CUBE_MAP_ARB,GL_TEXTURE_WRAP_S, translateWrapToGl(ITexture::Clamp, _Extensions));
glTexParameteri(GL_TEXTURE_CUBE_MAP_ARB,GL_TEXTURE_MAG_FILTER, translateMagFilterToGl(gltext)); glTexParameteri(GL_TEXTURE_CUBE_MAP_ARB,GL_TEXTURE_WRAP_T, translateWrapToGl(ITexture::Clamp, _Extensions));
glTexParameteri(GL_TEXTURE_CUBE_MAP_ARB,GL_TEXTURE_MIN_FILTER, translateMinFilterToGl(gltext)); glTexParameteri(GL_TEXTURE_CUBE_MAP_ARB,GL_TEXTURE_WRAP_R, translateWrapToGl(ITexture::Clamp, _Extensions));
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 else
{ {
@ -1161,7 +1167,7 @@ bool CDriverGL::activateTexture(uint stage, ITexture *tex)
if (this->_CurrentTexture[stage]!=tex) if (this->_CurrentTexture[stage]!=tex)
{ {
_DriverGLStates.activeTextureARB(stage); _DriverGLStates.activeTextureARB(stage);
if(tex) if(tex && tex->TextureDrvShare)
{ {
// get the drv info. should be not NULL. // get the drv info. should be not NULL.
CTextureDrvInfosGL* gltext; CTextureDrvInfosGL* gltext;