From fcb43fb9839e007a89eb353e7571de43b10bc673 Mon Sep 17 00:00:00 2001 From: Vincent Lejeune Date: Thu, 20 Nov 2014 22:34:19 +0100 Subject: [PATCH] Clean some useless decl --- src/graphics/shaders.cpp | 6 ------ src/graphics/shaders.hpp | 2 -- 2 files changed, 8 deletions(-) diff --git a/src/graphics/shaders.cpp b/src/graphics/shaders.cpp index bd457ea90..f7c8b8e24 100644 --- a/src/graphics/shaders.cpp +++ b/src/graphics/shaders.cpp @@ -491,9 +491,6 @@ void Shaders::loadShaders() m_shaders[ES_MIPVIZ] = glslmat(dir + "pass.vert", dir + "pass.frag", m_callbacks[ES_MIPVIZ], EMT_SOLID); - m_shaders[ES_COLORIZE] = glslmat(dir + "pass.vert", dir + "pass.frag", - m_callbacks[ES_COLORIZE], EMT_SOLID); - m_shaders[ES_OBJECTPASS] = glsl_noinput(dir + "pass.vert", dir + "pass.frag"); m_shaders[ES_OBJECT_UNLIT] = glsl_noinput(dir + "pass.vert", dir + "pass.frag"); m_shaders[ES_OBJECTPASS_REF] = glsl_noinput(dir + "pass.vert", dir + "pass.frag"); @@ -502,9 +499,6 @@ void Shaders::loadShaders() m_shaders[ES_DISPLACE] = glslmat(dir + "pass.vert", dir + "pass.frag", m_callbacks[ES_DISPLACE], EMT_TRANSPARENT_ALPHA_CHANNEL); - m_shaders[ES_PASSFAR] = glsl(dir + "pass.vert", dir + "pass.frag", - m_callbacks[ES_COLORIZE]); - // Check that all successfully loaded for (s32 i = 0; i < ES_COUNT; i++) { diff --git a/src/graphics/shaders.hpp b/src/graphics/shaders.hpp index 6921ef64f..518f7fad0 100644 --- a/src/graphics/shaders.hpp +++ b/src/graphics/shaders.hpp @@ -690,13 +690,11 @@ public: ACT(ES_GAUSSIAN3H) \ ACT(ES_GAUSSIAN3V) \ ACT(ES_MIPVIZ) \ - ACT(ES_COLORIZE) \ ACT(ES_OBJECT_UNLIT) \ ACT(ES_OBJECTPASS) \ ACT(ES_OBJECTPASS_REF) \ ACT(ES_OBJECTPASS_RIMLIT) \ ACT(ES_DISPLACE) \ - ACT(ES_PASSFAR) \ #define ENUM(a) a, #define STR(a) #a,