X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fextension.cpp;h=fda183d22f374ea309851019fbcc4f271d8d430a;hb=5b3aa68610238de4e6f13c4bf9ec1745751e820c;hp=e233ee0012eb60563366d7061acf682ae92f96b9;hpb=cf89f0205dfad2c8df47217e34302da71bbeda01;p=libs%2Fgl.git

diff --git a/source/extension.cpp b/source/extension.cpp
index e233ee00..fda183d2 100644
--- a/source/extension.cpp
+++ b/source/extension.cpp
@@ -75,10 +75,22 @@ bool is_supported(const string &ext)
 
 	if(!init_done)
 	{
-		if(const char *gl_ext = reinterpret_cast<const char *>(glGetString(GL_EXTENSIONS)))
+		if(get_gl_api()==OPENGL && get_gl_version()>=Version(3, 0))
 		{
-			vector<string> exts = split(gl_ext);
-			extensions.insert(exts.begin(), exts.end());
+			typedef GLubyte *(APIENTRY *FPtr_glGetStringi)(GLenum, GLuint);
+			FPtr_glGetStringi glGetStringi = reinterpret_cast<FPtr_glGetStringi>(get_proc_address("glGetStringi"));
+			int n_extensions;
+			glGetIntegerv(GL_NUM_EXTENSIONS, &n_extensions);
+			for(int i=0; i<n_extensions; ++i)
+				extensions.insert(reinterpret_cast<const char *>(glGetStringi(GL_EXTENSIONS, i)));
+		}
+		else
+		{
+			if(const char *gl_ext = reinterpret_cast<const char *>(glGetString(GL_EXTENSIONS)))
+			{
+				vector<string> exts = split(gl_ext);
+				extensions.insert(exts.begin(), exts.end());
+			}
 		}
 
 		if(const char *renderer_ptr = reinterpret_cast<const char *>(glGetString(GL_RENDERER)))
@@ -93,7 +105,7 @@ bool is_supported(const string &ext)
 
 				/* AMD's uniform buffer objects only work with the core version of
 				shaders. */
-				if(!(get_gl_version()>=Version(2, 0)))
+				if(get_gl_version()<Version(2, 0))
 					extensions.erase("GL_ARB_uniform_buffer_object");
 			}
 		}
@@ -120,6 +132,25 @@ GLApi get_gl_api()
 #endif
 }
 
+inline GLProfile _get_gl_profile()
+{
+	if(get_gl_api()==OPENGL && get_gl_version()>=Version(3, 0))
+	{
+		int mask;
+		glGetIntegerv(GL_CONTEXT_PROFILE_MASK, &mask);
+		if(mask==GL_CONTEXT_CORE_PROFILE_BIT)
+			return CORE_PROFILE;
+	}
+
+	return COMPATIBILITY_PROFILE;
+}
+
+GLProfile get_gl_profile()
+{
+	static GLProfile profile = _get_gl_profile();
+	return profile;
+}
+
 inline Version _get_gl_version()
 {
 	const char *gl_ver_ptr = reinterpret_cast<const char *>(glGetString(GL_VERSION));