X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuffer.h;h=b3a2902f6cb2ca89f663b8c20a8ea0207e8bbdd7;hb=80977251da90a6878b82d143c22b8335284d3b3e;hp=6f0a9708e18069485460587d3295b63aaf6055b1;hpb=8eb9a8d90e5597154dab666481037b306b7bbca2;p=libs%2Fgl.git

diff --git a/source/buffer.h b/source/buffer.h
index 6f0a9708..b3a2902f 100644
--- a/source/buffer.h
+++ b/source/buffer.h
@@ -3,30 +3,32 @@
 
 #include <vector>
 #include "gl.h"
+#include <msp/gl/extensions/arb_vertex_buffer_object.h>
+#include <msp/gl/extensions/arb_uniform_buffer_object.h>
 
 namespace Msp {
 namespace GL {
 
 enum BufferType
 {
-	ARRAY_BUFFER         = GL_ARRAY_BUFFER_ARB,
-	ELEMENT_ARRAY_BUFFER = GL_ELEMENT_ARRAY_BUFFER_ARB,
-	PIXEL_PACK_BUFFER    = GL_PIXEL_PACK_BUFFER_ARB,
-	PIXEL_UNPACK_BUFFER  = GL_PIXEL_UNPACK_BUFFER_ARB,
+	ARRAY_BUFFER         = GL_ARRAY_BUFFER,
+	ELEMENT_ARRAY_BUFFER = GL_ELEMENT_ARRAY_BUFFER,
+	PIXEL_PACK_BUFFER    = GL_PIXEL_PACK_BUFFER,
+	PIXEL_UNPACK_BUFFER  = GL_PIXEL_UNPACK_BUFFER,
 	UNIFORM_BUFFER       = GL_UNIFORM_BUFFER
 };
 
 enum BufferUsage
 {
-	STREAM_DRAW  = GL_STREAM_DRAW_ARB,
-	STREAM_READ  = GL_STREAM_READ_ARB,
-	STREAM_COPY  = GL_STREAM_COPY_ARB,
-	STATIC_DRAW  = GL_STATIC_DRAW_ARB,
-	STATIC_READ  = GL_STATIC_READ_ARB,
-	STATIC_COPY  = GL_STATIC_COPY_ARB,
-	DYNAMIC_DRAW = GL_DYNAMIC_DRAW_ARB,
-	DYNAMIC_READ = GL_DYNAMIC_READ_ARB,
-	DYNAMIC_COPY = GL_DYNAMIC_COPY_ARB
+	STREAM_DRAW  = GL_STREAM_DRAW,
+	STREAM_READ  = GL_STREAM_READ,
+	STREAM_COPY  = GL_STREAM_COPY,
+	STATIC_DRAW  = GL_STATIC_DRAW,
+	STATIC_READ  = GL_STATIC_READ,
+	STATIC_COPY  = GL_STATIC_COPY,
+	DYNAMIC_DRAW = GL_DYNAMIC_DRAW,
+	DYNAMIC_READ = GL_DYNAMIC_READ,
+	DYNAMIC_COPY = GL_DYNAMIC_COPY
 };
 
 class BufferRange;
@@ -135,6 +137,7 @@ private:
 
 public:
 	static unsigned get_n_uniform_buffer_bindings();
+	static unsigned get_uniform_buffer_alignment();
 };
 
 } // namespace GL