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

Fix linux compile

Browse source
This commit is contained in:
kaetemi 2013-06-19 16:18:09 +02:00
parent 3865e6e56f
commit 4cc4a84578
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -28,8 +28,8 @@
#include "stdopengl.h" #include "stdopengl.h"
#include "driver_opengl.h" #include "driver_opengl.h"
#include <nel/3d/index_buffer.h> #include "nel/3d/index_buffer.h"
#include <nel/3d/vertex_program.h> #include "nel/3d/pixel_program.h"
#include <algorithm> #include <algorithm>
// tmp // tmp
@ -37,11 +37,17 @@
using namespace std; using namespace std;
using namespace NLMISC; using namespace NLMISC;
//#define DEBUG_SETUP_EXT_VERTEX_SHADER
namespace NL3D namespace NL3D
{ {
#ifdef NL_STATIC
#ifdef USE_OPENGLES
namespace NLDRIVERGLES {
#else
namespace NLDRIVERGL {
#endif
#endif
// *************************************************************************** // ***************************************************************************
CPixelProgamDrvInfosGL::CPixelProgamDrvInfosGL (CDriverGL *drv, ItPixelPrgDrvInfoPtrList it) : IPixelProgramDrvInfos (drv, it) CPixelProgamDrvInfosGL::CPixelProgamDrvInfosGL (CDriverGL *drv, ItPixelPrgDrvInfoPtrList it) : IPixelProgramDrvInfos (drv, it)
@ -316,4 +322,8 @@ void CDriverGL::setPixelProgramConstantMatrix (uint index, IDriver::TMatrix matr
} }
} }
#ifdef NL_STATIC
} // NLDRIVERGL/ES
#endif
} // NL3D } // NL3D