Convert existing post-processors to use the provided common resources

[libs/gl.git] / source / bloom.cpp

diff --git a/source/bloom.cpp b/source/bloom.cpp
index 36cdb8ddfeec2eeb67e940f95521667e549dc78d..896147c2e885074620866da9e9e8dacb836ad1a6 100644 (file)
--- a/source/bloom.cpp
+++ b/source/bloom.cpp
@@ -2,8 +2,8 @@
 #include <msp/strings/format.h>
 #include "blend.h"
 #include "bloom.h"
-#include "meshbuilder.h"
 #include "misc.h"
+#include "shader.h"
 #include "tests.h"
 #include "texunit.h"
 
@@ -11,14 +11,6 @@ using namespace std;
 
 namespace {
 
-static const char blur_vs[]=
-       "varying vec2 texcoord;\n"
-       "void main()\n"
-       "{\n"
-       "       gl_Position = vec4(gl_Vertex.xy*2.0-1.0, 0.0, 1.0);\n"
-       "       texcoord = gl_Vertex.xy;\n"
-       "}";
-
 static const char blur_fs[]=
        "uniform sampler2D source;\n"
        "uniform vec2 delta;\n"
@@ -32,14 +24,6 @@ static const char blur_fs[]=
        "               gl_FragColor += texture2D(source, texcoord+delta*float(i-size))*factors[i];\n"
        "}";
 
-static const char combine_vs[]=
-       "varying vec2 texcoord;\n"
-       "void main()\n"
-       "{\n"
-       "       gl_Position = vec4(gl_Vertex.xy*2.0-1.0, 0.0, 1.0);\n"
-       "       texcoord = gl_Vertex.xy;\n"
-       "}";
-
 static const char combine_fs[]=
        "uniform sampler2D source;\n"
        "uniform sampler2D blurred;\n"
@@ -56,10 +40,16 @@ namespace Msp {
 namespace GL {
 
 Bloom::Bloom(unsigned w, unsigned h):
-       blur_shader(blur_vs, blur_fs),
-       combine_shader(combine_vs, combine_fs),
-       quad(VERTEX2)
+       quad(get_fullscreen_quad())
 {
+       blur_shader.attach_shader(get_fullscreen_vertex_shader());
+       blur_shader.attach_shader_owned(new Shader(FRAGMENT_SHADER, blur_fs));
+       blur_shader.link();
+
+       combine_shader.attach_shader(get_fullscreen_vertex_shader());
+       combine_shader.attach_shader_owned(new Shader(FRAGMENT_SHADER, combine_fs));
+       combine_shader.link();
+
        blur_shdata[0].uniform("delta", 1.0f/w, 0.0f);
        blur_shdata[1].uniform("delta", 0.0f, 1.0f/h);
 
@@ -77,14 +67,6 @@ Bloom::Bloom(unsigned w, unsigned h):
 
        set_radius(2.0f);
        set_strength(0.2f);
-
-       MeshBuilder mbld(quad);
-       mbld.begin(TRIANGLE_STRIP);
-       mbld.vertex(0, 1);
-       mbld.vertex(0, 0);
-       mbld.vertex(1, 1);
-       mbld.vertex(1, 0);
-       mbld.end();
 }
 
 void Bloom::set_radius(float r)