Some more cleanup of includes and forward declarations

[libs/gl.git] / source / effects / effect.h

diff --git a/source/effects/effect.h b/source/effects/effect.h
index bc9e19ec818f2a392889866bdf36428c7c00024b..d763f251bd473b7b22e58c2230400805442d2fdd 100644 (file)
--- a/source/effects/effect.h
+++ b/source/effects/effect.h
@@ -2,14 +2,11 @@
 #define MSP_GL_EFFECT_H_
 
 #include <set>
-#include <msp/core/refptr.h>
 #include "renderable.h"
 
 namespace Msp {
 namespace GL {
 
-class Sampler;
-
 /**
 Effects are used to wrap other renderables and give them additional visual
 properties.  An Effect's render method should set up the necessary state, call
@@ -21,16 +18,13 @@ protected:
        Renderable &renderable;
        std::set<Tag> enabled_passes;
 
-private:
-       static WeakPtr<Sampler> linear_sampler;
-
 protected:
        Effect(Renderable &);
 public:
        virtual ~Effect() { }
 
-       void enable_for_pass(const Tag &);
-       void disable_for_pass(const Tag &);
+       void enable_for_pass(Tag);
+       void disable_for_pass(Tag);
 
        virtual const Matrix *get_matrix() const { return renderable.get_matrix(); }
        virtual const Geometry::BoundingSphere<float, 3> *get_bounding_sphere() const { return renderable.get_bounding_sphere(); }
@@ -38,8 +32,7 @@ public:
        virtual void setup_frame(Renderer &r) { renderable.setup_frame(r); }
        virtual void finish_frame() { renderable.finish_frame(); }
 
-protected:
-       static RefPtr<Sampler> get_linear_sampler();
+       virtual void set_debug_name(const std::string &) = 0;
 };
 
 } // namespace GL