X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=effect_chain.cpp;fp=effect_chain.cpp;h=0a01bd356e6066261910a60e4ee2af2813d428f5;hp=7bce60fa21c1e076c3082d69ff2e409cc342750a;hb=7ea0b3a5be9bafaa2d1fa5a17ce285a725ce132b;hpb=d2977599b2482c4832b135fa230e8dfb1cf493df

diff --git a/effect_chain.cpp b/effect_chain.cpp
index 7bce60f..0a01bd3 100644
--- a/effect_chain.cpp
+++ b/effect_chain.cpp
@@ -53,15 +53,6 @@ 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];
 	}
@@ -292,27 +283,6 @@ void EffectChain::compile_glsl_program(Phase *phase)
 
 	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.
-
-	glBindVertexArray(0);
-	check_error();
 }
 
 // Construct GLSL programs, starting at the given effect and following
@@ -1485,8 +1455,6 @@ void EffectChain::render_to_fbo(GLuint dest_fbo, unsigned width, unsigned height
 
 	glBindFramebuffer(GL_FRAMEBUFFER, 0);
 	check_error();
-	glBindVertexArray(0);
-	check_error();
 	glUseProgram(0);
 	check_error();
 }
@@ -1526,8 +1494,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);
 	}
@@ -1548,11 +1515,32 @@ void EffectChain::execute_phase(Phase *phase, bool last_phase, map<Phase *, GLui
 		}
 	}
 
-	glBindVertexArray(phase->vao);
+	// 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);
 	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 < phase->effects.size(); ++i) {
 		Node *node = phase->effects[i];
 		node->effect->clear_gl_state();
@@ -1561,6 +1549,9 @@ void EffectChain::execute_phase(Phase *phase, bool last_phase, map<Phase *, GLui
 	if (!last_phase) {
 		resource_pool->release_fbo(fbo);
 	}
+
+	glDeleteVertexArrays(1, &vao);
+	check_error();
 }
 
 void EffectChain::setup_rtt_sampler(GLuint glsl_program_num, int sampler_num, const string &effect_id, bool use_mipmaps)