X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=effect.h;h=6154dacaec1cf0e55cb7d3e734a3ed3c790cc16b;hp=9d81a562e0aa8f53b18c8e0d6e8e5990076f0cfd;hb=5307e8adafcb1fda2579793730a00b6b978fd701;hpb=9c12e38b7cd88a77ef297d080b7c41e6bd6326fb

diff --git a/effect.h b/effect.h
index 9d81a56..6154dac 100644
--- a/effect.h
+++ b/effect.h
@@ -332,9 +332,9 @@ protected:
 	//
 	// Calling register_* will automatically imply register_uniform_*,
 	// except for register_int as noted above.
+	void register_uniform_sampler2d(const std::string &key, const int *value);
 	void register_uniform_bool(const std::string &key, const bool *value);
 	void register_uniform_int(const std::string &key, const int *value);  // Note: Requires GLSL 1.30 or newer.
-	void register_uniform_sampler2d(const std::string &key, const int *value);
 	void register_uniform_float(const std::string &key, const float *value);
 	void register_uniform_vec2(const std::string &key, const float *values);
 	void register_uniform_vec3(const std::string &key, const float *values);
@@ -351,9 +351,9 @@ private:
 	std::map<std::string, float *> params_vec4;
 
 	// Picked out by EffectChain during finalization.
+	std::vector<Uniform<int> > uniforms_sampler2d;
 	std::vector<Uniform<bool> > uniforms_bool;
 	std::vector<Uniform<int> > uniforms_int;
-	std::vector<Uniform<int> > uniforms_sampler2d;
 	std::vector<Uniform<float> > uniforms_float;
 	std::vector<Uniform<float> > uniforms_vec2;
 	std::vector<Uniform<float> > uniforms_vec3;