X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=effect_chain.cpp;h=82f1b2939cc088e8268c0d883f6a1c69e0979dc1;hp=c5e10e84a39c2315773315c8ae871e05342e012c;hb=28bc5f37437fa8eaca523a209c558b807ced2db3;hpb=407d90be3e45ddb7f5a53c16728bfa791998cb72

diff --git a/effect_chain.cpp b/effect_chain.cpp
index c5e10e8..82f1b29 100644
--- a/effect_chain.cpp
+++ b/effect_chain.cpp
@@ -1,6 +1,6 @@
 #define GL_GLEXT_PROTOTYPES 1
 
-#include <GL/glew.h>
+#include <epoxy/gl.h>
 #include <assert.h>
 #include <locale.h>
 #include <math.h>
@@ -53,12 +53,26 @@ EffectChain::~EffectChain()
 		delete nodes[i];
 	}
 	for (unsigned i = 0; i < phases.size(); ++i) {
+		glBindVertexArray(phases[i]->vao);
+		check_error();
+
+		cleanup_vertex_attribute(phases[i]->glsl_program_num, "position", phases[i]->position_vbo);
+		cleanup_vertex_attribute(phases[i]->glsl_program_num, "texcoord", phases[i]->texcoord_vbo);
+
+		glBindVertexArray(0);
+		check_error();
+
 		resource_pool->release_glsl_program(phases[i]->glsl_program_num);
 		delete phases[i];
 	}
 	if (owns_resource_pool) {
 		delete resource_pool;
 	}
+	for (map<void *, GLuint>::const_iterator fbo_it = fbos.begin();
+	     fbo_it != fbos.end(); ++fbo_it) {
+		glDeleteFramebuffers(1, &fbo_it->second);
+		check_error();
+	}
 }
 
 Input *EffectChain::add_input(Input *input)
@@ -229,7 +243,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 +254,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 +293,31 @@ 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"));
+
+	string vert_shader = read_version_dependent_file("vs", "vert");
+	phase->glsl_program_num = resource_pool->compile_glsl_program(vert_shader, frag_shader);
+
+	// Prepare the geometry for the fullscreen quad used in this phase.
+	// (We have separate VAOs per shader, since the bindings can in theory
+	// be different.)
+	float vertices[] = {
+		0.0f, 1.0f,
+		0.0f, 0.0f,
+		1.0f, 1.0f,
+		1.0f, 0.0f
+	};
+
+	glGenVertexArrays(1, &phase->vao);
+	check_error();
+	glBindVertexArray(phase->vao);
+	check_error();
+
+	phase->position_vbo = fill_vertex_attribute(phase->glsl_program_num, "position", 2, GL_FLOAT, sizeof(vertices), vertices);
+	phase->texcoord_vbo = fill_vertex_attribute(phase->glsl_program_num, "texcoord", 2, GL_FLOAT, sizeof(vertices), vertices);  // Same as vertices.
 
-	phase->glsl_program_num = resource_pool->compile_glsl_program(read_file("vs.vert"), frag_shader);
+	glBindVertexArray(0);
+	check_error();
 }
 
 // Construct GLSL programs, starting at the given effect and following
@@ -1405,6 +1441,7 @@ void EffectChain::render_to_fbo(GLuint dest_fbo, unsigned width, unsigned height
 	// Save original viewport.
 	GLuint x = 0, y = 0;
 	GLuint fbo = 0;
+	void *context = get_gl_context_identifier();
 
 	if (width == 0 && height == 0) {
 		GLint viewport[4];
@@ -1424,8 +1461,13 @@ void EffectChain::render_to_fbo(GLuint dest_fbo, unsigned width, unsigned height
 	check_error();
 
 	if (phases.size() > 1) {
-		glGenFramebuffers(1, &fbo);
-		check_error();
+		if (fbos.count(context) == 0) {
+			glGenFramebuffers(1, &fbo);
+			check_error();
+			fbos.insert(make_pair(context, fbo));
+		} else {
+			fbo = fbos[context];
+		}
 		glBindFramebuffer(GL_FRAMEBUFFER, fbo);
 		check_error();
 	}
@@ -1521,39 +1563,15 @@ void EffectChain::render_to_fbo(GLuint dest_fbo, unsigned width, unsigned height
 			}
 		}
 
-		// Now draw!
-		float vertices[] = {
-			0.0f, 1.0f,
-			0.0f, 0.0f,
-			1.0f, 1.0f,
-			1.0f, 0.0f
-		};
-
-		GLuint vao;
-		glGenVertexArrays(1, &vao);
-		check_error();
-		glBindVertexArray(vao);
+		glBindVertexArray(phases[phase]->vao);
 		check_error();
-
-		GLuint position_vbo = fill_vertex_attribute(glsl_program_num, "position", 2, GL_FLOAT, sizeof(vertices), vertices);
-		GLuint texcoord_vbo = fill_vertex_attribute(glsl_program_num, "texcoord", 2, GL_FLOAT, sizeof(vertices), vertices);  // Same as vertices.
-
 		glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
 		check_error();
 
-		cleanup_vertex_attribute(glsl_program_num, "position", position_vbo);
-		cleanup_vertex_attribute(glsl_program_num, "texcoord", texcoord_vbo);
-
-		glUseProgram(0);
-		check_error();
-
 		for (unsigned i = 0; i < phases[phase]->effects.size(); ++i) {
 			Node *node = phases[phase]->effects[i];
 			node->effect->clear_gl_state();
 		}
-
-		glDeleteVertexArrays(1, &vao);
-		check_error();
 	}
 
 	for (map<Phase *, GLuint>::const_iterator texture_it = output_textures.begin();
@@ -1564,11 +1582,10 @@ void EffectChain::render_to_fbo(GLuint dest_fbo, unsigned width, unsigned height
 
 	glBindFramebuffer(GL_FRAMEBUFFER, 0);
 	check_error();
-
-	if (fbo != 0) {
-		glDeleteFramebuffers(1, &fbo);
-		check_error();
-	}
+	glBindVertexArray(0);
+	check_error();
+	glUseProgram(0);
+	check_error();
 }
 
 }  // namespace movit