Rename output_glsl to output_fragment_shader.

diff --git a/colorspace_conversion_effect.cpp b/colorspace_conversion_effect.cpp
index 4cef41351a912fe6072cdbecd6af9f89056946ed..4688b8cff8726f61d149da8c578cd2f20110abd7 100644 (file)
--- a/colorspace_conversion_effect.cpp
+++ b/colorspace_conversion_effect.cpp
@@ -65,7 +65,7 @@ void get_xyz_matrix(ColorSpace space, Matrix3x3 m)
        m[2] = Z_R; m[5] = Z_G; m[8] = Z_B;
 }
 
        m[2] = Z_R; m[5] = Z_G; m[8] = Z_B;
 }
 

-std::string ColorSpaceConversionEffect::output_glsl()
+std::string ColorSpaceConversionEffect::output_fragment_shader()

 {
        // Create a matrix to convert from source space -> XYZ,
        // another matrix to convert from XYZ -> destination space,
 {
        // Create a matrix to convert from source space -> XYZ,
        // another matrix to convert from XYZ -> destination space,

diff --git a/colorspace_conversion_effect.h b/colorspace_conversion_effect.h
index 6efc2a2c8e11b5cd4b0b46cf51d6e3202325fb37..3b21804cac103f56b2d71eaecc7ae93139266b3f 100644 (file)
--- a/colorspace_conversion_effect.h
+++ b/colorspace_conversion_effect.h
@@ -7,7 +7,7 @@
 class ColorSpaceConversionEffect : public Effect {
 public:
        ColorSpaceConversionEffect();
 class ColorSpaceConversionEffect : public Effect {
 public:
        ColorSpaceConversionEffect();

-       std::string output_glsl();
+       std::string output_fragment_shader();

 
        virtual bool needs_srgb_primaries() { return false; }
 
 
        virtual bool needs_srgb_primaries() { return false; }
 

diff --git a/effect.h b/effect.h
index 32d8f402f09598c88f2f4a989a9c70ecdead7206..1478c6e474a14ea9c42b6b603fdcc08bbdc80d36 100644 (file)
--- a/effect.h
+++ b/effect.h
@@ -35,7 +35,7 @@ public:
        virtual bool needs_mipmaps() { return false; }
 
        virtual std::string output_convenience_uniforms();
        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(GLuint glsl_program_num, const std::string& prefix);
 
 
        virtual void set_uniforms(GLuint glsl_program_num, const std::string& prefix);
 

diff --git a/effect_chain.cpp b/effect_chain.cpp
index 9eee1f66faaf1622715002d44edd195708cfc9fc..5c1ba69e64a71ad65fe34ad3d7c53d76f4471fd9 100644 (file)
--- a/effect_chain.cpp
+++ b/effect_chain.cpp
@@ -165,7 +165,7 @@ void EffectChain::finalize()
                frag_shader += "\n";
                frag_shader += std::string("#define FUNCNAME ") + effect_id + "\n";
                frag_shader += replace_prefix(effects[i]->output_convenience_uniforms(), effect_id);
                frag_shader += "\n";
                frag_shader += std::string("#define FUNCNAME ") + effect_id + "\n";
                frag_shader += replace_prefix(effects[i]->output_convenience_uniforms(), effect_id);

-               frag_shader += replace_prefix(effects[i]->output_glsl(), effect_id);
+               frag_shader += replace_prefix(effects[i]->output_fragment_shader(), effect_id);

                frag_shader += "#undef PREFIX\n";
                frag_shader += "#undef FUNCNAME\n";
                frag_shader += "#undef LAST_INPUT\n";
                frag_shader += "#undef PREFIX\n";
                frag_shader += "#undef FUNCNAME\n";
                frag_shader += "#undef LAST_INPUT\n";

diff --git a/gamma_compression_effect.cpp b/gamma_compression_effect.cpp
index 5a76ec35556f1e6bfa1a801de36bf4aefbd6edb5..b6a737bf4416315b79f1f8e58449a4440679ef60 100644 (file)
--- a/gamma_compression_effect.cpp
+++ b/gamma_compression_effect.cpp
@@ -9,7 +9,7 @@ GammaCompressionEffect::GammaCompressionEffect()
        register_int("destination_curve", (int *)&destination_curve);
 }
 
        register_int("destination_curve", (int *)&destination_curve);
 }
 

-std::string GammaCompressionEffect::output_glsl()
+std::string GammaCompressionEffect::output_fragment_shader()

 {
        switch (destination_curve) {
        case GAMMA_LINEAR:
 {
        switch (destination_curve) {
        case GAMMA_LINEAR:

diff --git a/gamma_compression_effect.h b/gamma_compression_effect.h
index fdc6eee94aa96dc74448e5a2ef392f74a5e59937..3f32f5ccb8f7fa02a9d9a4d409369980b6dcec1b 100644 (file)
--- a/gamma_compression_effect.h
+++ b/gamma_compression_effect.h
@@ -7,7 +7,7 @@
 class GammaCompressionEffect : public Effect {
 public:
        GammaCompressionEffect();
 class GammaCompressionEffect : public Effect {
 public:
        GammaCompressionEffect();

-       std::string output_glsl();
+       std::string output_fragment_shader();

 
        virtual bool needs_srgb_primaries() { return false; }
 
 
        virtual bool needs_srgb_primaries() { return false; }
 

diff --git a/gamma_expansion_effect.cpp b/gamma_expansion_effect.cpp
index fdf34f58fe115b1c7bcd0cd9a95836606e843ba5..8930b9f1d4a8ed76cdf450682970be13bbd29d10 100644 (file)
--- a/gamma_expansion_effect.cpp
+++ b/gamma_expansion_effect.cpp
@@ -9,7 +9,7 @@ GammaExpansionEffect::GammaExpansionEffect()
        register_int("source_curve", (int *)&source_curve);
 }
 
        register_int("source_curve", (int *)&source_curve);
 }
 

-std::string GammaExpansionEffect::output_glsl()
+std::string GammaExpansionEffect::output_fragment_shader()

 {
        switch (source_curve) {
        case GAMMA_LINEAR:
 {
        switch (source_curve) {
        case GAMMA_LINEAR:

diff --git a/gamma_expansion_effect.h b/gamma_expansion_effect.h
index 41d4bf0a9e7a727fdb65fa9bf43c11a3558d0879..1125d11f83cab515460d721e7011a434dfbea1ff 100644 (file)
--- a/gamma_expansion_effect.h
+++ b/gamma_expansion_effect.h
@@ -7,7 +7,7 @@
 class GammaExpansionEffect : public Effect {
 public:
        GammaExpansionEffect();
 class GammaExpansionEffect : public Effect {
 public:
        GammaExpansionEffect();

-       std::string output_glsl();
+       std::string output_fragment_shader();

 
        virtual bool needs_linear_light() { return false; }
        virtual bool needs_srgb_primaries() { return false; }
 
        virtual bool needs_linear_light() { return false; }
        virtual bool needs_srgb_primaries() { return false; }

diff --git a/lift_gamma_gain_effect.cpp b/lift_gamma_gain_effect.cpp
index 8be3a7692ea35b782ffbbd7f381d25e7841f1338..d4e3205e10e176d2198f8f18b870086e5a9c1a04 100644 (file)
--- a/lift_gamma_gain_effect.cpp
+++ b/lift_gamma_gain_effect.cpp
@@ -17,7 +17,7 @@ LiftGammaGainEffect::LiftGammaGainEffect()
        register_vec3("gain", (float *)&gain);
 }
 
        register_vec3("gain", (float *)&gain);
 }
 

-std::string LiftGammaGainEffect::output_glsl()
+std::string LiftGammaGainEffect::output_fragment_shader()

 {
        return read_file("lift_gamma_gain_effect.glsl");
 }
 {
        return read_file("lift_gamma_gain_effect.glsl");
 }

diff --git a/lift_gamma_gain_effect.h b/lift_gamma_gain_effect.h
index 0c42319166046bb05c1bcb6d468e29bd5c7cbf64..271b2a1541f7bd0a6db651781ed093a06767d857 100644 (file)
--- a/lift_gamma_gain_effect.h
+++ b/lift_gamma_gain_effect.h
@@ -6,7 +6,7 @@
 class LiftGammaGainEffect : public Effect {
 public:
        LiftGammaGainEffect();
 class LiftGammaGainEffect : public Effect {
 public:
        LiftGammaGainEffect();

-       std::string output_glsl();
+       std::string output_fragment_shader();

 
        void set_uniforms(GLuint glsl_program_num, const std::string &prefix);
 
 
        void set_uniforms(GLuint glsl_program_num, const std::string &prefix);
 

diff --git a/saturation_effect.cpp b/saturation_effect.cpp
index 376e0fc26d0da5bc3e3211e9b1fd99011f0620e3..d6d30e51523568ce51b556265ab353121c4c4762 100644 (file)
--- a/saturation_effect.cpp
+++ b/saturation_effect.cpp
@@ -9,7 +9,7 @@ SaturationEffect::SaturationEffect()
        register_float("saturation", &saturation);
 }
 
        register_float("saturation", &saturation);
 }
 

-std::string SaturationEffect::output_glsl()
+std::string SaturationEffect::output_fragment_shader()

 {
        return read_file("saturation_effect.glsl");
 }
 {
        return read_file("saturation_effect.glsl");
 }

diff --git a/saturation_effect.h b/saturation_effect.h
index 3f057e9a4b5e00f2cdc5b0769e27328e14435009..6cfc3d0ee0392c49d18e5a0b3f782c40fc5889e9 100644 (file)
--- a/saturation_effect.h
+++ b/saturation_effect.h
@@ -6,7 +6,7 @@
 class SaturationEffect : public Effect {
 public:
        SaturationEffect();
 class SaturationEffect : public Effect {
 public:
        SaturationEffect();

-       std::string output_glsl();
+       std::string output_fragment_shader();

 
 private:
        float saturation;
 
 private:
        float saturation;

diff --git a/vignette_effect.cpp b/vignette_effect.cpp
index 8fde1f7e3b33ae65ab94d76c3e4d875f0aece988..aecd3bdae9de90381454a76242a46a066edef29c 100644 (file)
--- a/vignette_effect.cpp
+++ b/vignette_effect.cpp
@@ -17,7 +17,7 @@ VignetteEffect::VignetteEffect()
        register_float("inner_radius", (float *)&inner_radius);
 }
 
        register_float("inner_radius", (float *)&inner_radius);
 }
 

-std::string VignetteEffect::output_glsl()
+std::string VignetteEffect::output_fragment_shader()

 {
        return read_file("vignette_effect.glsl");
 }
 {
        return read_file("vignette_effect.glsl");
 }

diff --git a/vignette_effect.h b/vignette_effect.h
index cadb58c456f342f1ba472e4fb4b19cb66efe8837..b8e0f68c7f1c5cfe16bc82fef2d9c5abcb9fd83f 100644 (file)
--- a/vignette_effect.h
+++ b/vignette_effect.h
@@ -6,7 +6,7 @@
 class VignetteEffect : public Effect {
 public:
        VignetteEffect();
 class VignetteEffect : public Effect {
 public:
        VignetteEffect();

-       std::string output_glsl();
+       std::string output_fragment_shader();

 
        void set_uniforms(GLuint glsl_program_num, const std::string &prefix);
 
 
        void set_uniforms(GLuint glsl_program_num, const std::string &prefix);