Rename .glsl to .vert/.frag.
authorSteinar H. Gunderson <sgunderson@bigfoot.com>
Tue, 2 Oct 2012 11:50:48 +0000 (13:50 +0200)
committerSteinar H. Gunderson <sgunderson@bigfoot.com>
Tue, 2 Oct 2012 11:50:48 +0000 (13:50 +0200)
22 files changed:
colorspace_conversion_effect.cpp
colorspace_conversion_effect.frag [moved from colorspace_conversion_effect.glsl with 100% similarity]
effect.cpp
effect_chain.cpp
footer.frag [moved from fs-footer.glsl with 100% similarity]
footer.vert [moved from vs-footer.glsl with 100% similarity]
gamma_compression_effect.cpp
gamma_compression_effect_rec709.frag [moved from gamma_compression_effect_rec709.glsl with 100% similarity]
gamma_compression_effect_srgb.frag [moved from gamma_compression_effect_srgb.glsl with 100% similarity]
gamma_expansion_effect.cpp
gamma_expansion_effect_rec709.frag [moved from gamma_expansion_effect_rec709.glsl with 100% similarity]
gamma_expansion_effect_srgb.frag [moved from gamma_expansion_effect_srgb.glsl with 100% similarity]
header.frag [moved from fs-header.glsl with 100% similarity]
header.vert [moved from vs-header.glsl with 100% similarity]
identity.frag [moved from identity-fs.glsl with 100% similarity]
identity.vert [moved from identity-vs.glsl with 100% similarity]
lift_gamma_gain_effect.cpp
lift_gamma_gain_effect.frag [moved from lift_gamma_gain_effect.glsl with 100% similarity]
saturation_effect.cpp
saturation_effect.frag [moved from saturation_effect.glsl with 100% similarity]
vignette_effect.cpp
vignette_effect.frag [moved from vignette_effect.glsl with 100% similarity]

index 4688b8c..4f6bf61 100644 (file)
@@ -94,5 +94,5 @@ std::string ColorSpaceConversionEffect::output_fragment_shader()
                m[0], m[3], m[6],
                m[1], m[4], m[7],
                m[2], m[5], m[8]);
-       return buf + read_file("colorspace_conversion_effect.glsl");
+       return buf + read_file("colorspace_conversion_effect.frag");
 }
index 15fff8c..6f9d4c5 100644 (file)
@@ -155,5 +155,5 @@ void Effect::set_uniforms(GLuint glsl_program_num, const std::string& prefix)
 
 std::string Effect::output_vertex_shader()
 {
-       return read_file("identity-vs.glsl");
+       return read_file("identity.vert");
 }
index b3c9099..04b698f 100644 (file)
@@ -156,7 +156,7 @@ void EffectChain::finalize()
                current_gamma_curve = output_format.gamma_curve;
        }
        
-       std::string vert_shader = read_file("vs-header.glsl");
+       std::string vert_shader = read_file("header.vert");
        for (unsigned i = 0; i < effects.size(); ++i) {
                char effect_id[256];
                sprintf(effect_id, "eff%d", i);
@@ -171,10 +171,10 @@ void EffectChain::finalize()
                vert_shader += std::string("#define LAST_INPUT ") + effect_id + "\n";
                vert_shader += "\n";
        }
-       vert_shader.append(read_file("vs-footer.glsl"));
+       vert_shader.append(read_file("footer.vert"));
        printf("%s\n", vert_shader.c_str());
 
-       std::string frag_shader = read_file("fs-header.glsl");
+       std::string frag_shader = read_file("header.frag");
        for (unsigned i = 0; i < effects.size(); ++i) {
                char effect_id[256];
                sprintf(effect_id, "eff%d", i);
@@ -189,7 +189,7 @@ void EffectChain::finalize()
                frag_shader += std::string("#define LAST_INPUT ") + effect_id + "\n";
                frag_shader += "\n";
        }
-       frag_shader.append(read_file("fs-footer.glsl"));
+       frag_shader.append(read_file("footer.frag"));
        printf("%s\n", frag_shader.c_str());
        
        glsl_program_num = glCreateProgram();
similarity index 100%
rename from fs-footer.glsl
rename to footer.frag
similarity index 100%
rename from vs-footer.glsl
rename to footer.vert
index 32e4477..69d2493 100644 (file)
@@ -13,11 +13,11 @@ std::string GammaCompressionEffect::output_fragment_shader()
 {
        switch (destination_curve) {
        case GAMMA_LINEAR:
-               return read_file("identity-fs.glsl");
+               return read_file("identity.frag");
        case GAMMA_sRGB:
-               return read_file("gamma_compression_effect_srgb.glsl");
+               return read_file("gamma_compression_effect_srgb.frag");
        case GAMMA_REC_709:  // and GAMMA_REC_601
-               return read_file("gamma_compression_effect_rec709.glsl");
+               return read_file("gamma_compression_effect_rec709.frag");
        default:
                assert(false);
        }
index 9391a91..61f0330 100644 (file)
@@ -13,11 +13,11 @@ std::string GammaExpansionEffect::output_fragment_shader()
 {
        switch (source_curve) {
        case GAMMA_LINEAR:
-               return read_file("identity-fs.glsl");
+               return read_file("identity.frag");
        case GAMMA_sRGB:
-               return read_file("gamma_expansion_effect_srgb.glsl");
+               return read_file("gamma_expansion_effect_srgb.frag");
        case GAMMA_REC_709:  // and GAMMA_REC_601
-               return read_file("gamma_expansion_effect_rec709.glsl");
+               return read_file("gamma_expansion_effect_rec709.frag");
        default:
                assert(false);
        }
similarity index 100%
rename from fs-header.glsl
rename to header.frag
similarity index 100%
rename from vs-header.glsl
rename to header.vert
similarity index 100%
rename from identity-fs.glsl
rename to identity.frag
similarity index 100%
rename from identity-vs.glsl
rename to identity.vert
index d4e3205..993525d 100644 (file)
@@ -19,7 +19,7 @@ LiftGammaGainEffect::LiftGammaGainEffect()
 
 std::string LiftGammaGainEffect::output_fragment_shader()
 {
-       return read_file("lift_gamma_gain_effect.glsl");
+       return read_file("lift_gamma_gain_effect.frag");
 }
 
 void LiftGammaGainEffect::set_uniforms(GLuint glsl_program_num, const std::string &prefix)
index d6d30e5..3eff6e4 100644 (file)
@@ -11,5 +11,5 @@ SaturationEffect::SaturationEffect()
 
 std::string SaturationEffect::output_fragment_shader()
 {
-       return read_file("saturation_effect.glsl");
+       return read_file("saturation_effect.frag");
 }
index aecd3bd..f1449ae 100644 (file)
@@ -19,7 +19,7 @@ VignetteEffect::VignetteEffect()
 
 std::string VignetteEffect::output_fragment_shader()
 {
-       return read_file("vignette_effect.glsl");
+       return read_file("vignette_effect.frag");
 }
 
 void VignetteEffect::set_uniforms(GLuint glsl_program_num, const std::string &prefix)
similarity index 100%
rename from vignette_effect.glsl
rename to vignette_effect.frag