X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=effect_chain.cpp;h=b00f214aa0f535e26570bca1f0df258814cc9858;hb=54c233d62900640a60a25db95123a5fc37b95d66;hp=ca6905bf53c177f3f5988dc2f08173b3b495584a;hpb=983fe15061b6e199877577b363a9f2fa102cf107;p=movit

diff --git a/effect_chain.cpp b/effect_chain.cpp
index ca6905b..b00f214 100644
--- a/effect_chain.cpp
+++ b/effect_chain.cpp
@@ -1,8 +1,7 @@
 #define GL_GLEXT_PROTOTYPES 1
 
-#include <GL/glew.h>
+#include <epoxy/gl.h>
 #include <assert.h>
-#include <locale.h>
 #include <math.h>
 #include <stddef.h>
 #include <stdio.h>
@@ -88,6 +87,7 @@ Node *EffectChain::add_node(Effect *effect)
 	node->output_color_space = COLORSPACE_INVALID;
 	node->output_gamma_curve = GAMMA_INVALID;
 	node->output_alpha_type = ALPHA_INVALID;
+	node->needs_mipmaps = false;
 
 	nodes.push_back(node);
 	node_map[effect] = node;
@@ -229,7 +229,7 @@ string replace_prefix(const string &text, const string &prefix)
 
 void EffectChain::compile_glsl_program(Phase *phase)
 {
-	string frag_shader = read_file("header.frag");
+	string frag_shader = read_version_dependent_file("header", "frag");
 
 	// Create functions for all the texture inputs that we need.
 	for (unsigned i = 0; i < phase->inputs.size(); ++i) {
@@ -240,7 +240,7 @@ void EffectChain::compile_glsl_program(Phase *phase)
 	
 		frag_shader += string("uniform sampler2D tex_") + effect_id + ";\n";
 		frag_shader += string("vec4 ") + effect_id + "(vec2 tc) {\n";
-		frag_shader += "\treturn texture2D(tex_" + string(effect_id) + ", tc);\n";
+		frag_shader += "\treturn tex2D(tex_" + string(effect_id) + ", tc);\n";
 		frag_shader += "}\n";
 		frag_shader += "\n";
 	}
@@ -279,9 +279,10 @@ void EffectChain::compile_glsl_program(Phase *phase)
 		frag_shader += "\n";
 	}
 	frag_shader += string("#define INPUT ") + phase->effect_ids[phase->effects.back()] + "\n";
-	frag_shader.append(read_file("footer.frag"));
+	frag_shader.append(read_version_dependent_file("footer", "frag"));
 
-	phase->glsl_program_num = resource_pool->compile_glsl_program(read_file("vs.vert"), frag_shader);
+	string vert_shader = read_version_dependent_file("vs", "vert");
+	phase->glsl_program_num = resource_pool->compile_glsl_program(vert_shader, frag_shader);
 }
 
 // Construct GLSL programs, starting at the given effect and following
@@ -310,6 +311,10 @@ Phase *EffectChain::construct_phase(Node *output, map<Node *, Phase *> *complete
 		Node *node = effects_todo_this_phase.top();
 		effects_todo_this_phase.pop();
 
+		if (node->effect->needs_mipmaps()) {
+			node->needs_mipmaps = true;
+		}
+
 		// This should currently only happen for effects that are inputs
 		// (either true inputs or phase outputs). We special-case inputs,
 		// and then deduplicate phase outputs below.
@@ -334,6 +339,21 @@ Phase *EffectChain::construct_phase(Node *output, map<Node *, Phase *> *complete
 				start_new_phase = true;
 			}
 
+			// Propagate information about needing mipmaps down the chain,
+			// breaking the phase if we notice an incompatibility.
+			//
+			// Note that we cannot do this propagation as a normal pass,
+			// because it needs information about where the phases end
+			// (we should not propagate the flag across phases).
+			if (node->needs_mipmaps) {
+				if (deps[i]->effect->num_inputs() == 0) {
+					Input *input = static_cast<Input *>(deps[i]->effect);
+					start_new_phase |= !input->can_supply_mipmaps();
+				} else {
+					deps[i]->needs_mipmaps = true;
+				}
+			}
+
 			if (deps[i]->outgoing_links.size() > 1) {
 				if (!deps[i]->effect->is_single_texture()) {
 					// More than one effect uses this as the input,
@@ -392,7 +412,9 @@ Phase *EffectChain::construct_phase(Node *output, map<Node *, Phase *> *complete
 	for (unsigned i = 0; i < phase->effects.size(); ++i) {
 		Node *node = phase->effects[i];
 		if (node->effect->num_inputs() == 0) {
-			CHECK(node->effect->set_int("needs_mipmaps", phase->input_needs_mipmaps));
+			Input *input = static_cast<Input *>(node->effect);
+			assert(!phase->input_needs_mipmaps || input->can_supply_mipmaps());
+			CHECK(input->set_int("needs_mipmaps", phase->input_needs_mipmaps));
 		}
 	}
 
@@ -1329,10 +1351,6 @@ Node *EffectChain::find_output_node()
 
 void EffectChain::finalize()
 {
-	// Save the current locale, and set it to C, so that we can output decimal
-	// numbers with printf and be sure to get them in the format mandated by GLSL.
-	char *saved_locale = setlocale(LC_NUMERIC, "C");
-
 	// Output the graph as it is before we do any conversions on it.
 	output_dot("step0-start.dot");
 
@@ -1395,7 +1413,6 @@ void EffectChain::finalize()
 	assert(phases[0]->inputs.empty());
 	
 	finalized = true;
-	setlocale(LC_NUMERIC, saved_locale);
 }
 
 void EffectChain::render_to_fbo(GLuint dest_fbo, unsigned width, unsigned height)
@@ -1493,8 +1510,7 @@ void EffectChain::execute_phase(Phase *phase, bool last_phase, map<Phase *, GLui
 
 	// And now the output. (Already set up for us if it is the last phase.)
 	if (!last_phase) {
-		void *context = get_gl_context_identifier();
-		fbo = resource_pool->create_fbo(context, (*output_textures)[phase]);
+		fbo = resource_pool->create_fbo((*output_textures)[phase]);
 		glBindFramebuffer(GL_FRAMEBUFFER, fbo);
 		glViewport(0, 0, phase->output_width, phase->output_height);
 	}