From: Steinar H. Gunderson Date: Tue, 2 Oct 2012 11:50:48 +0000 (+0200) Subject: Rename .glsl to .vert/.frag. X-Git-Tag: 1.0~428 X-Git-Url: https://git.sesse.net/?p=movit;a=commitdiff_plain;h=d4542f76df5d26843c68b1467e76722cffd801a1 Rename .glsl to .vert/.frag. --- diff --git a/colorspace_conversion_effect.cpp b/colorspace_conversion_effect.cpp index 4688b8c..4f6bf61 100644 --- a/colorspace_conversion_effect.cpp +++ b/colorspace_conversion_effect.cpp @@ -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"); } diff --git a/colorspace_conversion_effect.glsl b/colorspace_conversion_effect.frag similarity index 100% rename from colorspace_conversion_effect.glsl rename to colorspace_conversion_effect.frag diff --git a/effect.cpp b/effect.cpp index 15fff8c..6f9d4c5 100644 --- a/effect.cpp +++ b/effect.cpp @@ -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"); } diff --git a/effect_chain.cpp b/effect_chain.cpp index b3c9099..04b698f 100644 --- a/effect_chain.cpp +++ b/effect_chain.cpp @@ -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(); diff --git a/fs-footer.glsl b/footer.frag similarity index 100% rename from fs-footer.glsl rename to footer.frag diff --git a/vs-footer.glsl b/footer.vert similarity index 100% rename from vs-footer.glsl rename to footer.vert diff --git a/gamma_compression_effect.cpp b/gamma_compression_effect.cpp index 32e4477..69d2493 100644 --- a/gamma_compression_effect.cpp +++ b/gamma_compression_effect.cpp @@ -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); } diff --git a/gamma_compression_effect_rec709.glsl b/gamma_compression_effect_rec709.frag similarity index 100% rename from gamma_compression_effect_rec709.glsl rename to gamma_compression_effect_rec709.frag diff --git a/gamma_compression_effect_srgb.glsl b/gamma_compression_effect_srgb.frag similarity index 100% rename from gamma_compression_effect_srgb.glsl rename to gamma_compression_effect_srgb.frag diff --git a/gamma_expansion_effect.cpp b/gamma_expansion_effect.cpp index 9391a91..61f0330 100644 --- a/gamma_expansion_effect.cpp +++ b/gamma_expansion_effect.cpp @@ -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); } diff --git a/gamma_expansion_effect_rec709.glsl b/gamma_expansion_effect_rec709.frag similarity index 100% rename from gamma_expansion_effect_rec709.glsl rename to gamma_expansion_effect_rec709.frag diff --git a/gamma_expansion_effect_srgb.glsl b/gamma_expansion_effect_srgb.frag similarity index 100% rename from gamma_expansion_effect_srgb.glsl rename to gamma_expansion_effect_srgb.frag diff --git a/fs-header.glsl b/header.frag similarity index 100% rename from fs-header.glsl rename to header.frag diff --git a/vs-header.glsl b/header.vert similarity index 100% rename from vs-header.glsl rename to header.vert diff --git a/identity-fs.glsl b/identity.frag similarity index 100% rename from identity-fs.glsl rename to identity.frag diff --git a/identity-vs.glsl b/identity.vert similarity index 100% rename from identity-vs.glsl rename to identity.vert diff --git a/lift_gamma_gain_effect.cpp b/lift_gamma_gain_effect.cpp index d4e3205..993525d 100644 --- a/lift_gamma_gain_effect.cpp +++ b/lift_gamma_gain_effect.cpp @@ -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) diff --git a/lift_gamma_gain_effect.glsl b/lift_gamma_gain_effect.frag similarity index 100% rename from lift_gamma_gain_effect.glsl rename to lift_gamma_gain_effect.frag diff --git a/saturation_effect.cpp b/saturation_effect.cpp index d6d30e5..3eff6e4 100644 --- a/saturation_effect.cpp +++ b/saturation_effect.cpp @@ -11,5 +11,5 @@ SaturationEffect::SaturationEffect() std::string SaturationEffect::output_fragment_shader() { - return read_file("saturation_effect.glsl"); + return read_file("saturation_effect.frag"); } diff --git a/saturation_effect.glsl b/saturation_effect.frag similarity index 100% rename from saturation_effect.glsl rename to saturation_effect.frag diff --git a/vignette_effect.cpp b/vignette_effect.cpp index aecd3bd..f1449ae 100644 --- a/vignette_effect.cpp +++ b/vignette_effect.cpp @@ -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) diff --git a/vignette_effect.glsl b/vignette_effect.frag similarity index 100% rename from vignette_effect.glsl rename to vignette_effect.frag