From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Fri, 5 Oct 2012 23:14:08 +0000 (+0200)
Subject: DiffusionEffect should not have any GLSL stuff in it.
X-Git-Tag: 1.0~373
X-Git-Url: https://git.sesse.net/?p=movit;a=commitdiff_plain;h=1e2d23133575fc1cfeb14652e4b383883bf24512

DiffusionEffect should not have any GLSL stuff in it.
---

diff --git a/diffusion_effect.cpp b/diffusion_effect.cpp
index 4e996b8..8d2903b 100644
--- a/diffusion_effect.cpp
+++ b/diffusion_effect.cpp
@@ -12,11 +12,6 @@ DiffusionEffect::DiffusionEffect()
 {
 }
 
-std::string DiffusionEffect::output_fragment_shader()
-{
-	return read_file("sandbox_effect.frag");
-}
-
 void DiffusionEffect::add_self_to_effect_chain(EffectChain *chain, const std::vector<Effect *> &inputs) {
 	assert(inputs.size() == 1);
 	blur->add_self_to_effect_chain(chain, inputs);
diff --git a/diffusion_effect.h b/diffusion_effect.h
index 4223d22..bda2649 100644
--- a/diffusion_effect.h
+++ b/diffusion_effect.h
@@ -20,10 +20,16 @@ class OverlayMatteEffect;
 class DiffusionEffect : public Effect {
 public:
 	DiffusionEffect();
-	std::string output_fragment_shader();
 
 	virtual void add_self_to_effect_chain(EffectChain *chain, const std::vector<Effect *> &input);
 	virtual bool set_float(const std::string &key, float value);
+	
+	virtual std::string output_fragment_shader() {
+		assert(false);
+	}
+	virtual void set_gl_state(GLuint glsl_program_num, const std::string &prefix, unsigned *sampler_num) {
+		assert(false);
+	}
 
 private:
 	BlurEffect *blur;