Merge pull request #3258 from fluffyfreak/remove-progs

Remove defunct shader programs
pioneerspacesim · Nov 23, 2014 · 12c78f7 · 12c78f7
2 parents a9656b1 + 1423aec
commit 12c78f7
Showing 1 changed file with 0 additions and 11 deletions.
diff --git a/src/graphics/opengl/RendererGL.cpp b/src/graphics/opengl/RendererGL.cpp
@@ -37,10 +37,6 @@ namespace Graphics {
 
 typedef std::vector<std::pair<MaterialDescriptor, OGL::Program*> >::const_iterator ProgramIterator;
 
-// for material-less line and point drawing
-OGL::MultiProgram *vtxColorProg;
-OGL::MultiProgram *flatColorProg;
-
 RendererOGL::RendererOGL(WindowSDL *window, const Graphics::Settings &vs)
 : Renderer(window, window->GetWidth(), window->GetHeight())
 , m_numDirLights(0)
@@ -80,13 +76,6 @@ RendererOGL::RendererOGL(WindowSDL *window, const Graphics::Settings &vs)
 
 	if (vs.enableDebugMessages)
 		GLDebug::Enable();
-
-	MaterialDescriptor desc;
-	flatColorProg = new OGL::MultiProgram(desc);
-	m_programs.push_back(std::make_pair(desc, flatColorProg));
-	desc.vertexColors = true;
-	vtxColorProg = new OGL::MultiProgram(desc);
-	m_programs.push_back(std::make_pair(desc, vtxColorProg));
 }
 
 RendererOGL::~RendererOGL()