X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frenderbuffer.cpp;h=b2b25a0890212b41bc08251845d80385abf7451a;hb=a480d4cc323db7cc77388f5af0094dd593dc66e9;hp=31a623ea617a179500c1cc821ffc232134d2ce09;hpb=b617c5d7b5283ad260a77f01e42e6170cabbc03d;p=libs%2Fgl.git

diff --git a/source/renderbuffer.cpp b/source/renderbuffer.cpp
index 31a623ea..b2b25a08 100644
--- a/source/renderbuffer.cpp
+++ b/source/renderbuffer.cpp
@@ -1,12 +1,5 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
-#include "extension.h"
-#include "ext_framebuffer_object.h"
+#include <msp/gl/extensions/ext_framebuffer_multisample.h>
+#include <msp/gl/extensions/ext_framebuffer_object.h>
 #include "renderbuffer.h"
 
 namespace Msp {
@@ -14,28 +7,46 @@ namespace GL {
 
 Renderbuffer::Renderbuffer()
 {
-	static RequireExtension _ext("GL_EXT_framebuffer_object");
+	static Require _req(EXT_framebuffer_object);
 
-	glGenRenderbuffersEXT(1, &id);
-	bind();
+	glGenRenderbuffers(1, &id);
 }
 
 Renderbuffer::~Renderbuffer()
 {
-	glDeleteRenderbuffersEXT(1, &id);
+	glDeleteRenderbuffers(1, &id);
+}
+
+void Renderbuffer::storage(PixelFormat fmt, unsigned wd, unsigned ht)
+{
+	require_pixelformat(fmt);
+	BindRestore _bind(this);
+	width = wd;
+	height = ht;
+	glRenderbufferStorage(GL_RENDERBUFFER, fmt, width, height);
+}
+
+void Renderbuffer::storage_multisample(unsigned samples, PixelFormat fmt, unsigned wd, unsigned ht)
+{
+	static Require _req(EXT_framebuffer_multisample);
+	require_pixelformat(fmt);
+
+	BindRestore _bind(this);
+	width = wd;
+	height = ht;
+	glRenderbufferStorageMultisample(GL_RENDERBUFFER, samples, fmt, width, height);
 }
 
 void Renderbuffer::bind() const
 {
-	glBindRenderbufferEXT(GL_RENDERBUFFER_EXT, id);
+	if(set_current(this))
+		glBindRenderbuffer(GL_RENDERBUFFER, id);
 }
 
-void Renderbuffer::storage(PixelFormat fmt, unsigned w, unsigned h)
+void Renderbuffer::unbind()
 {
-	bind();
-	width = w;
-	height = h;
-	glRenderbufferStorageEXT(GL_RENDERBUFFER_EXT, fmt, width, height);
+	if(set_current(0))
+		glBindRenderbuffer(GL_RENDERBUFFER, 0);
 }
 
 } // namespace GL