Refresh lighting and culling uniforms if the camera changes in pop_state

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

diff --git a/source/renderbuffer.cpp b/source/renderbuffer.cpp
index b2b25a0890212b41bc08251845d80385abf7451a..5098362261e45743d396c81ea9bc5b9878d3c9ae 100644 (file)
--- 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,47 @@ Renderbuffer::~Renderbuffer()
        glDeleteRenderbuffers(1, &id);
 }
 
+PixelFormat Renderbuffer::normalize_format(PixelFormat fmt)
+{
+       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);
-       BindRestore _bind(this);
        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);
 
-       BindRestore _bind(this);
        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