Mark some functions in Effect as const.

diff --git a/colorspace_conversion_effect.h b/colorspace_conversion_effect.h
index 3b21804cac103f56b2d71eaecc7ae93139266b3f..323526b4978d53a9250b352be56371e5082d800a 100644 (file)
--- a/colorspace_conversion_effect.h
+++ b/colorspace_conversion_effect.h
@@ -9,7 +9,7 @@ public:
        ColorSpaceConversionEffect();
        std::string output_fragment_shader();
 
-       virtual bool needs_srgb_primaries() { return false; }
+       virtual bool needs_srgb_primaries() const { return false; }
 
 private:
        ColorSpace source_space, destination_space;

diff --git a/effect.cpp b/effect.cpp
index 02fc1f729cd5bec757860fe3039624a145392176..edf100c566c549417f7df158472a6803c3e2da87 100644 (file)
--- a/effect.cpp
+++ b/effect.cpp
@@ -147,7 +147,7 @@ void Effect::invalidate_1d_texture(const std::string &key)
 
 // Output convenience uniforms for each parameter.
 // These will be filled in per-frame.
-std::string Effect::output_convenience_uniforms()
+std::string Effect::output_convenience_uniforms() const
 {
        std::string output = "";
        for (std::map<std::string, float*>::const_iterator it = params_float.begin();

diff --git a/effect.h b/effect.h
index af2f516593c4bea25404a10ec1c76049006713da..196682f3f3f652450dd01aa809d5394064d46da6 100644 (file)
--- a/effect.h
+++ b/effect.h
@@ -30,12 +30,12 @@ void set_uniform_vec3(GLuint glsl_program_num, const std::string &prefix, const
 
 class Effect {
 public: 
-       virtual bool needs_linear_light() { return true; }
-       virtual bool needs_srgb_primaries() { return true; }
-       virtual bool needs_many_samples() { return false; }
-       virtual bool needs_mipmaps() { return false; }
+       virtual bool needs_linear_light() const { return true; }
+       virtual bool needs_srgb_primaries() const { return true; }
+       virtual bool needs_many_samples() const { return false; }
+       virtual bool needs_mipmaps() const { return false; }
 
-       virtual std::string output_convenience_uniforms();
+       virtual std::string output_convenience_uniforms() const;
        virtual std::string output_fragment_shader() = 0;
 
        virtual void set_uniforms(GLuint glsl_program_num, const std::string& prefix, unsigned *sampler_num);

diff --git a/gamma_compression_effect.h b/gamma_compression_effect.h
index 70163419388281da8b6cb54d3bd2c117dd250cd6..e4c79ab0c9faac750e877a84d5b7d768a65ef8ab 100644 (file)
--- a/gamma_compression_effect.h
+++ b/gamma_compression_effect.h
@@ -11,7 +11,7 @@ public:
        GammaCompressionEffect();
        std::string output_fragment_shader();
 
-       virtual bool needs_srgb_primaries() { return false; }
+       virtual bool needs_srgb_primaries() const { return false; }
 
 private:
        GammaCurve destination_curve;

diff --git a/gamma_expansion_effect.h b/gamma_expansion_effect.h
index f079e7085f6e7ba6f6721f8aa3142e9ddb2f88e6..f3e20c59ed95eba6030750cb04bf1846b37898fe 100644 (file)
--- a/gamma_expansion_effect.h
+++ b/gamma_expansion_effect.h
@@ -11,8 +11,8 @@ public:
        GammaExpansionEffect();
        std::string output_fragment_shader();
 
-       virtual bool needs_linear_light() { return false; }
-       virtual bool needs_srgb_primaries() { return false; }
+       virtual bool needs_linear_light() const { return false; }
+       virtual bool needs_srgb_primaries() const { return false; }
 
 private:
        GammaCurve source_curve;