From 1da42b81a667a8ff8d093d480021a085c76884e4 Mon Sep 17 00:00:00 2001 From: vincentlj Date: Sun, 12 Jan 2014 23:47:34 +0000 Subject: [PATCH] Remove PPDisplace provider. git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15029 178a84e3-b1eb-0310-8ba1-8eac791a3b58 --- src/graphics/callbacks.cpp | 19 ------------------- src/graphics/callbacks.hpp | 8 -------- src/graphics/shaders.cpp | 3 --- src/graphics/shaders.hpp | 1 - 4 files changed, 31 deletions(-) diff --git a/src/graphics/callbacks.cpp b/src/graphics/callbacks.cpp index 5d1fb6f51..c079f3a96 100644 --- a/src/graphics/callbacks.cpp +++ b/src/graphics/callbacks.cpp @@ -815,25 +815,6 @@ void DisplaceProvider::OnSetConstants(IMaterialRendererServices *srv, int) //------------------------------------- -void PPDisplaceProvider::OnSetConstants(IMaterialRendererServices *srv, int) -{ - int viz = irr_driver->getDistortViz(); - srv->setPixelShaderConstant("viz", &viz, 1); - - if (!firstdone) - { - int tex = 0; - srv->setPixelShaderConstant("tex", &tex, 1); - - tex = 1; - srv->setPixelShaderConstant("dtex", &tex, 1); - - firstdone = true; - } -} - -//------------------------------------- - void FogProvider::OnSetConstants(IMaterialRendererServices *srv, int) { const Track * const track = World::getWorld()->getTrack(); diff --git a/src/graphics/callbacks.hpp b/src/graphics/callbacks.hpp index f54b1d18c..1099e23cb 100644 --- a/src/graphics/callbacks.hpp +++ b/src/graphics/callbacks.hpp @@ -693,14 +693,6 @@ private: // -class PPDisplaceProvider: public CallBase -{ -public: - virtual void OnSetConstants(video::IMaterialRendererServices *srv, int); -}; - -// - class FogProvider: public CallBase { public: diff --git a/src/graphics/shaders.cpp b/src/graphics/shaders.cpp index 4b26973db..ed7da6b42 100644 --- a/src/graphics/shaders.cpp +++ b/src/graphics/shaders.cpp @@ -63,7 +63,6 @@ Shaders::Shaders() m_callbacks[ES_SHADOWGEN] = new ShadowGenProvider(); m_callbacks[ES_CAUSTICS] = new CausticsProvider(); m_callbacks[ES_DISPLACE] = new DisplaceProvider(); - m_callbacks[ES_PPDISPLACE] = new PPDisplaceProvider(); m_callbacks[ES_FOG] = new FogProvider(); for(s32 i=0 ; i < ES_COUNT ; i++) @@ -217,8 +216,6 @@ void Shaders::loadShaders() m_shaders[ES_DISPLACE] = glsl(dir + "displace.vert", dir + "displace.frag", m_callbacks[ES_DISPLACE]); - m_shaders[ES_PPDISPLACE] = glsl(std::string(""), dir + "ppdisplace.frag", - m_callbacks[ES_PPDISPLACE]); m_shaders[ES_PASSFAR] = glsl(dir + "farplane.vert", dir + "colorize.frag", m_callbacks[ES_COLORIZE]); diff --git a/src/graphics/shaders.hpp b/src/graphics/shaders.hpp index ecafde294..f6bf569d2 100644 --- a/src/graphics/shaders.hpp +++ b/src/graphics/shaders.hpp @@ -73,7 +73,6 @@ using namespace irr; ACT(ES_SHADOWGEN) \ ACT(ES_CAUSTICS) \ ACT(ES_DISPLACE) \ - ACT(ES_PPDISPLACE) \ ACT(ES_PASSFAR) \ ACT(ES_FOG)