Some fixes to assignment management in UnusedVariableLocator

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

diff --git a/source/renderbuffer.cpp b/source/renderbuffer.cpp
index 6d9592b198e44be071fb8a8f421338be11179ec5..5098362261e45743d396c81ea9bc5b9878d3c9ae 100644 (file)
--- a/source/renderbuffer.cpp
+++ b/source/renderbuffer.cpp
@@ -1,6 +1,6 @@
-#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 "renderbuffer.h"
 
 namespace Msp {
@@ -8,44 +8,72 @@ 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);
 }
 
-void Renderbuffer::storage(PixelFormat fmt, unsigned w, unsigned h)
+PixelFormat Renderbuffer::normalize_format(PixelFormat fmt)
 {
-       Bind _bind(this, true);
-       width = w;
-       height = h;
-       glRenderbufferStorageEXT(GL_RENDERBUFFER_EXT, fmt, width, height);
+       if(!get_component_size(fmt) && MSP_sized_internal_formats)
+       {
+               unsigned size = (fmt==DEPTH_COMPONENT ? get_gl_api()==OPENGL_ES2 ? 2 : 4 : 1);
+               return get_sized_pixelformat(fmt, size);
+       }
+
+       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_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);
+       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