X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Frenderbuffer.cpp;h=5bea07fc81e60a70c26c7744f3e7d5a6434bc621;hp=bd37aeea2bc59b460bbf17d4ecc32351bdfbe8dd;hb=9f5f027d1c93e541a12b8e4c04bd25b11edbe132;hpb=7f888de83aa5398fafaa7661547ee80395377b5c

diff --git a/source/renderbuffer.cpp b/source/renderbuffer.cpp
index bd37aeea..5bea07fc 100644
--- a/source/renderbuffer.cpp
+++ b/source/renderbuffer.cpp
@@ -1,58 +1,91 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007-2011  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
-#include "extension.h"
-#include "ext_framebuffer_multisample.h"
-#include "ext_framebuffer_object.h"
+#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 {
 
 Renderbuffer::Renderbuffer()
 {
-	static RequireExtension _ext("GL_EXT_framebuffer_object");
+	static Require _req(EXT_framebuffer_object);
 
-	glGenRenderbuffersEXT(1, &id);
+	if(ARB_direct_state_access)
+		glCreateRenderbuffers(1, &id);
+	else
+		glGenRenderbuffers(1, &id);
 }
 
 Renderbuffer::~Renderbuffer()
 {
-	glDeleteRenderbuffersEXT(1, &id);
+	glDeleteRenderbuffers(1, &id);
+}
+
+PixelFormat Renderbuffer::normalize_format(PixelFormat fmt)
+{
+	if(!get_component_size(fmt) && OES_required_internalformat)
+		return get_default_sized_pixelformat(fmt);
+
+	return fmt;
+}
+
+void Renderbuffer::storage(PixelFormat fmt, unsigned wd, unsigned ht)
+{
+	fmt = normalize_format(fmt);
+	require_pixelformat(fmt);
+	width = wd;
+	height = ht;
+	if(ARB_direct_state_access)
+		glNamedRenderbufferStorage(id, fmt, width, height);
+	else
+	{
+		BindRestore _bind(this);
+		glRenderbufferStorage(GL_RENDERBUFFER, fmt, width, height);
+	}
 }
 
-void Renderbuffer::storage(PixelFormat fmt, unsigned w, unsigned h)
+unsigned Renderbuffer::get_max_samples()
 {
-	Bind _bind(this, true);
-	width = w;
-	height = h;
-	glRenderbufferStorageEXT(GL_RENDERBUFFER_EXT, fmt, width, height);
+	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 w, unsigned h)
+void Renderbuffer::storage_multisample(unsigned samples, PixelFormat fmt, unsigned wd, unsigned ht)
 {
-	static RequireExtension _ext("GL_EXT_framebuffer_multisample");
+	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);
 
-	Bind _bind(this, true);
-	width = w;
-	height = h;
-	glRenderbufferStorageMultisampleEXT(GL_RENDERBUFFER_EXT, samples, fmt, width, height);
+	width = wd;
+	height = ht;
+	if(ARB_direct_state_access)
+		glNamedRenderbufferStorageMultisample(id, samples, fmt, width, height);
+	else
+	{
+		BindRestore _bind(this);
+		glRenderbufferStorageMultisample(GL_RENDERBUFFER, samples, fmt, width, height);
+	}
 }
 
 void Renderbuffer::bind() const
 {
 	if(set_current(this))
-		glBindRenderbufferEXT(GL_RENDERBUFFER_EXT, id);
+		glBindRenderbuffer(GL_RENDERBUFFER, id);
 }
 
 void Renderbuffer::unbind()
 {
 	if(set_current(0))
-		glBindRenderbufferEXT(GL_RENDERBUFFER_EXT, 0);
+		glBindRenderbuffer(GL_RENDERBUFFER, 0);
 }
 
 } // namespace GL