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

diff --git a/effect_chain.cpp b/effect_chain.cpp
index a9d9e1e..34a396a 100644
--- a/effect_chain.cpp
+++ b/effect_chain.cpp
@@ -49,8 +49,8 @@ EffectChain::EffectChain(float aspect_nom, float aspect_denom, ResourcePool *res
 	  aspect_denom(aspect_denom),
 	  output_color_rgba(false),
 	  num_output_color_ycbcr(0),
-	  dither_effect(NULL),
-	  ycbcr_conversion_effect_node(NULL),
+	  dither_effect(nullptr),
+	  ycbcr_conversion_effect_node(nullptr),
 	  intermediate_format(GL_RGBA16F),
 	  intermediate_transformation(NO_FRAMEBUFFER_TRANSFORMATION),
 	  num_dither_bits(0),
@@ -58,7 +58,7 @@ EffectChain::EffectChain(float aspect_nom, float aspect_denom, ResourcePool *res
 	  finalized(false),
 	  resource_pool(resource_pool),
 	  do_phase_timing(false) {
-	if (resource_pool == NULL) {
+	if (resource_pool == nullptr) {
 		this->resource_pool = new ResourcePool();
 		owns_resource_pool = true;
 	} else {
@@ -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");
 	}
@@ -781,7 +781,7 @@ void EffectChain::output_dot(const char *filename)
 	}
 
 	FILE *fp = fopen(filename, "w");
-	if (fp == NULL) {
+	if (fp == nullptr) {
 		perror(filename);
 		exit(1);
 	}
@@ -825,7 +825,7 @@ void EffectChain::output_dot(const char *filename)
 
 		if (nodes[i]->outgoing_links.empty() && !nodes[i]->disabled) {
 			// Output node.
-			vector<string> labels = get_labels_for_edge(nodes[i], NULL);
+			vector<string> labels = get_labels_for_edge(nodes[i], nullptr);
 			output_dot_edge(fp, from_node_id, "output", labels);
 		}
 	}
@@ -838,7 +838,7 @@ vector<string> EffectChain::get_labels_for_edge(const Node *from, const Node *to
 {
 	vector<string> labels;
 
-	if (to != NULL && to->effect->needs_texture_bounce()) {
+	if (to != nullptr && to->effect->needs_texture_bounce()) {
 		labels.push_back("needs_bounce");
 	}
 	if (from->effect->changes_output_size()) {
@@ -1880,7 +1880,7 @@ void EffectChain::render_to_fbo(GLuint dest_fbo, unsigned width, unsigned height
 			GLenum status = glCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT);
 			assert(status == GL_FRAMEBUFFER_COMPLETE);
 			glViewport(x, y, width, height);
-			if (dither_effect != NULL) {
+			if (dither_effect != nullptr) {
 				CHECK(dither_effect->set_int("output_width", width));
 				CHECK(dither_effect->set_int("output_height", height));
 			}