Kill the hard-coded texture enums (yay).

[movit] / effect.h

diff --git a/effect.h b/effect.h
index f92201e6b40d56ab6812dac7669ce09da13f6a69..1478c6e474a14ea9c42b6b603fdcc08bbdc80d36 100644 (file)
--- 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,9 @@ public:
        virtual bool needs_mipmaps() { return false; }
 
        virtual std::string output_convenience_uniforms();
-       virtual std::string output_glsl() = 0;
+       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);