From: John Tsiombikas <nuclear@member.fsf.org>
Date: Sat, 29 Sep 2018 03:05:06 +0000 (+0300)
Subject: Merge branch 'master' of goat:git/laserbrain_demo
X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=laserbrain_demo;a=commitdiff_plain;h=6ef619c6d92c698728576a4ec1c798a0f716d9a4;hp=73b213a3546d98310fb9d70abfb4f38d1bd7c682

Merge branch 'master' of goat:git/laserbrain_demo
---

diff --git a/src/app.cc b/src/app.cc
index 07ecdec..9f58b5f 100644
--- a/src/app.cc
+++ b/src/app.cc
@@ -559,6 +559,12 @@ void app_display()
 		vp_width = win_width;
 		vp_height = win_height;
 
+		if(!gfbo && !fb_srgb && sdr_post_gamma) {
+			glViewport(0, 0, win_width, win_height);
+			slow_post(sdr_post_gamma);
+			glUseProgram(0);
+		}
+
 		if(should_swap) {
 			app_swap_buffers();
 		}
diff --git a/src/post.cc b/src/post.cc
index 885a212..a4d13cf 100644
--- a/src/post.cc
+++ b/src/post.cc
@@ -16,7 +16,6 @@ void slow_post(unsigned int sdr)
 
 	glPushAttrib(GL_ENABLE_BIT);
 	glDisable(GL_DEPTH_TEST);
-	glDisable(GL_LIGHTING);
 
 	glUseProgram(sdr);