Remove the deprecated ProgramBuilder class

[libs/gl.git] / source / framebuffer.h

diff --git a/source/framebuffer.h b/source/framebuffer.h
index 5a9993dae202421f1c6434ebe5bb4bd006c5569f..3054bd646b3e4d4709c4ee7ec8a96a5b20bdfa7a 100644 (file)
--- a/source/framebuffer.h
+++ b/source/framebuffer.h
@@ -5,8 +5,9 @@
 #include "bindable.h"
 #include "gl.h"
 #include "texturecube.h"
+#include <msp/gl/extensions/arb_geometry_shader4.h>
+#include <msp/gl/extensions/ext_framebuffer_multisample.h>
 #include <msp/gl/extensions/ext_framebuffer_object.h>
-#include <msp/gl/extensions/msp_stereo_rendering.h>
 #include <msp/gl/extensions/nv_fbo_color_attachments.h>
 
 namespace Msp {
@@ -35,6 +36,9 @@ enum FramebufferStatus
        FRAMEBUFFER_INCOMPLETE_FORMATS            = GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT,
        FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER        = GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER,
        FRAMEBUFFER_INCOMPLETE_READ_BUFFER        = GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER,
+       FRAMEBUFFER_INCOMPLETE_MULTISAMPLE        = GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE,
+       FRAMEBUFFER_INCOMPLETE_LAYER_COUNT        = GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_ARB,
+       FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS      = GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS,
        FRAMEBUFFER_UNSUPPORTED                   = GL_FRAMEBUFFER_UNSUPPORTED,
        FRAMEBUFFER_COMPLETE                      = GL_FRAMEBUFFER_COMPLETE
 };
@@ -46,20 +50,6 @@ enum BufferBits
        STENCIL_BUFFER_BIT = GL_STENCIL_BUFFER_BIT
 };
 
-enum RWBuffer
-{
-       NO_BUFFER      = GL_NONE,
-       FRONT_LEFT     = GL_FRONT_LEFT,
-       FRONT_RIGHT    = GL_FRONT_RIGHT,
-       BACK_LEFT      = GL_BACK_LEFT,
-       BACK_RIGHT     = GL_BACK_RIGHT,
-       FRONT          = GL_FRONT,
-       BACK           = GL_BACK,
-       LEFT           = GL_LEFT,
-       RIGHT          = GL_RIGHT,
-       FRONT_AND_BACK = GL_FRONT_AND_BACK
-};
-
 class framebuffer_incomplete: public std::runtime_error
 {
 public:
@@ -148,6 +138,7 @@ public:
        void viewport(int, int, unsigned, unsigned);
        void reset_viewport();
 
+       void clear();
        void clear(BufferBits);
 
        /** Blits a region from another framebuffer into this one.  If the source