Merge branch 'master' of goat:git/laserbrain_demo

[laserbrain_demo] / src / post.cc

diff --git a/src/post.cc b/src/post.cc
index b675f5b..a4d13cf 100644 (file)
--- a/src/post.cc
+++ b/src/post.cc
@@ -1,5 +1,6 @@
 #include "opengl.h"
 #include "app.h"
+#include "texture.h"   // next_pow2
 
 static void update_fbtex();
 
@@ -15,7 +16,6 @@ void slow_post(unsigned int sdr)
 
        glPushAttrib(GL_ENABLE_BIT);
        glDisable(GL_DEPTH_TEST);
-       glDisable(GL_LIGHTING);
 
        glUseProgram(sdr);
 
@@ -36,17 +36,6 @@ void slow_post(unsigned int sdr)
        glPopAttrib();
 }
 
-static int next_pow2(int x)
-{
-       x--;
-       x = (x >> 1) | x;
-       x = (x >> 2) | x;
-       x = (x >> 4) | x;
-       x = (x >> 8) | x;
-       x = (x >> 16) | x;
-       return x + 1;
-}
-
 static void update_fbtex()
 {
        if(win_width <= fb_tex_width && win_height <= fb_tex_height) {