X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=effect_chain.cpp;h=34a396aa607ab65db3e64f4f9f57a1273e45f021;hp=0c46768fd5d7db4470430556ee9b3ea7342b4b3c;hb=b89deb99c8e5d5e96d502a7c90b2bbc7daaac822;hpb=f34b1c36acd27944f00885edfc55363432bfec8e

diff --git a/effect_chain.cpp b/effect_chain.cpp
index 0c46768..34a396a 100644
--- a/effect_chain.cpp
+++ b/effect_chain.cpp
@@ -311,10 +311,10 @@ string replace_prefix(const string &text, const string &prefix)
 namespace {
 
 template<class T>
-void extract_uniform_declarations(const vector<Uniform<T> > &effect_uniforms,
+void extract_uniform_declarations(const vector<Uniform<T>> &effect_uniforms,
                                   const string &type_specifier,
                                   const string &effect_id,
-                                  vector<Uniform<T> > *phase_uniforms,
+                                  vector<Uniform<T>> *phase_uniforms,
                                   string *glsl_string)
 {
 	for (unsigned i = 0; i < effect_uniforms.size(); ++i) {
@@ -327,10 +327,10 @@ void extract_uniform_declarations(const vector<Uniform<T> > &effect_uniforms,
 }
 
 template<class T>
-void extract_uniform_array_declarations(const vector<Uniform<T> > &effect_uniforms,
+void extract_uniform_array_declarations(const vector<Uniform<T>> &effect_uniforms,
                                         const string &type_specifier,
                                         const string &effect_id,
-                                        vector<Uniform<T> > *phase_uniforms,
+                                        vector<Uniform<T>> *phase_uniforms,
                                         string *glsl_string)
 {
 	for (unsigned i = 0; i < effect_uniforms.size(); ++i) {
@@ -347,7 +347,7 @@ void extract_uniform_array_declarations(const vector<Uniform<T> > &effect_unifor
 }
 
 template<class T>
-void collect_uniform_locations(GLuint glsl_program_num, vector<Uniform<T> > *phase_uniforms)
+void collect_uniform_locations(GLuint glsl_program_num, vector<Uniform<T>> *phase_uniforms)
 {
 	for (unsigned i = 0; i < phase_uniforms->size(); ++i) {
 		Uniform<T> &uniform = (*phase_uniforms)[i];
@@ -361,7 +361,7 @@ void EffectChain::compile_glsl_program(Phase *phase)
 {
 	string frag_shader_header;
 	if (phase->is_compute_shader) {
-		frag_shader_header = read_file("header.compute");
+		frag_shader_header = read_file("header.comp");
 	} else {
 		frag_shader_header = read_version_dependent_file("header", "frag");
 	}