X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuffer.h;h=25ce46993f1080fb9641dcc9bcf4c206d8cafda7;hb=8141d1e1cf5de45d1e8d640f3f8643ee748292dc;hp=bd3a999eeab0d19da7aea2f94b90abae390f4a74;hpb=97cd6e0695f69f3d404e22a6c831aee22d3f0987;p=libs%2Fgl.git

diff --git a/source/buffer.h b/source/buffer.h
index bd3a999e..25ce4699 100644
--- a/source/buffer.h
+++ b/source/buffer.h
@@ -9,32 +9,32 @@ 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;
 
 /**
 A buffer for storing data in GL memory.  Putting vertex and index data in
-buffers can improve rendering performance.  The VertexArray and Mesh classes
-contain built-in support for buffers.
+buffers can improve rendering performance.  The VertexArray, Mesh and
+UniformBlock classes contain built-in support for buffers.
 */
 class Buffer
 {
@@ -135,6 +135,7 @@ private:
 
 public:
 	static unsigned get_n_uniform_buffer_bindings();
+	static unsigned get_uniform_buffer_alignment();
 };
 
 } // namespace GL