Added support for EGL with desktop OpenGL.

Also updated OpenGL registry submodule.

AnyGL.py

@@ -85,8 +85,14 @@
 glRegistry.setGenerator(DebugGenerator(glRegistry, diagFile = diagFile))
 glRegistry.apiGen(glOptions)
 
+glOptions.apiname = ['gl']
+glOptions.filename = os.path.join(args.outDir, 'AnyGLLoadEGL_GL.c')
+write('Outputting', glOptions.filename + '...')
+glRegistry.setGenerator(EGLLoadGenerator(diagFile = diagFile))
+glRegistry.apiGen(glOptions)
+
 glOptions.apiname = ['gles2']
-glOptions.filename = os.path.join(args.outDir, 'AnyGLLoadEGL.c')
+glOptions.filename = os.path.join(args.outDir, 'AnyGLLoadEGL_GLES.c')
 write('Outputting', glOptions.filename + '...')
 glRegistry.setGenerator(EGLLoadGenerator(diagFile = diagFile))
 glRegistry.apiGen(glOptions)

AnyGL/EGLLoadGenerator.py

@@ -16,15 +16,15 @@
 from .FunctionInfo import *
 
 class FeatureInfo:
-	def __init__(self, interface):
+	def __init__(self, interface, firstVersion):
 		self.name = interface.get('name')
 		self.extension = interface.tag == 'extension'
 		if self.extension:
 			self.version = None
 		else:
 			self.version = interface.get('number')
 
-		self.loadFirst = self.version != None and self.version == "2.0"
+		self.loadFirst = self.version != None and self.version == firstVersion
 		self.functions = []
 
 class EGLLoadGenerator(OutputGenerator):
@@ -43,13 +43,13 @@ def write(self, *args):
 
 	def beginFile(self, genOpts):
 		OutputGenerator.beginFile(self, genOpts)
+		self.gles = len(genOpts.apiname) == 1 and genOpts.apiname[0] == 'gles2'
+
 		self.write('#include "AnyGL.h"')
 		self.write('#include "gl.h"')
 		self.newLine()
-		self.write('#if ANYGL_LOAD == ANYGL_LOAD_EGL')
-		self.write('#if !ANYGL_GLES')
-		self.write('#error EGL loading currently requires OpenGL ES')
-		self.write('#endif')
+		self.write('#if ANYGL_LOAD == ANYGL_LOAD_EGL && ANYGL_GLES == ' +
+			('1' if self.gles else '0'))
 		self.write('#include <EGL/egl.h>')
 		self.write('#include <dlfcn.h>')
 		self.newLine()
@@ -65,7 +65,10 @@ def beginFile(self, genOpts):
 
 		self.write('int AnyGL_initialize(void)\n{')
 		self.write('\tif (gllib)\n\t\treturn 1;')
-		self.write('\tgllib = dlopen("libGLESv2.so", RTLD_LAZY);')
+		if self.gles:
+			self.write('\tgllib = dlopen("libGLESv2.so", RTLD_LAZY);')
+		else:
+			self.write('\tgllib = dlopen("libOpenGL.so", RTLD_LAZY);')
 		self.write('\treturn gllib != NULL;\n}')
 		self.newLine()
 
@@ -94,18 +97,20 @@ def endFile(self):
 		self.write('\t\treturn 0;')
 
 		# GL_HALF_FLOAT workaround
-		self.newLine()
-		self.write('\tif (AnyGL_atLeastVersion(3, 0, 1))')
-		self.write('\t\tAnyGL_HALF_FLOAT = GL_HALF_FLOAT;')
-		self.write('\telse')
-		self.write('\t\tAnyGL_HALF_FLOAT = GL_HALF_FLOAT_OES;')
+		if self.gles:
+			self.newLine()
+			self.write('\tif (AnyGL_atLeastVersion(3, 0, 1))')
+			self.write('\t\tAnyGL_HALF_FLOAT = GL_HALF_FLOAT;')
+			self.write('\telse')
+			self.write('\t\tAnyGL_HALF_FLOAT = GL_HALF_FLOAT_OES;')
 
 		# Load the core features.
+		glesBool = '1' if self.gles else '0'
 		for feature in self.coreFeatures:
 			self.newLine()
 			self.write('\t/*', feature.name, '*/')
 			self.write('\tif (AnyGL_atLeastVersion(' + feature.version[0] + ',', feature.version[2] + \
-				', 1))\n\t{')
+				', ' + glesBool + '))\n\t{')
 			for function in feature.functions:
 				self.write('\t\tAnyGL_' + function.name, '= (' + function.type + \
 					')dlsym(gllib, "' + function.name + '");')
@@ -148,7 +153,7 @@ def endFile(self):
 	def beginFeature(self, interface, emit):
 		OutputGenerator.beginFeature(self, interface, emit)
 		if emit:
-			self.curFeature = FeatureInfo(interface)
+			self.curFeature = FeatureInfo(interface, '2.0' if self.gles else '1.0')
 
 	def endFeature(self):
 		if self.curFeature:

README.md

@@ -41,6 +41,16 @@ When checking if a function is supported, you may use the `ANYGL_SUPPORTED()` ma
 
 > **Note:** OpenGL ES 2.0 uses the `GL_HALF_FLOAT_OES` enum, which is a different value from `GL_HALF_FLOAT`, used for all other OpenGL versions, including OpenGL ES 3.0. To work around this, the `AnyGL_HALF_FLOAT` variable is defined, which will have the value `GL_HALF_FLOAT_OES` after loading OpenGL ES 2.0 and `GL_HALF_FLOAT` otherwise.
 
+## Using in applications
+
+AnyGL manages loading of the OpenGL functions, but the application is responsible for management of the OpenGL contexts themselves. The flow of control within the application should be:
+
+1. Call `AnyGL_initialize()` at application startup.
+2. Create a context and bind it.
+3. Call `AnyGL_load()` to load the OpenGL functions.
+4. Optionally call `AnyGL_setDebugEnabled()` to toggle debugging. See next section for more information.
+5. When the application is closed, call `AnyGL_shutdown()`.
+
 ## Debugging
 
 When `ANYGL_ENABLE_DEBUG` is defined to 1 (default when `NDEBUG` isn't defined), the debugging feature may be enabled. Once you call `AnyGL_setDebugEnabled(1)` the OpenGL function pointers will be replaced with debug versions. These will check if any OpenGL occurred after the function was called, and if so will call the error function with a string version of the call, including the values of the parameters. (such as resolving enum names) By default, this will print to the console.

generated/AnyGLConfig.h

@@ -35,6 +35,11 @@
 #define ANYGL_GLES (ANYGL_ANDROID || ANYGL_IOS)
 #endif
 
+/* @define this to force usage of EGL, even when platform-specific libraries are available. */
+#ifndef ANYGL_FORCE_EGL
+#define ANYGL_FORCE_EGL 0
+#endif
+
 /* #define this to the OpenGL version (times 10) to include when loading via function pointer. */
 #ifndef ANYGL_GL_VERSION
 #define ANYGL_GL_VERSION 33
@@ -58,7 +63,7 @@
 #ifndef ANYGL_LOAD
 #if ANYGL_APPLE
 #	define ANYGL_LOAD ANYGL_LOAD_FPTR
-#elif ANYGL_GLES
+#elif ANYGL_GLES || ANYGL_FORCE_EGL
 #	define ANYGL_LOAD ANYGL_LOAD_EGL
 #elif ANYGL_WINDOWS
 #	define ANYGL_LOAD ANYGL_LOAD_WGL