X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=blur_effect.cpp;h=d43a7caec77bcf34ce5944f5f332016bc2d740f0;hp=579521fde00b2e952824681bf5dcaa1aea178e7e;hb=131e7179b596f8268fd80c32312849da83581e55;hpb=e7389a6a3041dcb1a0a4dceffd2ca9018b49b2f2

diff --git a/blur_effect.cpp b/blur_effect.cpp
index 579521f..d43a7ca 100644
--- a/blur_effect.cpp
+++ b/blur_effect.cpp
@@ -1,13 +1,19 @@
-#include <math.h>
+#include <GL/glew.h>
 #include <assert.h>
+#include <math.h>
+#include <algorithm>
 
 #include "blur_effect.h"
 #include "effect_chain.h"
+#include "effect_util.h"
 #include "util.h"
-#include "opengl.h"
 
 // Must match blur_effect.frag.
 #define NUM_TAPS 16
+
+using namespace std;
+
+namespace movit {
 	
 BlurEffect::BlurEffect()
 	: radius(3.0f),
@@ -16,9 +22,9 @@ BlurEffect::BlurEffect()
 {
 	// The first blur pass will forward resolution information to us.
 	hpass = new SingleBlurPassEffect(this);
-	hpass->set_int("direction", SingleBlurPassEffect::HORIZONTAL);
+	CHECK(hpass->set_int("direction", SingleBlurPassEffect::HORIZONTAL));
 	vpass = new SingleBlurPassEffect(NULL);
-	vpass->set_int("direction", SingleBlurPassEffect::VERTICAL);
+	CHECK(vpass->set_int("direction", SingleBlurPassEffect::VERTICAL));
 
 	update_radius();
 }
@@ -54,8 +60,8 @@ void BlurEffect::update_radius()
 	float adjusted_radius = radius;
 	while ((mipmap_width > 1 || mipmap_height > 1) && adjusted_radius * 1.5f > NUM_TAPS / 2) {
 		// Find the next mipmap size (round down, minimum 1 pixel).
-		mipmap_width = std::max(mipmap_width / 2, 1u);
-		mipmap_height = std::max(mipmap_height / 2, 1u);
+		mipmap_width = max(mipmap_width / 2, 1u);
+		mipmap_height = max(mipmap_height / 2, 1u);
 
 		// Approximate when mipmap sizes are odd, but good enough.
 		adjusted_radius = radius * float(mipmap_width) / float(input_width);
@@ -64,15 +70,19 @@ void BlurEffect::update_radius()
 	bool ok = hpass->set_float("radius", adjusted_radius);
 	ok |= hpass->set_int("width", mipmap_width);
 	ok |= hpass->set_int("height", mipmap_height);
+	ok |= hpass->set_int("virtual_width", mipmap_width);
+	ok |= hpass->set_int("virtual_height", mipmap_height);
 
 	ok |= vpass->set_float("radius", adjusted_radius);
 	ok |= vpass->set_int("width", mipmap_width);
 	ok |= vpass->set_int("height", mipmap_height);
+	ok |= vpass->set_int("virtual_width", input_width);
+	ok |= vpass->set_int("virtual_height", input_height);
 
 	assert(ok);
 }
 
-bool BlurEffect::set_float(const std::string &key, float value) {
+bool BlurEffect::set_float(const string &key, float value) {
 	if (key == "radius") {
 		radius = value;
 		update_radius();
@@ -92,14 +102,18 @@ SingleBlurPassEffect::SingleBlurPassEffect(BlurEffect *parent)
 	register_int("direction", (int *)&direction);
 	register_int("width", &width);
 	register_int("height", &height);
+	register_int("virtual_width", &virtual_width);
+	register_int("virtual_height", &virtual_height);
 }
 
-std::string SingleBlurPassEffect::output_fragment_shader()
+string SingleBlurPassEffect::output_fragment_shader()
 {
-	return read_file("blur_effect.frag");
+	char buf[256];
+	sprintf(buf, "#define DIRECTION_VERTICAL %d\n", (direction == VERTICAL));
+	return buf + read_file("blur_effect.frag");
 }
 
-void SingleBlurPassEffect::set_gl_state(GLuint glsl_program_num, const std::string &prefix, unsigned *sampler_num)
+void SingleBlurPassEffect::set_gl_state(GLuint glsl_program_num, const string &prefix, unsigned *sampler_num)
 {
 	Effect::set_gl_state(glsl_program_num, prefix, sampler_num);
 
@@ -147,13 +161,11 @@ void SingleBlurPassEffect::set_gl_state(GLuint glsl_program_num, const std::stri
 	//
 	// We pack the parameters into a float4: The relative sample coordinates
 	// in (x,y), and the weight in z. w is unused.
-	float samples[4 * (NUM_TAPS / 2 + 1)];
+	float samples[2 * (NUM_TAPS / 2 + 1)];
 
 	// Center sample.
-	samples[4 * 0 + 0] = 0.0f;
-	samples[4 * 0 + 1] = 0.0f;
-	samples[4 * 0 + 2] = weight[0];
-	samples[4 * 0 + 3] = 0.0f;
+	samples[2 * 0 + 0] = 0.0f;
+	samples[2 * 0 + 1] = weight[0];
 
 	// All other samples.
 	for (unsigned i = 1; i < NUM_TAPS / 2 + 1; ++i) {
@@ -162,32 +174,24 @@ void SingleBlurPassEffect::set_gl_state(GLuint glsl_program_num, const std::stri
 		float w2 = weight[base_pos + 1];
 
 		float offset, total_weight;
-		if (w1 + w2 < 1e-6) {
-			offset = 0.5f;
-			total_weight = 0.0f;
-		} else {
-			offset = w2 / (w1 + w2);
-			total_weight = w1 + w2;
-		}
-		float x = 0.0f, y = 0.0f;
+		combine_two_samples(w1, w2, &offset, &total_weight, NULL);
 
 		if (direction == HORIZONTAL) {
-			x = (base_pos + offset) / (float)width;
+			samples[2 * i + 0] = (base_pos + offset) / (float)width;
 		} else if (direction == VERTICAL) {
-			y = (base_pos + offset) / (float)height;
+			samples[2 * i + 0] = (base_pos + offset) / (float)height;
 		} else {
 			assert(false);
 		}
 
-		samples[4 * i + 0] = x;
-		samples[4 * i + 1] = y;
-		samples[4 * i + 2] = total_weight;
-		samples[4 * i + 3] = 0.0f;
+		samples[2 * i + 1] = total_weight;
 	}
 
-	set_uniform_vec4_array(glsl_program_num, prefix, "samples", samples, NUM_TAPS / 2 + 1);
+	set_uniform_vec2_array(glsl_program_num, prefix, "samples", samples, NUM_TAPS / 2 + 1);
 }
 
 void SingleBlurPassEffect::clear_gl_state()
 {
 }
+
+}  // namespace movit