From: Steinar H. Gunderson Date: Tue, 2 Oct 2012 20:19:31 +0000 (+0200) Subject: Mark some functions in Effect as const. X-Git-Tag: 1.0~418 X-Git-Url: https://git.sesse.net/?p=movit;a=commitdiff_plain;h=3915264bd8fde4d550e47c10a67a2741625b9033 Mark some functions in Effect as const. --- diff --git a/colorspace_conversion_effect.h b/colorspace_conversion_effect.h index 3b21804..323526b 100644 --- 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 02fc1f7..edf100c 100644 --- 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::const_iterator it = params_float.begin(); diff --git a/effect.h b/effect.h index af2f516..196682f 100644 --- 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 7016341..e4c79ab 100644 --- 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 f079e70..f3e20c5 100644 --- 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;