X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=effect.h;h=79209b8278153db83d855b157088e9065c7bebce;hb=2b4a7d868112b4995bf6699f5b3aa68e9ec2b308;hp=f92201e6b40d56ab6812dac7669ce09da13f6a69;hpb=bc5560403f4e43d1a32e5e8d94bca68922647779;p=movit

diff --git a/effect.h b/effect.h
index f92201e..79209b8 100644
--- a/effect.h
+++ b/effect.h
@@ -23,9 +23,9 @@ struct RGBTriplet {
 };
 
 // Convenience functions that deal with prepending the prefix.
-void set_uniform_float(GLhandleARB glsl_program_num, const std::string &prefix, const std::string &key, float value);
-void set_uniform_vec2(GLhandleARB glsl_program_num, const std::string &prefix, const std::string &key, const float *values);
-void set_uniform_vec3(GLhandleARB glsl_program_num, const std::string &prefix, const std::string &key, const float *values);
+void set_uniform_float(GLuint glsl_program_num, const std::string &prefix, const std::string &key, float value);
+void set_uniform_vec2(GLuint glsl_program_num, const std::string &prefix, const std::string &key, const float *values);
+void set_uniform_vec3(GLuint glsl_program_num, const std::string &prefix, const std::string &key, const float *values);
 
 class Effect {
 public: 
@@ -35,9 +35,10 @@ public:
 	virtual bool needs_mipmaps() { return false; }
 
 	virtual std::string output_convenience_uniforms();
-	virtual std::string output_glsl() = 0;
+	virtual std::string output_vertex_shader();
+	virtual std::string output_fragment_shader() = 0;
 
-	virtual void set_uniforms(GLhandleARB glsl_program_num, const std::string& prefix);
+	virtual void set_uniforms(GLuint glsl_program_num, const std::string& prefix);
 
 	// Neither of these take ownership.
 	bool set_int(const std::string&, int value);