Deferred combined pass

Author: einarf

demosys/deferred/renderer.py

@@ -73,6 +73,10 @@ def __init__(self, width, height, gbuffer=None, lightbuffer=None):
         # Debug draw lights
         self.debug_shader = resources.shaders.get("deferred/debug.glsl", create=True)
 
+        # Combine shader
+        self.combine_shader = resources.shaders.get("deferred/combine.glsl", create=True)
+        self.quad = geometry.quad_fs()
+
     def draw_buffers(self, near, far):
         """
         Draw framebuffers for debug purposes.
@@ -139,6 +143,13 @@ def render_lights_debug(self, camera_matrix, projection):
     def render_geometry(self, cam_matrix, projection):
         raise NotImplementedError("render_geometry() not implemented")
 
+    def combine(self):
+        """Combine diffuse and light buffer"""
+        with self.quad.bind(self.combine_shader) as s:
+            s.uniform_sampler_2d(0, "diffuse_buffer", self.gbuffer.color_buffers[0])
+            s.uniform_sampler_2d(1, "light_buffer", self.lightbuffer.color_buffers[0])
+        self.quad.draw()
+
     def clear(self):
         """clear all buffers"""
         self.gbuffer.clear()

demosys/deferred/shaders/deferred/combine.glsl

@@ -0,0 +1,26 @@
+#version 410
+
+#if defined VERTEX_SHADER
+
+in vec3 in_position;
+in vec2 in_uv;
+
+out vec2 uv;
+
+void main() {
+    uv = in_uv;
+    gl_Position = vec4(in_position, 1.0);
+}
+
+#elif defined FRAGMENT_SHADER
+
+out vec4 out_color;
+uniform sampler2D diffuse_buffer;
+uniform sampler2D light_buffer;
+in vec2 uv;
+
+void main() {
+    out_color = texture(diffuse_buffer, uv) * texture(light_buffer, uv);
+}
+
+#endif

demosys/deferred/shaders/deferred/geometry.glsl

@@ -4,15 +4,18 @@
 
 in vec3 in_position;
 in vec3 in_normal;
+in vec2 in_uv;
 
 uniform mat4 m_mv;
 uniform mat4 m_proj;
 uniform mat3 m_normal;
 
 out vec3 normal;
+out vec2 uv;
 
 void main() {
     normal = m_normal * in_normal;
+    uv = in_uv;
     gl_Position = m_proj * m_mv * vec4(in_position, 1.0);
 }
 
@@ -22,10 +25,13 @@ layout(location=0) out vec4 out_color;
 layout(location=1) out vec3 out_normal;
 
 in vec3 normal;
+in vec2 uv;
+
+uniform sampler2D texture0;
 
 void main() {
     out_normal = normal;
-    out_color = vec4(1.0);
+    out_color = texture(texture0, uv);
 }
 
 #endif

demosys/deferred/shaders/deferred/light_point.glsl

@@ -49,9 +49,8 @@ void main() {
         discard;
     }
 
+//    out_light = vec4(linear_depth);
     out_light = vec4(1.0 - (dist / radius));
-//    out_light = vec4(pos, 1.0);
-//    out_light = vec4(viewRay, 1.0);
 }
 
 #endif