Renderer|FX: Added a convenience method for accessing GLShaderBank

skyjake · Nov 17, 2013 · 15de061 · 15de061
1 parent 9f99a1a
commit 15de061
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/doomsday/client/include/render/consoleeffect.h b/doomsday/client/include/render/consoleeffect.h
@@ -21,6 +21,7 @@
 
 #include <de/libdeng2.h>
 #include <de/Rectangle>
+#include <de/GLShaderBank>
 
 /**
  * Draws camera lens effects for a particular player console. Maintains
@@ -45,6 +46,8 @@ class ConsoleEffect
 
     bool isInited() const;
 
+    de::GLShaderBank &shaders() const;
+
     /**
      * Allocate and prepare GL resources for drawing. Derived classes must call
      * the base class method if they override it.

diff --git a/doomsday/client/src/render/consoleeffect.cpp b/doomsday/client/src/render/consoleeffect.cpp
@@ -18,6 +18,7 @@
 
 #include "render/consoleeffect.h"
 #include "render/viewports.h"
+#include "clientapp.h"
 
 using namespace de;
 
@@ -57,6 +58,11 @@ bool ConsoleEffect::isInited() const
     return d->inited;
 }
 
+GLShaderBank &ConsoleEffect::shaders() const
+{
+    return ClientApp::glShaderBank();
+}
+
 void ConsoleEffect::glInit()
 {
     d->inited = true;

diff --git a/doomsday/client/src/render/fx/postprocessing.cpp b/doomsday/client/src/render/fx/postprocessing.cpp
@@ -18,6 +18,7 @@
 
 #include "render/fx/postprocessing.h"
 #include "ui/clientwindow.h"
+#include "clientapp.h"
 
 #include <de/Animation>
 #include <de/Drawable>
@@ -80,7 +81,7 @@ DENG2_PIMPL(PostProcessing)
     {
         try
         {
-            root().shaders().build(frame.program(), "fx.post." + name);
+            self.shaders().build(frame.program(), "fx.post." + name);
             LOG_VERBOSE("Post-processing shader \"fx.post.%s\"") << name;
             return true;
         }