Complete rewrite of extension handling

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

diff --git a/source/renderbuffer.cpp b/source/renderbuffer.cpp
index bd37aeea2bc59b460bbf17d4ecc32351bdfbe8dd..c920633e0f2e0e84a009cab91477a1b0197a93c8 100644 (file)
--- a/source/renderbuffer.cpp
+++ b/source/renderbuffer.cpp
@@ -1,11 +1,3 @@
-/* $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 "renderbuffer.h"
@@ -15,44 +7,44 @@ namespace GL {
 
 Renderbuffer::Renderbuffer()
 {
-       static RequireExtension _ext("GL_EXT_framebuffer_object");
+       static Require _req(EXT_framebuffer_object);
 
-       glGenRenderbuffersEXT(1, &id);
+       glGenRenderbuffers(1, &id);
 }
 
 Renderbuffer::~Renderbuffer()
 {
-       glDeleteRenderbuffersEXT(1, &id);
+       glDeleteRenderbuffers(1, &id);
 }
 
-void Renderbuffer::storage(PixelFormat fmt, unsigned w, unsigned h)
+void Renderbuffer::storage(PixelFormat fmt, unsigned wd, unsigned ht)
 {
        Bind _bind(this, true);
-       width = w;
-       height = h;
-       glRenderbufferStorageEXT(GL_RENDERBUFFER_EXT, fmt, width, height);
+       width = wd;
+       height = ht;
+       glRenderbufferStorage(GL_RENDERBUFFER, fmt, width, height);
 }
 
-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");
+       static Require _req(EXT_framebuffer_multisample);
 
        Bind _bind(this, true);
-       width = w;
-       height = h;
-       glRenderbufferStorageMultisampleEXT(GL_RENDERBUFFER_EXT, samples, fmt, width, height);
+       width = wd;
+       height = ht;
+       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