From 11dc9110c2ef20615bfd6164ad7a0efd7c47a935 Mon Sep 17 00:00:00 2001 From: kaetemi Date: Mon, 31 Mar 2014 19:12:38 +0200 Subject: [PATCH] GL3: Remove dead code --HG-- branch : opengl3 --- .../opengl3/driver_glsl_shader_generator.cpp | 4 +- .../src/3d/driver/opengl3/driver_opengl.cpp | 2 +- .../opengl3/driver_opengl_vertex_program.cpp | 1 - .../opengl3/driver_opengl_vertex_program.h | 61 ------------------- 4 files changed, 3 insertions(+), 65 deletions(-) delete mode 100644 code/nel/src/3d/driver/opengl3/driver_opengl_vertex_program.h diff --git a/code/nel/src/3d/driver/opengl3/driver_glsl_shader_generator.cpp b/code/nel/src/3d/driver/opengl3/driver_glsl_shader_generator.cpp index b3c6f36d9..af678ce24 100644 --- a/code/nel/src/3d/driver/opengl3/driver_glsl_shader_generator.cpp +++ b/code/nel/src/3d/driver/opengl3/driver_glsl_shader_generator.cpp @@ -605,8 +605,8 @@ namespace NL3D ss << "fragColor = texop" << (IDRV_MAT_MAXTEXTURES - 1) << ";" << std::endl; - //if (desc->fogEnabled()) - // addFog(); + if (desc->fogEnabled()) + addFog(); addAlphaTest(); diff --git a/code/nel/src/3d/driver/opengl3/driver_opengl.cpp b/code/nel/src/3d/driver/opengl3/driver_opengl.cpp index 90c753cd9..9b51315d6 100644 --- a/code/nel/src/3d/driver/opengl3/driver_opengl.cpp +++ b/code/nel/src/3d/driver/opengl3/driver_opengl.cpp @@ -1640,7 +1640,7 @@ bool CDriverGL3::supportFrameBufferObject() const { H_AUTO_OGL(CDriverGL3_supportFrameBufferObject); - return _Extensions.GLCore; + return false; // TODO GL _Extensions.GLCore; } // *************************************************************************** diff --git a/code/nel/src/3d/driver/opengl3/driver_opengl_vertex_program.cpp b/code/nel/src/3d/driver/opengl3/driver_opengl_vertex_program.cpp index 15b885b82..8372255ef 100644 --- a/code/nel/src/3d/driver/opengl3/driver_opengl_vertex_program.cpp +++ b/code/nel/src/3d/driver/opengl3/driver_opengl_vertex_program.cpp @@ -15,7 +15,6 @@ // along with this program. If not, see . #include "stdopengl.h" -#include "driver_opengl_vertex_program.h" #include diff --git a/code/nel/src/3d/driver/opengl3/driver_opengl_vertex_program.h b/code/nel/src/3d/driver/opengl3/driver_opengl_vertex_program.h deleted file mode 100644 index 070c25e5c..000000000 --- a/code/nel/src/3d/driver/opengl3/driver_opengl_vertex_program.h +++ /dev/null @@ -1,61 +0,0 @@ -// NeL - MMORPG Framework -// Copyright (C) 2014 by authors -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. -// -// You should have received a copy of the GNU Affero General Public License -// along with this program. If not, see . - -#ifndef NL_DRIVER_OPENGL_VERTEX_PROGRAM_H -#define NL_DRIVER_OPENGL_VERTEX_PROGRAM_H - -#include "nel/misc/types_nl.h" - -namespace NL3D { - -class CVertexProgram; - -#ifdef NL_STATIC -namespace NLDRIVERGL3 { -#endif - -class CDriverGL3; - -// The default vertex program -class CDriverGL3VertexProgramDefault -{ - struct CDesc - { - - }; - -public: - CDriverGL3VertexProgramDefault(); - ~CDriverGL3VertexProgramDefault(); - - void setDriver(CDriverGL3 *driver); - - CVertexProgram *generate(); - -private: - CDriverGL3 *m_Driver; - -}; - -#ifdef NL_STATIC -} // NLDRIVERGL3 -#endif - -} // NL3D - -#endif // NL_DRIVER_OPENGL_VERTEX_PROGRAM_H - -/* end of file */