Collapse the shared part of Mesh::draw and draw_instanced

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

diff --git a/source/postprocessor.cpp b/source/postprocessor.cpp
index add8b1ed1055daf5527cc34ed32331ba15be84e4..f67bf4cf701407feb086ddb45669394d51c7ff4b 100644 (file)
--- a/source/postprocessor.cpp
+++ b/source/postprocessor.cpp
@@ -3,26 +3,12 @@
 #include "postprocessor.h"
 #include "shader.h"
 
-namespace {
-
-const char fullscreen_vs_source[] =
-       "varying vec2 texcoord;\n"
-       "void main()\n"
-       "{\n"
-       "       gl_Position = gl_Vertex;\n"
-       "       texcoord = gl_Vertex.xy*0.5+0.5;\n"
-       "}\n";
-
-}
-
-
 namespace Msp {
 namespace GL {
 
-Shader &PostProcessor::get_fullscreen_vertex_shader()
+void PostProcessor::render(Renderer &, const Texture2D &color, const Texture2D &depth)
 {
-       static Shader shader(VERTEX_SHADER, fullscreen_vs_source);
-       return shader;
+       render(color, depth);
 }
 
 const Mesh &PostProcessor::get_fullscreen_quad()
@@ -33,7 +19,7 @@ const Mesh &PostProcessor::get_fullscreen_quad()
 
 const Mesh &PostProcessor::create_fullscreen_quad()
 {
-       static Mesh mesh(GL::VERTEX2);
+       static Mesh mesh(VERTEX2);
        MeshBuilder builder(mesh);
        builder.begin(TRIANGLE_STRIP);
        builder.vertex(-1, 1);
@@ -44,5 +30,17 @@ const Mesh &PostProcessor::create_fullscreen_quad()
        return mesh;
 }
 
+
+PostProcessor::Template::Template():
+       size_divisor(1)
+{ }
+
+
+PostProcessor::Template::Loader::Loader(Template &t):
+       DataFile::ObjectLoader<Template>(t)
+{
+       add("size_divisor", &Template::size_divisor);
+}
+
 } // namespace GL
 } // namespace Msp