X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=effect_chain.cpp;h=0e20ce097be8a29ff85ff9b4fbe089a273ddbe75;hb=b9da5758dedda56a1e2616647ebae129edb0c2db;hp=ecf4208f7dc5cfd12adebbdb9f38f120ec47924d;hpb=79f0ebd9606956e2988d9485b9d4c701e975c7f1;p=movit

diff --git a/effect_chain.cpp b/effect_chain.cpp
index ecf4208..0e20ce0 100644
--- a/effect_chain.cpp
+++ b/effect_chain.cpp
@@ -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");
 	}
@@ -1906,10 +1906,8 @@ void EffectChain::render_to_fbo(GLuint dest_fbo, unsigned width, unsigned height
 		}
 	}
 
-	for (map<Phase *, GLuint>::const_iterator texture_it = output_textures.begin();
-	     texture_it != output_textures.end();
-	     ++texture_it) {
-		resource_pool->release_2d_texture(texture_it->second);
+	for (const auto &phase_and_texnum : output_textures) {
+		resource_pool->release_2d_texture(phase_and_texnum.second);
 	}
 
 	glBindFramebuffer(GL_FRAMEBUFFER, 0);
@@ -1926,8 +1924,8 @@ void EffectChain::render_to_fbo(GLuint dest_fbo, unsigned width, unsigned height
 		// Get back the timer queries.
 		for (unsigned phase_num = 0; phase_num < phases.size(); ++phase_num) {
 			Phase *phase = phases[phase_num];
-			for (std::list<GLuint>::iterator timer_it = phase->timer_query_objects_running.begin();
-			     timer_it != phase->timer_query_objects_running.end(); ) {
+			for (auto timer_it = phase->timer_query_objects_running.cbegin();
+			     timer_it != phase->timer_query_objects_running.cend(); ) {
 				GLint timer_query_object = *timer_it;
 				GLint available;
 				glGetQueryObjectiv(timer_query_object, GL_QUERY_RESULT_AVAILABLE, &available);