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

Merge with develop

Browse source 
--HG--
branch : compatibility-develop
This commit is contained in:
kervala 2015-11-24 20:11:52 +01:00
commit 96ac3ecefc
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -122,7 +122,7 @@ bool CDriverGL::compilePixelProgram(NL3D::CPixelProgram *program)
{ {
delete drvInfo; delete drvInfo;
program->m_DrvInfo = NULL; program->m_DrvInfo = NULL;
_GPUPrgDrvInfos.erase(it); //_GPUPrgDrvInfos.erase(it); // not needed as ~IProgramDrvInfos() already does it
return false; return false;
} }
} }

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

@ -178,7 +178,7 @@ bool CDriverGL::compileNVVertexProgram(CVertexProgram *program)
// Setup not ok // Setup not ok
delete drvInfo; delete drvInfo;
program->m_DrvInfo = NULL; program->m_DrvInfo = NULL;
_GPUPrgDrvInfos.erase(it); //_GPUPrgDrvInfos.erase(it); // not needed as ~IProgramDrvInfos() already does it
return false; return false;
} }
@ -1568,7 +1568,7 @@ bool CDriverGL::compileARBVertexProgram(NL3D::CVertexProgram *program)
{ {
delete drvInfo; delete drvInfo;
program->m_DrvInfo = NULL; program->m_DrvInfo = NULL;
_GPUPrgDrvInfos.erase(it); //_GPUPrgDrvInfos.erase(it); // not needed as ~IProgramDrvInfos() already does it
return false; return false;
} }
@ -1695,7 +1695,7 @@ bool CDriverGL::compileEXTVertexShader(CVertexProgram *program)
{ {
delete drvInfo; delete drvInfo;
program->m_DrvInfo = NULL; program->m_DrvInfo = NULL;
_GPUPrgDrvInfos.erase(it); //_GPUPrgDrvInfos.erase(it); // not needed as ~IProgramDrvInfos() already does it
return false; return false;
} }