X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fextension.h;h=671e4af9aac989afff2a30c9d6cec2a474120c98;hb=9afdf8a0813de5c4d5277b0ccbfe86051af5624e;hp=4072869cc25662d8c76fe2d4ab94c5700515f2a3;hpb=2e7f19b895424c3a77940e648639f8df2b395d0f;p=libs%2Fgl.git

diff --git a/source/extension.h b/source/extension.h
index 4072869c..671e4af9 100644
--- a/source/extension.h
+++ b/source/extension.h
@@ -6,60 +6,77 @@
 namespace Msp {
 namespace GL {
 
+enum GLApi
+{
+	OPENGL,
+	OPENGL_ES2
+};
+
+
 struct Version
 {
 	unsigned short major;
 	unsigned short minor;
-};
 
-typedef void ExtFunc();
+	Version();
+	Version(unsigned short, unsigned short);
+	Version(const std::string &);
 
-/**
-Indicates whether an extension is supported.  If this returns true, the
-functions of that extension are safe to use.
-*/
-bool is_supported(const std::string &);
+	bool operator>=(const Version &) const;
+};
 
-/**
-Checks that an extension is supported and throws if it isn't.
-*/
-void require_extension(const std::string &);
 
-/**
-RAII version of require_extension.  Useful as a static local variable.
-*/
-struct RequireExtension
+class Extension
 {
-	RequireExtension(const std::string &e) { require_extension(e); }
-};
+public:
+	enum SupportLevel
+	{
+		UNSUPPORTED,
+		EXTENSION,
+		CORE
+	};
 
-/**
-Returns the OpenGL version number, as reported by the implementation.
-Functions up to the returned version are safe to use.
-*/
-const Version &get_gl_version();
+	typedef SupportLevel (*InitFunc)();
 
-/**
-Indicates whether the OpenGL version is at least a.b.
-*/
-bool is_version_at_least(unsigned a, unsigned b);
+private:
+	const char *name;
+	InitFunc init_func;
+	mutable bool init_done;
+	mutable SupportLevel support;
+
+public:
+	Extension(const char *, InitFunc);
 
-/**
-Checks that the OpenGL version is at least a.b and throws if it isn't.
-*/
-void require_version(unsigned a, unsigned b);
+	const char *get_name() const { return name; }
+	operator bool() const;
+};
 
-/**
-RAII version of require_version.  Useful as a static local variable.
-*/
-struct RequireVersion
+
+struct Require
 {
-	RequireVersion(unsigned a, unsigned b) { require_version(a, b); }
+	Require(const Extension &);
 };
 
-/**
-Returns the address of an extension function.  Only indended for internal use.
-*/
+
+typedef void ExtFunc();
+
+/** Indicates whether an extension is supported. */
+bool is_supported(const std::string &);
+
+/** Returns the API for which the library was compiled. */
+GLApi get_gl_api();
+
+/** Returns the OpenGL version number, as reported by the implementation. */
+const Version &get_gl_version();
+
+/** Returns the GLSL version number, as reported by the implementation. */
+const Version &get_glsl_version();
+
+/** Indicates whether the OpenGL version is at least a.b. */
+bool is_version_at_least(unsigned a, unsigned b);
+
+/** Returns the address of an extension function.  Only indended for internal
+use. */
 ExtFunc *get_proc_address(const std::string &);
 
 } // namespace GL