X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=effect_chain.cpp;h=a6ff90ea5a7df7ad8cfda34dcd68894c47792cf6;hp=d45c2fc4f86ba5c76bad0aa0da52129f05f25b3d;hb=a04ce272078182de6bb49e5ea9834713f3d72cae;hpb=91c70600f2d0a6a42420ee98949cf182859b798f

diff --git a/effect_chain.cpp b/effect_chain.cpp
index d45c2fc..a6ff90e 100644
--- a/effect_chain.cpp
+++ b/effect_chain.cpp
@@ -16,7 +16,6 @@
 #include "saturation_effect.h"
 #include "mirror_effect.h"
 #include "vignette_effect.h"
-#include "texture_enum.h"
 
 EffectChain::EffectChain(unsigned width, unsigned height)
 	: width(width), height(height), use_srgb_texture_format(false), finalized(false) {}
@@ -220,7 +219,11 @@ void EffectChain::finalize()
 	memset(mapped_pbo, 0, width * height * bytes_per_pixel);
 	glUnmapBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB);
 	
-	glBindTexture(GL_TEXTURE_2D, SOURCE_IMAGE);
+	glGenTextures(1, &source_image_num);
+	check_error();
+	glBindTexture(GL_TEXTURE_2D, source_image_num);
+	check_error();
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
 	check_error();
 	glTexImage2D(GL_TEXTURE_2D, 0, internal_format, width, height, 0, format, GL_UNSIGNED_BYTE, BUFFER_OFFSET(0));
 	check_error();
@@ -245,7 +248,7 @@ void EffectChain::render_to_screen(unsigned char *src)
 	// Re-upload the texture from the PBO.
 	glActiveTexture(GL_TEXTURE0);
 	check_error();
-	glBindTexture(GL_TEXTURE_2D, SOURCE_IMAGE);
+	glBindTexture(GL_TEXTURE_2D, source_image_num);
 	check_error();
 	glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, width, height, format, GL_UNSIGNED_BYTE, BUFFER_OFFSET(0));
 	check_error();