X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frenderbuffer.cpp;h=9d19e08b814c7b6976236e61ba2bb32c36f59e6c;hb=03de23d42e418f5d7d86c1fbe8665aef1f0a36bd;hp=89b255003c57dae72f21b1fac010f60e9d243d75;hpb=619aae12e01f25e79626a94c973927e5599e99a5;p=libs%2Fgl.git

diff --git a/source/renderbuffer.cpp b/source/renderbuffer.cpp
index 89b25500..9d19e08b 100644
--- a/source/renderbuffer.cpp
+++ b/source/renderbuffer.cpp
@@ -1,3 +1,4 @@
+#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 "renderbuffer.h"
@@ -9,7 +10,10 @@ Renderbuffer::Renderbuffer()
 {
 	static Require _req(EXT_framebuffer_object);
 
-	glGenRenderbuffers(1, &id);
+	if(ARB_direct_state_access)
+		glCreateRenderbuffers(1, &id);
+	else
+		glGenRenderbuffers(1, &id);
 }
 
 Renderbuffer::~Renderbuffer()
@@ -17,24 +21,44 @@ Renderbuffer::~Renderbuffer()
 	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);
-	Bind _bind(this, true);
 	width = wd;
 	height = ht;
-	glRenderbufferStorage(GL_RENDERBUFFER, fmt, width, height);
+	if(ARB_direct_state_access)
+		glNamedRenderbufferStorage(id, fmt, width, height);
+	else
+	{
+		BindRestore _bind(this);
+		glRenderbufferStorage(GL_RENDERBUFFER, fmt, width, height);
+	}
 }
 
 void Renderbuffer::storage_multisample(unsigned samples, PixelFormat fmt, unsigned wd, unsigned ht)
 {
 	static Require _req(EXT_framebuffer_multisample);
+	fmt = normalize_format(fmt);
 	require_pixelformat(fmt);
 
-	Bind _bind(this, true);
 	width = wd;
 	height = ht;
-	glRenderbufferStorageMultisample(GL_RENDERBUFFER, samples, fmt, width, height);
+	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