ic
/
magnum
mirror of https://github.com/mosra/magnum.git
6
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Got rid of default Buffer target. 

For non-DSA access user can now specify target hint, which will be used
when binding the buffer internally.
pull/7/head
Vladimír Vondruš 14 years ago
parent
45f349644f
commit
53d82bda19
5 changed files with 42 additions and 28 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      src/Buffer.cpp
  2. 50
      src/Buffer.h
  3. 4
      src/BufferedImage.h
  4. 4
      src/IndexedMesh.cpp
  5. 8
      src/IndexedMesh.h

4
src/Buffer.cpp
Unescape View File

@ -85,7 +85,7 @@ void Buffer::copyImplementationDSA(Buffer* read, Buffer* write, GLintptr readOff
} }
void Buffer::setDataImplementationDefault(GLsizeiptr size, const GLvoid* data, Buffer::Usage usage) { void Buffer::setDataImplementationDefault(GLsizeiptr size, const GLvoid* data, Buffer::Usage usage) {
glBufferData(static_cast<GLenum>(bindInternal(_defaultTarget)), size, data, static_cast<GLenum>(usage)); glBufferData(static_cast<GLenum>(bindInternal(_targetHint)), size, data, static_cast<GLenum>(usage));
} }
void Buffer::setDataImplementationDSA(GLsizeiptr size, const GLvoid* data, Buffer::Usage usage) { void Buffer::setDataImplementationDSA(GLsizeiptr size, const GLvoid* data, Buffer::Usage usage) {
@ -93,7 +93,7 @@ void Buffer::setDataImplementationDSA(GLsizeiptr size, const GLvoid* data, Buffe
} }
void Buffer::setSubDataImplementationDefault(GLintptr offset, GLsizeiptr size, const GLvoid* data) { void Buffer::setSubDataImplementationDefault(GLintptr offset, GLsizeiptr size, const GLvoid* data) {
glBufferSubData(static_cast<GLenum>(bindInternal(_defaultTarget)), offset, size, data); glBufferSubData(static_cast<GLenum>(bindInternal(_targetHint)), offset, size, data);
} }
void Buffer::setSubDataImplementationDSA(GLintptr offset, GLsizeiptr size, const GLvoid* data) { void Buffer::setSubDataImplementationDSA(GLintptr offset, GLsizeiptr size, const GLvoid* data) {

50
src/Buffer.h
Unescape View File

@ -65,7 +65,8 @@ The engine tracks currently bound buffers to avoid unnecessary calls to
@fn_gl{BindBuffer}. If the buffer is already bound to some target, @fn_gl{BindBuffer}. If the buffer is already bound to some target,
functions copy(), setData() and setSubData() use that target in functions copy(), setData() and setSubData() use that target in
@fn_gl{CopyBufferSubData}, @fn_gl{BufferData} and @fn_gl{BufferSubData} @fn_gl{CopyBufferSubData}, @fn_gl{BufferData} and @fn_gl{BufferSubData}
functions instead of binding the buffer to some specific target. functions instead of binding the buffer to some specific target. You can also
use setTargetHint() to possibly reduce unnecessary rebinding.
If extension @extension{EXT,direct_state_access} is available, functions If extension @extension{EXT,direct_state_access} is available, functions
copy(), setData() and setSubData() use DSA functions to avoid unnecessary copy(), setData() and setSubData() use DSA functions to avoid unnecessary
@ -259,8 +260,10 @@ class MAGNUM_EXPORT Buffer {
* @param writeOffset Offset in the write buffer * @param writeOffset Offset in the write buffer
* @param size Data size * @param size Data size
* *
* If @extension{EXT,direct_state_access} is not available, both * If @extension{EXT,direct_state_access} is not available and the
* buffers are bound to some target before the copy is performed. * buffers aren't already bound somewhere, they are bound to
* `Target::CopyRead` and `Target::CopyWrite` before the copy is
* performed.
* @requires_gl31 Extension @extension{ARB,copy_buffer} * @requires_gl31 Extension @extension{ARB,copy_buffer}
* @requires_gles30 (no extension providing this functionality) * @requires_gles30 (no extension providing this functionality)
* @see @fn_gl{BindBuffer} and @fn_gl{CopyBufferSubData} or * @see @fn_gl{BindBuffer} and @fn_gl{CopyBufferSubData} or
@ -272,13 +275,11 @@ class MAGNUM_EXPORT Buffer {
/** /**
* @brief Constructor * @brief Constructor
* @param defaultTarget Default target (used when calling bind()
* without parameter)
* *
* Generates new OpenGL buffer. * Generates new OpenGL buffer.
* @see @fn_gl{GenBuffers} * @see @fn_gl{GenBuffers}
*/ */
inline Buffer(Target defaultTarget): _defaultTarget(defaultTarget) { inline Buffer(): _targetHint(Target::Array) {
glGenBuffers(1, &_id); glGenBuffers(1, &_id);
} }
@ -290,19 +291,24 @@ class MAGNUM_EXPORT Buffer {
*/ */
virtual ~Buffer(); virtual ~Buffer();
/** @brief Default bind type */
inline Target defaultTarget() const { return _defaultTarget; }
/** @brief OpenGL buffer ID */ /** @brief OpenGL buffer ID */
inline GLuint id() const { return _id; } inline GLuint id() const { return _id; }
/** @brief Target hint */
inline Target targetHint() const { return _targetHint; }
/** /**
* @brief Bind buffer * @brief Set target hint
* *
* Binds buffer to default target. * If @extension{EXT,direct_state_access} is not available, the buffer
* @see bind(Target) * must be internally bound to some target before any operation. You
* can specify target which will always be used when binding the
* buffer internally, possibly saving some calls to @fn_gl{BindBuffer}.
*
* Default target hint is `Target::Array`.
* @see setData(), setSubData()
*/ */
inline void bind() { bind(_defaultTarget); } inline void setTargetHint(Target hint) { _targetHint = hint; }
/** /**
* @brief Bind buffer * @brief Bind buffer
@ -318,9 +324,10 @@ class MAGNUM_EXPORT Buffer {
* @param data Pointer to data * @param data Pointer to data
* @param usage %Buffer usage * @param usage %Buffer usage
* *
* If @extension{EXT,direct_state_access} is not available, the buffer * If @extension{EXT,direct_state_access} is not available and the
* is bound to some target before the operation. * buffer is not already bound somewhere, it is bound to hinted target
* @see @fn_gl{BindBuffer} and @fn_gl{BufferData} or * before the operation.
* @see setTargetHint(), @fn_gl{BindBuffer} and @fn_gl{BufferData} or
* @fn_gl_extension{NamedBufferData,EXT,direct_state_access} * @fn_gl_extension{NamedBufferData,EXT,direct_state_access}
*/ */
inline void setData(GLsizeiptr size, const GLvoid* data, Usage usage) { inline void setData(GLsizeiptr size, const GLvoid* data, Usage usage) {
@ -360,10 +367,11 @@ class MAGNUM_EXPORT Buffer {
* @param size Data size * @param size Data size
* @param data Pointer to data * @param data Pointer to data
* *
* If @extension{EXT,direct_state_access} is not available, the buffer * If @extension{EXT,direct_state_access} is not available and the
* is bound to some target before the operation. * buffer is not already bound somewhere, it is bound to hinted target
* @see @fn_gl{BindBuffer} and @fn_gl{BufferSubData} or * before the operation.
* @fn_gl_extension{NamedBufferSubData,EXT,direct_state_access} * @see setTargetHint(), @fn_gl{BindBuffer} and @fn_gl{BufferSubData}
* or @fn_gl_extension{NamedBufferSubData,EXT,direct_state_access}
*/ */
inline void setSubData(GLintptr offset, GLsizeiptr size, const GLvoid* data) { inline void setSubData(GLintptr offset, GLsizeiptr size, const GLvoid* data) {
(this->*setSubDataImplementation)(offset, size, data); (this->*setSubDataImplementation)(offset, size, data);
@ -418,7 +426,7 @@ class MAGNUM_EXPORT Buffer {
static SetSubDataImplementation setSubDataImplementation; static SetSubDataImplementation setSubDataImplementation;
GLuint _id; GLuint _id;
Target _defaultTarget; Target _targetHint;
}; };
} }

4
src/BufferedImage.h
Unescape View File

@ -48,7 +48,9 @@ template<std::uint8_t dimensions> class BufferedImage: public AbstractImage {
* Dimensions and buffer are empty, call setData() to fill the image * Dimensions and buffer are empty, call setData() to fill the image
* with data. * with data.
*/ */
inline BufferedImage(Components components, ComponentType type): AbstractImage(components, type), _buffer(Buffer::Target::PixelPack) {} inline BufferedImage(Components components, ComponentType type): AbstractImage(components, type) {
_buffer.setTargetHint(Buffer::Target::PixelPack);
}
/** @brief %Image size */ /** @brief %Image size */
inline constexpr typename DimensionTraits<Dimensions, GLsizei>::VectorType size() const { return _size; } inline constexpr typename DimensionTraits<Dimensions, GLsizei>::VectorType size() const { return _size; }

4
src/IndexedMesh.cpp
Unescape View File

@ -30,7 +30,7 @@ void IndexedMesh::draw() {
/* Buffers must be bound after initialization */ /* Buffers must be bound after initialization */
#ifdef MAGNUM_TARGET_GLES #ifdef MAGNUM_TARGET_GLES
bind(); bind();
_indexBuffer.bind(); _indexBuffer.bind(Buffer::Target::ElementArray);
#endif #endif
/** @todo Start at given index */ /** @todo Start at given index */
@ -50,7 +50,7 @@ void IndexedMesh::finalize() {
/* Bind index buffer to VAO too */ /* Bind index buffer to VAO too */
#ifndef MAGNUM_TARGET_GLES #ifndef MAGNUM_TARGET_GLES
_indexBuffer.bind(); _indexBuffer.bind(Buffer::Target::ElementArray);
#endif #endif
} }
#endif #endif

8
src/IndexedMesh.h
Unescape View File

@ -37,7 +37,9 @@ class MAGNUM_EXPORT IndexedMesh: public Mesh {
* Note that you have to call setVertexCount(), setIndexCount() and * Note that you have to call setVertexCount(), setIndexCount() and
* setIndexType() manually for mesh to draw properly. * setIndexType() manually for mesh to draw properly.
*/ */
inline IndexedMesh(Primitive primitive = Primitive::Triangles): Mesh(primitive), _indexBuffer(Buffer::Target::ElementArray), _indexCount(0), _indexType(Type::UnsignedShort) {} inline IndexedMesh(Primitive primitive = Primitive::Triangles): Mesh(primitive), _indexCount(0), _indexType(Type::UnsignedShort) {
_indexBuffer.setTargetHint(Buffer::Target::ElementArray);
}
/** /**
* @brief Constructor * @brief Constructor
@ -46,7 +48,9 @@ class MAGNUM_EXPORT IndexedMesh: public Mesh {
* @param indexCount Count of indices * @param indexCount Count of indices
* @param indexType Type of indices (indexable, see TypeTraits) * @param indexType Type of indices (indexable, see TypeTraits)
*/ */
inline IndexedMesh(Primitive primitive, GLsizei vertexCount, GLsizei indexCount, Type indexType = Type::UnsignedShort): Mesh(primitive, vertexCount), _indexBuffer(Buffer::Target::ElementArray), _indexCount(indexCount), _indexType(indexType) {} inline IndexedMesh(Primitive primitive, GLsizei vertexCount, GLsizei indexCount, Type indexType = Type::UnsignedShort): Mesh(primitive, vertexCount), _indexCount(indexCount), _indexType(indexType) {
_indexBuffer.setTargetHint(Buffer::Target::ElementArray);
}
/** @brief Index count */ /** @brief Index count */
inline GLsizei indexCount() const { return _indexCount; } inline GLsizei indexCount() const { return _indexCount; }

Write Preview
Loading…
Cancel
Save