X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=main.cpp;h=4e2d303f893fc77525fdf558a70ac9e536a7143f;hp=bbc775271b7d3c46b26caa03f5ed39997d7a0ae0;hb=c3718fbd4be80a2825e7fdc66eb54a516e4c4df1;hpb=05ae48a62f4a507c1eef75b9220f88f2b9fda563

diff --git a/main.cpp b/main.cpp
index bbc7752..4e2d303 100644
--- a/main.cpp
+++ b/main.cpp
@@ -164,7 +164,7 @@ int main(int argc, char **argv)
 	inout_format.color_space = COLORSPACE_sRGB;
 	inout_format.gamma_curve = GAMMA_sRGB;
 
-	chain.add_input(inout_format);
+	Input *input = chain.add_input(inout_format);
 	Effect *lift_gamma_gain_effect = chain.add_effect(EFFECT_LIFT_GAMMA_GAIN);
 	Effect *saturation_effect = chain.add_effect(EFFECT_SATURATION);
 	Effect *diffusion_effect = chain.add_effect(EFFECT_DIFFUSION);
@@ -175,9 +175,11 @@ int main(int argc, char **argv)
 	chain.add_output(inout_format);
 	chain.finalize();
 
-	// generate a PDO to hold the data we read back with glReadPixels()
-	// (Intel/DRI goes into a slow path if we don't read to PDO)
-	glBindBuffer(GL_PIXEL_PACK_BUFFER_ARB, 1);
+	// generate a PBO to hold the data we read back with glReadPixels()
+	// (Intel/DRI goes into a slow path if we don't read to PBO)
+	GLuint pbo;
+	glGenBuffers(1, &pbo);
+	glBindBuffer(GL_PIXEL_PACK_BUFFER_ARB, pbo);
 	glBufferData(GL_PIXEL_PACK_BUFFER_ARB, WIDTH * HEIGHT * 4, NULL, GL_STREAM_READ);
 
 	make_hsv_wheel_texture();
@@ -217,9 +219,10 @@ int main(int argc, char **argv)
 		diffusion_effect->set_float("radius", blur_radius);
 		diffusion_effect->set_float("blurred_mix_amount", blurred_mix_amount);
 
-		chain.render_to_screen(src_img);
+		input->set_pixel_data(src_img);
+		chain.render_to_screen();
 		
-		glBindBuffer(GL_PIXEL_PACK_BUFFER_ARB, 1);
+		glBindBuffer(GL_PIXEL_PACK_BUFFER_ARB, pbo);
 		check_error();
 		glReadPixels(0, 0, WIDTH, HEIGHT, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, BUFFER_OFFSET(0));
 		check_error();
@@ -241,7 +244,7 @@ int main(int argc, char **argv)
 		SDL_GL_SwapBuffers();
 		check_error();
 
-		glBindBuffer(GL_PIXEL_PACK_BUFFER_ARB, 1);
+		glBindBuffer(GL_PIXEL_PACK_BUFFER_ARB, pbo);
 		check_error();
 		unsigned char *screenbuf = (unsigned char *)glMapBuffer(GL_PIXEL_PACK_BUFFER_ARB, GL_READ_ONLY);
 		check_error();