X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Frenderbuffer.cpp;h=e86a97a50b63393d3220c02dd96e9d0e5037b85c;hb=bec07999d95b76f4b47cffcc564d0cd0afc0435e;hp=17d36846e696cdccb36d4b5a28e14d2e301b6025;hpb=08e19bc2b4eba572bc7699378cf55cd8772ac67e;p=libs%2Fgl.git

diff --git a/source/renderbuffer.cpp b/source/renderbuffer.cpp
index 17d36846..e86a97a5 100644
--- a/source/renderbuffer.cpp
+++ b/source/renderbuffer.cpp
@@ -1,8 +1,11 @@
 #include <msp/gl/extensions/arb_direct_state_access.h>
 #include <msp/gl/extensions/ext_framebuffer_multisample.h>
 #include <msp/gl/extensions/ext_framebuffer_object.h>
+#include "misc.h"
 #include "renderbuffer.h"
 
+using namespace std;
+
 namespace Msp {
 namespace GL {
 
@@ -35,9 +38,21 @@ void Renderbuffer::storage(PixelFormat fmt, unsigned wd, unsigned ht)
 	}
 }
 
+unsigned Renderbuffer::get_max_samples()
+{
+	static unsigned max_samples = (EXT_framebuffer_multisample ? get_i(GL_MAX_SAMPLES) : 0);
+	return max_samples;
+}
+
 void Renderbuffer::storage_multisample(unsigned samples, PixelFormat fmt, unsigned wd, unsigned ht)
 {
+	if(!samples)
+		return storage(fmt, wd, ht);
+
 	static Require _req(EXT_framebuffer_multisample);
+	if(samples>get_max_samples())
+		throw out_of_range("Renderbuffer::storage_multisample");
+
 	require_pixelformat(fmt);
 
 	width = wd;