Use C++11 override everywhere it is appropriate.

[movit] / header.comp

diff --git a/header.comp b/header.comp
index 276656896c51dfdab5245dde05f404f87cb9eaf7..d922e33efedaaf511f61a9406a1b6bf6a8db7a51 100644 (file)
--- a/header.comp
+++ b/header.comp
@@ -3,21 +3,11 @@
 #extension GL_ARB_shader_image_load_store : enable
 
 // FIXME this needs to be auto-output or something
-layout(rgba16f) uniform restrict writeonly image2D outbuf;
+uniform restrict writeonly image2D outbuf;
 
-vec4 tex2D(sampler2D s, vec2 coord)
-{
-       return texture(s, coord);
-}
-
-void cs_output(uvec2 coord, vec4 val)
-{
-       imageStore(outbuf, ivec2(coord), val);
-}
-
-void cs_output(ivec2 coord, vec4 val)
-{
-       imageStore(outbuf, coord, val);
-}
+// Defined in footer.comp.
+vec4 tex2D(sampler2D s, vec2 coord);
+void cs_output(uvec2 coord, vec4 val);
+void cs_output(ivec2 coord, vec4 val);
 
 #define OUTPUT(tc, val) cs_output(tc, val)