Added tonemapping and sector based exposure control

src/gl/shaders/gl_blurshader.cpp

@@ -80,32 +80,29 @@ void FBlurShader::BlurHorizontal(FFlatVertexBuffer *vbo, float blurAmount, int s
 
 void FBlurShader::Blur(FFlatVertexBuffer *vbo, float blurAmount, int sampleCount, GLuint inputTexture, GLuint outputFrameBuffer, int width, int height, bool vertical)
 {
-	int error = glGetError();
 	BlurSetup *setup = GetSetup(blurAmount, sampleCount);
-	error = glGetError();
 	if (vertical)
 		setup->VerticalShader->Bind();
 	else
 		setup->HorizontalShader->Bind();
-	error = glGetError();
+
 	glActiveTexture(GL_TEXTURE0);
 	glBindTexture(GL_TEXTURE_2D, inputTexture);
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-	error = glGetError();
+
 	glBindFramebuffer(GL_FRAMEBUFFER, outputFrameBuffer);
 	glViewport(0, 0, width, height);
 	glDisable(GL_BLEND);
-	error = glGetError();
+
 	FFlatVertex *ptr = vbo->GetBuffer();
 	ptr->Set(-1.0f, -1.0f, 0, 0.0f, 0.0f); ptr++;
 	ptr->Set(-1.0f, 1.0f, 0, 0.0f, 1.0f); ptr++;
 	ptr->Set(1.0f, -1.0f, 0, 1.0f, 0.0f); ptr++;
 	ptr->Set(1.0f, 1.0f, 0, 1.0f, 1.0f); ptr++;
 	vbo->RenderCurrent(ptr, GL_TRIANGLE_STRIP);
-	error = glGetError();
 }
 
 //==========================================================================
@@ -138,9 +135,7 @@ FBlurShader::BlurSetup *FBlurShader::GetSetup(float blurAmount, int sampleCount)
 	blurSetup.VerticalShader->SetAttribLocation(0, "PositionInProjection");
 	blurSetup.VerticalShader->Link("vertical blur");
 	blurSetup.VerticalShader->Bind();
-	int error = glGetError();
 	glUniform1i(glGetUniformLocation(*blurSetup.VerticalShader.get(), "SourceTexture"), 0);
-	error = glGetError();
 
 	blurSetup.HorizontalShader = std::make_shared<FShaderProgram>();
 	blurSetup.HorizontalShader->Compile(FShaderProgram::Vertex, "horizontal blur vertex shader", vertexCode);

src/gl/shaders/gl_tonemapshader.cpp

@@ -0,0 +1,65 @@
+/*
+** gl_tonemapshader.cpp
+** Converts a HDR texture to 0-1 range by applying a tonemap operator
+**
+**---------------------------------------------------------------------------
+** Copyright 2016 Magnus Norddahl
+** All rights reserved.
+**
+** Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions
+** are met:
+**
+** 1. Redistributions of source code must retain the above copyright
+**    notice, this list of conditions and the following disclaimer.
+** 2. Redistributions in binary form must reproduce the above copyright
+**    notice, this list of conditions and the following disclaimer in the
+**    documentation and/or other materials provided with the distribution.
+** 3. The name of the author may not be used to endorse or promote products
+**    derived from this software without specific prior written permission.
+** 4. When not used as part of GZDoom or a GZDoom derivative, this code will be
+**    covered by the terms of the GNU Lesser General Public License as published
+**    by the Free Software Foundation; either version 2.1 of the License, or (at
+**    your option) any later version.
+** 5. Full disclosure of the entire project's source code, except for third
+**    party libraries is mandatory. (NOTE: This clause is non-negotiable!)
+**
+** THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+** IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+** OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+** IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+** INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+** NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+** THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+**---------------------------------------------------------------------------
+**
+*/
+
+#include "gl/system/gl_system.h"
+#include "files.h"
+#include "m_swap.h"
+#include "v_video.h"
+#include "gl/gl_functions.h"
+#include "vectors.h"
+#include "gl/system/gl_interface.h"
+#include "gl/system/gl_framebuffer.h"
+#include "gl/system/gl_cvars.h"
+#include "gl/shaders/gl_tonemapshader.h"
+
+void FTonemapShader::Bind()
+{
+	if (!mShader)
+	{
+		mShader.Compile(FShaderProgram::Vertex, "shaders/glsl/tonemap.vp");
+		mShader.Compile(FShaderProgram::Fragment, "shaders/glsl/tonemap.fp");
+		mShader.SetFragDataLocation(0, "FragColor");
+		mShader.Link("shaders/glsl/tonemap");
+		mShader.SetAttribLocation(0, "PositionInProjection");
+		SceneTexture.Init(mShader, "InputTexture");
+		Exposure.Init(mShader, "ExposureAdjustment");
+	}
+	mShader.Bind();
+}

src/gl/shaders/gl_tonemapshader.h

@@ -0,0 +1,18 @@
+#ifndef __GL_TONEMAPSHADER_H
+#define __GL_TONEMAPSHADER_H
+
+#include "gl_shaderprogram.h"
+
+class FTonemapShader
+{
+public:
+	void Bind();
+
+	FBufferedUniform1i SceneTexture;
+	FBufferedUniform1f Exposure;
+
+private:
+	FShaderProgram mShader;
+};
+
+#endif