Do not clear previous assignments on assignment to array subscript

[libs/gl.git] / source / renderbuffer.cpp

diff --git a/source/renderbuffer.cpp b/source/renderbuffer.cpp
index 9d19e08b814c7b6976236e61ba2bb32c36f59e6c..5bea07fc81e60a70c26c7744f3e7d5a6434bc621 100644 (file)
--- 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 {
 
@@ -44,9 +47,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");
+
        fmt = normalize_format(fmt);
        require_pixelformat(fmt);