X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=main.cpp;h=e4690ba6f1ba7efe29121782d237ba33cc3e274a;hp=1386a0f1def99395e9296d0ef81fa1cac29329bd;hb=c0461658ca2abaa10aae42f40ffee7e5128bc7ab;hpb=a04ce272078182de6bb49e5ea9834713f3d72cae

diff --git a/main.cpp b/main.cpp
index 1386a0f..e4690ba 100644
--- a/main.cpp
+++ b/main.cpp
@@ -169,53 +169,12 @@ int main(int argc, char **argv)
 	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 *blur_effect = chain.add_effect(EFFECT_BLUR);
 	Effect *vignette_effect = chain.add_effect(EFFECT_VIGNETTE);
 	//chain.add_effect(EFFECT_MIRROR);
 	chain.add_output(inout_format);
 	chain.finalize();
 
-	//glGenerateMipmap(GL_TEXTURE_2D);
-	//glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_BASE_LEVEL, 4);
-	//check_error();
-
-#if 0
-	// sRGB reverse LUT
-	glBindTexture(GL_TEXTURE_1D, SRGB_REVERSE_LUT);
-	check_error();
-	glTexParameteri(GL_TEXTURE_1D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-	glTexParameteri(GL_TEXTURE_1D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-	check_error();
-	float srgb_reverse_tex[4096];
-	for (unsigned i = 0; i < 4096; ++i) {
-		float x = i / 4095.0;
-		if (x < 0.0031308f) {
-			srgb_reverse_tex[i] = 12.92f * x;
-		} else {
-			srgb_reverse_tex[i] = 1.055f * pow(x, 1.0f / 2.4f) - 0.055f;
-		}
-	}
-	glTexImage1D(GL_TEXTURE_1D, 0, GL_LUMINANCE16F_ARB, 4096, 0, GL_LUMINANCE, GL_FLOAT, srgb_reverse_tex);
-	check_error();
-
-	// sRGB LUT
-	glBindTexture(GL_TEXTURE_1D, SRGB_LUT);
-	check_error();
-	glTexParameteri(GL_TEXTURE_1D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-	glTexParameteri(GL_TEXTURE_1D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-	check_error();
-	float srgb_tex[256];
-	for (unsigned i = 0; i < 256; ++i) {
-		float x = i / 255.0;
-		if (x < 0.04045f) {
-			srgb_tex[i] = x * (1.0f / 12.92f);
-		} else {
-			srgb_tex[i] = pow((x + 0.055) * (1.0 / 1.055f), 2.4);
-		}
-	}
-	glTexImage1D(GL_TEXTURE_1D, 0, GL_LUMINANCE16F_ARB, 256, 0, GL_LUMINANCE, GL_FLOAT, srgb_tex);
-	check_error();
-#endif
-
 	// 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);
@@ -263,6 +222,7 @@ int main(int argc, char **argv)
 		glBindBuffer(GL_PIXEL_PACK_BUFFER_ARB, 0);
 		check_error();
 
+		glLoadIdentity();
 		draw_hsv_wheel(0.0f, lift_rad, lift_theta, lift_v);
 		draw_hsv_wheel(0.2f, gamma_rad, gamma_theta, gamma_v);
 		draw_hsv_wheel(0.4f, gain_rad, gain_theta, gain_v);