From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Tue, 2 Oct 2012 11:35:59 +0000 (+0200)
Subject: Rename output_glsl to output_fragment_shader.
X-Git-Tag: 1.0~431
X-Git-Url: https://git.sesse.net/?p=movit;a=commitdiff_plain;h=17c083aad45a10df14c38cfe879a87220dfd4fb9

Rename output_glsl to output_fragment_shader.
---

diff --git a/colorspace_conversion_effect.cpp b/colorspace_conversion_effect.cpp
index 4cef413..4688b8c 100644
--- 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;
 }
 
-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,
diff --git a/colorspace_conversion_effect.h b/colorspace_conversion_effect.h
index 6efc2a2..3b21804 100644
--- a/colorspace_conversion_effect.h
+++ b/colorspace_conversion_effect.h
@@ -7,7 +7,7 @@
 class ColorSpaceConversionEffect : public Effect {
 public:
 	ColorSpaceConversionEffect();
-	std::string output_glsl();
+	std::string output_fragment_shader();
 
 	virtual bool needs_srgb_primaries() { return false; }
 
diff --git a/effect.h b/effect.h
index 32d8f40..1478c6e 100644
--- a/effect.h
+++ b/effect.h
@@ -35,7 +35,7 @@ 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(GLuint glsl_program_num, const std::string& prefix);
 
diff --git a/effect_chain.cpp b/effect_chain.cpp
index 9eee1f6..5c1ba69 100644
--- 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 += 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";
diff --git a/gamma_compression_effect.cpp b/gamma_compression_effect.cpp
index 5a76ec3..b6a737b 100644
--- a/gamma_compression_effect.cpp
+++ b/gamma_compression_effect.cpp
@@ -9,7 +9,7 @@ GammaCompressionEffect::GammaCompressionEffect()
 	register_int("destination_curve", (int *)&destination_curve);
 }
 
-std::string GammaCompressionEffect::output_glsl()
+std::string GammaCompressionEffect::output_fragment_shader()
 {
 	switch (destination_curve) {
 	case GAMMA_LINEAR:
diff --git a/gamma_compression_effect.h b/gamma_compression_effect.h
index fdc6eee..3f32f5c 100644
--- a/gamma_compression_effect.h
+++ b/gamma_compression_effect.h
@@ -7,7 +7,7 @@
 class GammaCompressionEffect : public Effect {
 public:
 	GammaCompressionEffect();
-	std::string output_glsl();
+	std::string output_fragment_shader();
 
 	virtual bool needs_srgb_primaries() { return false; }
 
diff --git a/gamma_expansion_effect.cpp b/gamma_expansion_effect.cpp
index fdf34f5..8930b9f 100644
--- a/gamma_expansion_effect.cpp
+++ b/gamma_expansion_effect.cpp
@@ -9,7 +9,7 @@ GammaExpansionEffect::GammaExpansionEffect()
 	register_int("source_curve", (int *)&source_curve);
 }
 
-std::string GammaExpansionEffect::output_glsl()
+std::string GammaExpansionEffect::output_fragment_shader()
 {
 	switch (source_curve) {
 	case GAMMA_LINEAR:
diff --git a/gamma_expansion_effect.h b/gamma_expansion_effect.h
index 41d4bf0..1125d11 100644
--- a/gamma_expansion_effect.h
+++ b/gamma_expansion_effect.h
@@ -7,7 +7,7 @@
 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; }
diff --git a/lift_gamma_gain_effect.cpp b/lift_gamma_gain_effect.cpp
index 8be3a76..d4e3205 100644
--- a/lift_gamma_gain_effect.cpp
+++ b/lift_gamma_gain_effect.cpp
@@ -17,7 +17,7 @@ LiftGammaGainEffect::LiftGammaGainEffect()
 	register_vec3("gain", (float *)&gain);
 }
 
-std::string LiftGammaGainEffect::output_glsl()
+std::string LiftGammaGainEffect::output_fragment_shader()
 {
 	return read_file("lift_gamma_gain_effect.glsl");
 }
diff --git a/lift_gamma_gain_effect.h b/lift_gamma_gain_effect.h
index 0c42319..271b2a1 100644
--- a/lift_gamma_gain_effect.h
+++ b/lift_gamma_gain_effect.h
@@ -6,7 +6,7 @@
 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);
 
diff --git a/saturation_effect.cpp b/saturation_effect.cpp
index 376e0fc..d6d30e5 100644
--- a/saturation_effect.cpp
+++ b/saturation_effect.cpp
@@ -9,7 +9,7 @@ SaturationEffect::SaturationEffect()
 	register_float("saturation", &saturation);
 }
 
-std::string SaturationEffect::output_glsl()
+std::string SaturationEffect::output_fragment_shader()
 {
 	return read_file("saturation_effect.glsl");
 }
diff --git a/saturation_effect.h b/saturation_effect.h
index 3f057e9..6cfc3d0 100644
--- a/saturation_effect.h
+++ b/saturation_effect.h
@@ -6,7 +6,7 @@
 class SaturationEffect : public Effect {
 public:
 	SaturationEffect();
-	std::string output_glsl();
+	std::string output_fragment_shader();
 
 private:
 	float saturation;
diff --git a/vignette_effect.cpp b/vignette_effect.cpp
index 8fde1f7..aecd3bd 100644
--- a/vignette_effect.cpp
+++ b/vignette_effect.cpp
@@ -17,7 +17,7 @@ VignetteEffect::VignetteEffect()
 	register_float("inner_radius", (float *)&inner_radius);
 }
 
-std::string VignetteEffect::output_glsl()
+std::string VignetteEffect::output_fragment_shader()
 {
 	return read_file("vignette_effect.glsl");
 }
diff --git a/vignette_effect.h b/vignette_effect.h
index cadb58c..b8e0f68 100644
--- a/vignette_effect.h
+++ b/vignette_effect.h
@@ -6,7 +6,7 @@
 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);