X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuffer.h;h=b0f23ef26cbbce70bc3a880fdfb85488e9995f7b;hb=66181b3f47322ffc9b8aebf04a8c222abe1a75a2;hp=c473d7edc918202e9c7f3cfff2d23f77badebcaa;hpb=57de40e1e802e44ae5b4caa67b0bb8763828b5c3;p=libs%2Fgl.git diff --git a/source/buffer.h b/source/buffer.h index c473d7ed..b0f23ef2 100644 --- a/source/buffer.h +++ b/source/buffer.h @@ -1,15 +1,26 @@ #ifndef MSP_GL_BUFFER_H_ #define MSP_GL_BUFFER_H_ +#include +#include #include +#include #include "gl.h" #include #include #include +#include namespace Msp { namespace GL { +class buffer_too_small: public std::logic_error +{ +public: + buffer_too_small(const std::string &w): std::logic_error(w) { } + virtual ~buffer_too_small() throw() { } +}; + enum BufferType { ARRAY_BUFFER = GL_ARRAY_BUFFER, @@ -72,23 +83,33 @@ public: /** Returns the default binding type for the buffer. */ BufferType get_type() const { return type; } + /** Defines the storage size of the buffer. Must be called before data can + be uploaded. Storage cannot be changed once set. */ + void storage(unsigned); + /** Sets the usage hint of the buffer. It will take effect the next time the buffer's contents are defined. */ - void set_usage(BufferUsage); + DEPRECATED void set_usage(BufferUsage); /** Uploads data into the buffer, completely replacing any previous - contents. */ - void data(unsigned, const void *); + contents. Storage must be defined beforehand. The data must have size + matching the defined storage. */ + void data(const void *); - /** Overwrites part of the buffer data with new data. The buffer size can - not be changed with this call. */ + DEPRECATED void data(unsigned, const void *); + + /** Overwrites part of the buffer data with new data. Storage must be + defined beforehand. */ void sub_data(unsigned, unsigned, const void *); unsigned get_size() const { return size; } + void require_size(unsigned) const; + BufferRange *create_range(unsigned, unsigned); - void *map(BufferAccess); + void *map(); + DEPRECATED void *map(BufferAccess) { return map(); } bool unmap(); /** Binds the buffer in its default slot. */