- added the GL framebuffer class.

Everything compiles again but obviously no init code will run for now.

source/common/rendering/gl_load/gl_extlist.txt

@@ -0,0 +1,15 @@
+-- List of OpenGL extensions for glLoadGen
+
+-- Generation of gl_load.c and gl_load.h files:
+-- > lua LoadGen.lua -style=pointer_c -spec=gl -version=4.5 -profile=compatibility -extfile=gl_extlist.txt load
+
+ARB_buffer_storage
+ARB_shader_storage_buffer_object
+ARB_texture_compression
+ARB_texture_rectangle
+EXT_framebuffer_object
+EXT_texture_compression_s3tc
+EXT_texture_filter_anisotropic
+EXT_texture_sRGB
+KHR_debug
+ARB_invalidate_subdata

source/common/rendering/gl_load/gl_interface.cpp

@@ -0,0 +1,249 @@
+// 
+//---------------------------------------------------------------------------
+//
+// Copyright(C) 2005-2016 Christoph Oelckers
+// All rights reserved.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with this program.  If not, see http://www.gnu.org/licenses/
+//
+//--------------------------------------------------------------------------
+//
+/*
+** r_opengl.cpp
+**
+** OpenGL system interface
+**
+*/
+
+#include "gl_load/gl_system.h"
+#include "tarray.h"
+#include "basics.h"
+#include "m_argv.h"
+#include "version.h"
+#include "v_video.h"
+#include "printf.h"
+#include "gl_load/gl_interface.h"
+//#include "hwrenderer/utility/hw_cvars.h"
+
+static TArray<FString>  m_Extensions;
+RenderContext gl;
+static double realglversion;	// this is public so the statistics code can access it.
+
+//==========================================================================
+//
+// 
+//
+//==========================================================================
+
+static void CollectExtensions()
+{
+	const char *extension;
+
+	int max = 0;
+	glGetIntegerv(GL_NUM_EXTENSIONS, &max);
+
+	// Use modern method to collect extensions
+	for (int i = 0; i < max; i++)
+	{
+		extension = (const char*)glGetStringi(GL_EXTENSIONS, i);
+		m_Extensions.Push(FString(extension));
+	}
+}
+
+//==========================================================================
+//
+// 
+//
+//==========================================================================
+
+static bool CheckExtension(const char *ext)
+{
+	for (unsigned int i = 0; i < m_Extensions.Size(); ++i)
+	{
+		if (m_Extensions[i].CompareNoCase(ext) == 0) return true;
+	}
+
+	return false;
+}
+
+
+
+//==========================================================================
+//
+// 
+//
+//==========================================================================
+
+static void InitContext()
+{
+	gl.flags=0;
+}
+
+//==========================================================================
+//
+// 
+//
+//==========================================================================
+
+#define FUDGE_FUNC(name, ext) 	if (_ptrc_##name == NULL) _ptrc_##name = _ptrc_##name##ext;
+
+
+void gl_LoadExtensions()
+{
+	InitContext();
+	CollectExtensions();
+
+	const char *glversion = (const char*)glGetString(GL_VERSION);
+
+	const char *version = Args->CheckValue("-glversion");
+	realglversion = strtod(glversion, NULL);
+
+
+	if (version == NULL)
+	{
+		version = glversion;
+	}
+	else
+	{
+		double v1 = strtod(version, NULL);
+		if (v1 >= 3.0 && v1 < 3.3)
+		{
+			v1 = 3.3;	// promote '3' to 3.3 to avoid falling back to the legacy path.
+			version = "3.3";
+		}
+		if (realglversion < v1) version = glversion;
+		else Printf("Emulating OpenGL v %s\n", version);
+	}
+
+	float gl_version = (float)strtod(version, NULL) + 0.01f;
+
+	// Don't even start if it's lower than 2.0 or no framebuffers are available (The framebuffer extension is needed for glGenerateMipmapsEXT!)
+	if (gl_version < 3.3f)
+	{
+		I_FatalError("Unsupported OpenGL version.\nAt least OpenGL 3.3 is required to run " GAMENAME ".\nFor older versions of OpenGL please download the vintage build of " GAMENAME ".\n");
+	}
+
+
+	// add 0.01 to account for roundoff errors making the number a tad smaller than the actual version
+	gl.glslversion = strtod((char*)glGetString(GL_SHADING_LANGUAGE_VERSION), NULL) + 0.01f;
+
+	gl.vendorstring = (char*)glGetString(GL_VENDOR);
+	gl.modelstring = (char*)glGetString(GL_RENDERER);
+
+	// first test for optional features
+	if (CheckExtension("GL_ARB_texture_compression")) gl.flags |= RFL_TEXTURE_COMPRESSION;
+	if (CheckExtension("GL_EXT_texture_compression_s3tc")) gl.flags |= RFL_TEXTURE_COMPRESSION_S3TC;
+
+	if (gl_version < 4.f)
+	{
+#ifdef _WIN32
+		if (strstr(gl.vendorstring, "ATI Tech"))
+		{
+			gl.flags |= RFL_NO_CLIP_PLANES;	// gl_ClipDistance is horribly broken on ATI GL3 drivers for Windows. (TBD: Relegate to vintage build? Maybe after the next survey.)
+		}
+#endif
+		gl.glslversion = 3.31f;	// Force GLSL down to 3.3.
+	}
+	else if (gl_version < 4.5f)
+	{
+		// don't use GL 4.x features when running a GL 3.x context.
+		if (CheckExtension("GL_ARB_buffer_storage"))
+		{
+			// work around a problem with older AMD drivers: Their implementation of shader storage buffer objects is piss-poor and does not match uniform buffers even closely.
+			// Recent drivers, GL 4.4 don't have this problem, these can easily be recognized by also supporting the GL_ARB_buffer_storage extension.
+			if (CheckExtension("GL_ARB_shader_storage_buffer_object"))
+			{
+				gl.flags |= RFL_SHADER_STORAGE_BUFFER;
+			}
+			gl.flags |= RFL_BUFFER_STORAGE;
+		}
+	}
+	else
+	{
+		// Assume that everything works without problems on GL 4.5 drivers where these things are core features.
+		gl.flags |= RFL_SHADER_STORAGE_BUFFER | RFL_BUFFER_STORAGE;
+	}
+
+	// Mesa implements shader storage only for fragment shaders.
+	// Just disable the feature there. The light buffer may just use a uniform buffer without any adverse effects.
+	int v = 0;
+	glGetIntegerv(GL_MAX_VERTEX_SHADER_STORAGE_BLOCKS, &v);
+	if (v == 0)
+		gl.flags &= ~RFL_SHADER_STORAGE_BUFFER;
+
+
+	if (gl_version >= 4.3f || CheckExtension("GL_ARB_invalidate_subdata")) gl.flags |= RFL_INVALIDATE_BUFFER;
+	if (gl_version >= 4.3f || CheckExtension("GL_KHR_debug")) gl.flags |= RFL_DEBUG;
+
+	glGetIntegerv(GL_MAX_FRAGMENT_UNIFORM_COMPONENTS, &v);
+	gl.maxuniforms = v;
+	glGetIntegerv(GL_MAX_UNIFORM_BLOCK_SIZE, &v);
+	gl.maxuniformblock = v;
+	glGetIntegerv(GL_UNIFORM_BUFFER_OFFSET_ALIGNMENT, &v);
+	gl.uniformblockalignment = v;
+
+	glGetIntegerv(GL_MAX_TEXTURE_SIZE, &gl.max_texturesize);
+	glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
+}
+
+//==========================================================================
+//
+// 
+//
+//==========================================================================
+
+void gl_PrintStartupLog()
+{
+	int v = 0;
+	glGetIntegerv(GL_CONTEXT_PROFILE_MASK, &v);
+
+	Printf ("GL_VENDOR: %s\n", glGetString(GL_VENDOR));
+	Printf ("GL_RENDERER: %s\n", glGetString(GL_RENDERER));
+	Printf ("GL_VERSION: %s (%s profile)\n", glGetString(GL_VERSION), (v & GL_CONTEXT_CORE_PROFILE_BIT)? "Core" : "Compatibility");
+	Printf ("GL_SHADING_LANGUAGE_VERSION: %s\n", glGetString(GL_SHADING_LANGUAGE_VERSION));
+	Printf (PRINT_LOG, "GL_EXTENSIONS:");
+	for (unsigned i = 0; i < m_Extensions.Size(); i++)
+	{
+		Printf(PRINT_LOG, " %s", m_Extensions[i].GetChars());
+	}
+
+	glGetIntegerv(GL_MAX_TEXTURE_SIZE, &v);
+	Printf("\nMax. texture size: %d\n", v);
+	glGetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS, &v);
+	Printf ("Max. texture units: %d\n", v);
+	glGetIntegerv(GL_MAX_VARYING_FLOATS, &v);
+	Printf ("Max. varying: %d\n", v);
+	
+	if (gl.flags & RFL_SHADER_STORAGE_BUFFER)
+	{
+		glGetIntegerv(GL_MAX_COMBINED_SHADER_STORAGE_BLOCKS, &v);
+		Printf("Max. combined shader storage blocks: %d\n", v);
+		glGetIntegerv(GL_MAX_VERTEX_SHADER_STORAGE_BLOCKS, &v);
+		Printf("Max. vertex shader storage blocks: %d\n", v);
+	}
+	else
+	{
+		glGetIntegerv(GL_MAX_UNIFORM_BLOCK_SIZE, &v);
+		Printf("Max. uniform block size: %d\n", v);
+		glGetIntegerv(GL_UNIFORM_BUFFER_OFFSET_ALIGNMENT, &v);
+		Printf("Uniform block alignment: %d\n", v);
+	}
+}
+
+std::pair<double, bool> gl_getInfo()
+{
+	// gl_ARB_bindless_texture is the closest we can get to determine Vulkan support from OpenGL.
+	// This isn't foolproof because Intel doesn't support it but for NVidia and AMD support of this extension means Vulkan support.
+	return std::make_pair(realglversion, CheckExtension("GL_ARB_bindless_texture"));
+}

source/common/rendering/gl_load/gl_interface.h

@@ -0,0 +1,19 @@
+#ifndef R_RENDER
+#define R_RENDER
+
+struct RenderContext
+{
+	unsigned int flags;
+	unsigned int maxuniforms;
+	unsigned int maxuniformblock;
+	unsigned int uniformblockalignment;
+	float glslversion;
+	int max_texturesize;
+	char * vendorstring;
+	char * modelstring;
+};
+
+extern RenderContext gl;
+
+#endif
+

source/common/rendering/gl_load/gl_system.h

@@ -0,0 +1,44 @@
+#ifndef __GL_PCH_H
+#define __GL_PCH_H
+
+#include <math.h>
+#include <float.h>
+#include <limits.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <stddef.h>
+#include <string.h>
+#include <ctype.h>
+#include <limits.h>
+#include <assert.h>
+#include <errno.h>
+#include <stdarg.h>
+#include <signal.h>
+#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__OpenBSD__)
+#include <malloc.h>
+#endif
+#include <time.h>
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+
+//GL headers
+#include "gl_load/gl_load.h"
+
+#if defined(__APPLE__)
+	#include <OpenGL/OpenGL.h>
+#endif
+
+
+
+#ifdef _MSC_VER
+#pragma warning(disable : 4244)     // MIPS
+#pragma warning(disable : 4136)     // X86
+#pragma warning(disable : 4051)     // ALPHA
+
+#pragma warning(disable : 4018)     // signed/unsigned mismatch
+#pragma warning(disable : 4305)     // truncate from double to float
+#endif
+
+#endif //__GL_PCH_H