X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgraphics%2Fglcontext.h;h=38c36b109d9bfc0f14b3dcbbb6240d68fd6ff203;hb=b99a9eb342d0f6ba5509c6d9f8ab0b0b5d5d2979;hp=8cf75c82948fc657869e1d3685dbfcfeb4133233;hpb=213ca43656411a06bbf1c0d18e4ebacaf545eb34;p=libs%2Fgui.git

diff --git a/source/graphics/glcontext.h b/source/graphics/glcontext.h
index 8cf75c8..38c36b1 100644
--- a/source/graphics/glcontext.h
+++ b/source/graphics/glcontext.h
@@ -2,6 +2,7 @@
 #define MSP_GRAPHICS_GLCONTEXT_H_
 
 #include <stdexcept>
+#include "mspgui_api.h"
 
 namespace Msp {
 namespace Graphics {
@@ -11,34 +12,42 @@ class Window;
 
 struct GLOptions
 {
-	bool alpha;
-	bool stencil;
-	bool doublebuffer;
-	unsigned multisample;
+	static constexpr unsigned DEFAULT_VERSION = 0;
+	static constexpr unsigned LATEST_VERSION = 0xFFFFFFFF;
 
-	GLOptions();
+	bool alpha = false;
+	bool stencil = false;
+	bool doublebuffer = true;
+	unsigned multisample = 0;
+	bool forward_compatible = false;
+	bool core_profile = false;
+	unsigned gl_version_major = DEFAULT_VERSION;
+	unsigned gl_version_minor = DEFAULT_VERSION;
 };
 
 
-class unsupported_gl_mode: public std::runtime_error
+class MSPGUI_API unsupported_gl_mode: public std::runtime_error
 {
 public:
 	unsupported_gl_mode(const GLOptions &);
-	virtual ~unsupported_gl_mode() throw () { }
+
+private:
+	static std::string format_version(const GLOptions &);
 };
 
 
-class GLContext
+class MSPGUI_API GLContext
 {
 private:
 	struct Private;
 
 	Display &display;
 	Window &window;
-	Private *priv;
+	Private *priv = nullptr;
 
 public:
 	GLContext(Window &wnd, const GLOptions &opts = GLOptions());
+	GLContext(Window &wnd, unsigned, unsigned);
 private:
 	void platform_init(const GLOptions &);
 public: