Synchronise game engine with Tuhopuu2 tree.

3 files changed, 27 insertions, 18 deletions

diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.cpp b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.cpp
index 134c3ca90d3..eaed233b86c 100644
--- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.cpp
+++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.cpp
@@ -76,7 +76,16 @@
        the GL function entry
 
 */
-#ifdef __APPLE__
+#if defined(BGL_NO_EXTENSIONS)
+static void bglInitEntryPoints (void) {}
+static void bglDeallocEntryPoints (void) {}
+
+static void *bglGetProcAddress(const GLubyte* entry)
+{
+	/* No Extensions! */
+	return NULL;
+}
+#elif defined(__APPLE__)
 /* http://developer.apple.com/qa/qa2001/qa1188.html */
 CFBundleRef gBundleRefOpenGL = NULL;
 
@@ -207,11 +216,11 @@ static void *bglGetProcAddress(const GLubyte* entry)
 
    GL Extension Manager.
 */
-static std::vector<STR_String> extensions;
-/* Bit array of available extensions */
+	/* Bit array of available extensions */
 static unsigned int enabled_extensions[(bgl::NUM_EXTENSIONS + 8*sizeof(unsigned int) - 1)/(8*sizeof(unsigned int))];
+static std::vector<STR_String> extensions;
 static int m_debug;
-
+	
 static void LinkExtensions();
 
 static void EnableExtension(bgl::ExtensionName name)
@@ -259,15 +268,12 @@ bool QueryVersion(int major, int minor)
 		int i = gl_version.Find('.');
 		gl_major = gl_version.Left(i).ToInt();
 		gl_minor = gl_version.Mid(i+1, gl_version.FindOneOf(". ", i+1) - i - 1).ToInt();
-		
-		if (m_debug)
+	
+		static bool doQueryVersion = m_debug;
+		if (doQueryVersion)
 		{
-			static bool doQueryVersion = true;
-			if (doQueryVersion)
-			{
-				doQueryVersion = false;
-				std::cout << "GL_VERSION: " << gl_major << "." << gl_minor << " (" << gl_version << ")" << std::endl;
-			}
+			doQueryVersion = false;
+			std::cout << "GL_VERSION: " << gl_major << "." << gl_minor << " (" << gl_version << ")" << std::endl;
 		}
 	}
 	
@@ -317,7 +323,7 @@ Use EnableExtension(_GL_EXT_...) to allow Blender to use the extension.
  ******************************************************************************/
 static void LinkExtensions()
 {
-	static bool doDebugMessages = true;
+	static bool doDebugMessages = m_debug;
 	extensions = STR_String((const char *) glGetString(GL_EXTENSIONS)).Explode(' ');
 
 	doDebugMessages = false;
diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h
index c249a488826..50a67ee7d6b 100644
--- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h
+++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h
@@ -48,6 +48,7 @@ namespace bgl
 	 */
 	typedef enum {
 		/* ARB Extensions */
+		_GL_ARB_imaging,
 		_GL_ARB_multitexture ,
 		_GLX_ARB_get_proc_address ,
 		_GL_ARB_transpose_matrix ,
diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/mkglext.py b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/mkglext.py
index 24f257b62ce..912b4785da1 100644
--- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/mkglext.py
+++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/mkglext.py
@@ -362,8 +362,8 @@ Example code output:
 		if (glUnlockArraysEXT && glLockArraysEXT)
 		{
 			EnableExtension(_GL_EXT_compiled_vertex_array);
-			if (m_debug && doDebugMessages)
-				std::cout << "Enabled GL_EXT_compiled_vertex_array" << std::endl;
+			if (doDebugMessages)
+				std::cout << "Detected GL_EXT_compiled_vertex_array" << std::endl;
 		} else {
 			std::cout << "ERROR: GL_EXT_compiled_vertex_array implementation is broken!" << std::endl;
 		}
@@ -374,11 +374,13 @@ def writeext(ext, fnlist):
 	if (find(blacklist, ext)):
 		return
 	if (len(fnlist) == 0):
+		# This extension has no functions to detect - don't need to wrap in
+		# #ifdef GL_extension names
 		print "\tif (QueryExtension(\"" + ext + "\"))"
 		print "\t{"
 		print "\t\tEnableExtension(_" + ext + ");"
-		print "\t\tif (m_debug && doDebugMessages)"
-		print "\t\t\tstd::cout << \"Enabled " + ext + "\" << std::endl;"
+		print "\t\tif (doDebugMessages)"
+		print "\t\t\tstd::cout << \"Detected " + ext + "\" << std::endl;"
 		print "\t}"
 		print
 		return
@@ -395,7 +397,7 @@ def writeext(ext, fnlist):
 			errcheck = errcheck + " && " + fn[0]
 	print "\t\tif (" + errcheck + ") {"
 	print "\t\t\tEnableExtension(_" + ext + ");"
-	print "\t\t\tif (m_debug && doDebugMessages)"
+	print "\t\t\tif (doDebugMessages)"
 	print "\t\t\t\tstd::cout << \"Enabled " + ext + "\" << std::endl;"
 	print "\t\t} else {"
 	print "\t\t\tstd::cout << \"ERROR: " + ext + " implementation is broken!\" << std::endl;"