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

Using Vertex Array Objects for mesh drawing. 

* All attribute pointers and buffer binding is now stored in each
   mesh own vertex array object, thus each mesh drawing now needs
   only three OpenGL calls.
 * Removed default VAO from Scene, which fixes unit test crashes.
vectorfields
Vladimír Vondruš 14 years ago
parent
01162f2799
commit
37eff1149b
6 changed files with 60 additions and 90 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      PKGBUILD
  2. 30
      src/IndexedMesh.cpp
  3. 38
      src/Mesh.cpp
  4. 57
      src/Mesh.h
  5. 8
      src/Scene.cpp
  6. 15
      src/Scene.h

2
PKGBUILD
Unescape View File

@ -24,7 +24,7 @@ build() {
check() {
cd "$startdir/build"
ctest -E "ObjectTest|SceneTest" # fix me!
ctest
}
package() {

30
src/IndexedMesh.cpp
Unescape View File

@ -23,42 +23,30 @@ using namespace Corrade::Utility;
namespace Magnum {
void IndexedMesh::draw() {
bind();
/* Finalize the mesh, if it is not already */
finalize();
/* Enable vertex arrays for all attributes */
for(set<GLuint>::const_iterator it = attributes().begin(); it != attributes().end(); ++it)
glEnableVertexAttribArray(*it);
/* Bind attributes to vertex buffers */
for(map<Buffer*, pair<bool, vector<Attribute> > >::const_iterator it = buffers().begin(); it != buffers().end(); ++it) {
/* Bind buffer */
it->first->bind();
/* Bind all attributes to this buffer */
for(vector<Attribute>::const_iterator ait = it->second.second.begin(); ait != it->second.second.end(); ++ait)
if(TypeInfo::isIntegral(ait->type))
glVertexAttribIPointer(ait->attribute, ait->size, static_cast<GLenum>(ait->type), ait->stride, ait->pointer);
else glVertexAttribPointer(ait->attribute, ait->size, static_cast<GLenum>(ait->type), GL_FALSE, ait->stride, ait->pointer);
}
/* Bind index array, draw the elements and unbind */
_indexBuffer.bind();
/** @todo Start at given index */
glDrawElements(static_cast<GLenum>(primitive()), _indexCount, static_cast<GLenum>(_indexType), nullptr);
/* Disable vertex arrays for all attributes */
for(set<GLuint>::const_iterator it = attributes().begin(); it != attributes().end(); ++it)
glDisableVertexAttribArray(*it);
unbind();
}
void IndexedMesh::finalize() {
if(isFinalized()) return;
if(!_indexCount) {
Error() << "IndexedMesh: the mesh has zero index count!";
assert(0);
}
/* Finalize attribute positions */
Mesh::finalize();
/* Bind index buffer */
_indexBuffer.bind();
}
}

38
src/Mesh.cpp
Unescape View File

@ -27,6 +27,8 @@ namespace Magnum {
Mesh::~Mesh() {
for(map<Buffer*, pair<bool, vector<Attribute> > >::iterator it = _buffers.begin(); it != _buffers.end(); ++it)
delete it->first;
glDeleteVertexArrays(1, &vao);
}
Buffer* Mesh::addBuffer(bool interleaved) {
@ -40,30 +42,15 @@ Buffer* Mesh::addBuffer(bool interleaved) {
}
void Mesh::draw() {
bind();
/* Finalize the mesh, if it is not already */
finalize();
/* Enable vertex arrays for all attributes */
for(set<GLuint>::const_iterator it = _attributes.begin(); it != _attributes.end(); ++it)
glEnableVertexAttribArray(*it);
/* Bind attributes to vertex buffers */
for(map<Buffer*, pair<bool, vector<Attribute> > >::const_iterator it = _buffers.begin(); it != _buffers.end(); ++it) {
/* Bind buffer */
it->first->bind();
/* Bind all attributes to this buffer */
for(vector<Attribute>::const_iterator ait = it->second.second.begin(); ait != it->second.second.end(); ++ait)
if(TypeInfo::isIntegral(ait->type))
glVertexAttribIPointer(ait->attribute, ait->size, static_cast<GLenum>(ait->type), ait->stride, ait->pointer);
else glVertexAttribPointer(ait->attribute, ait->size, static_cast<GLenum>(ait->type), GL_FALSE, ait->stride, ait->pointer);
}
/** @todo Start at given index */
glDrawArrays(static_cast<GLenum>(_primitive), 0, _vertexCount);
/* Disable vertex arrays for all attributes */
for(set<GLuint>::const_iterator it = _attributes.begin(); it != _attributes.end(); ++it)
glDisableVertexAttribArray(*it);
unbind();
}
void Mesh::finalize() {
@ -75,6 +62,10 @@ void Mesh::finalize() {
assert(0);
}
/* Enable vertex arrays for all attributes */
for(set<GLuint>::const_iterator it = _attributes.begin(); it != _attributes.end(); ++it)
glEnableVertexAttribArray(*it);
/* Finalize attribute positions for every buffer */
for(map<Buffer*, pair<bool, vector<Attribute> > >::iterator it = _buffers.begin(); it != _buffers.end(); ++it) {
/* Avoid confustion */
@ -109,6 +100,15 @@ void Mesh::finalize() {
position += ait->size*TypeInfo::sizeOf(ait->type)*_vertexCount;
}
}
/* Bind buffer */
it->first->bind();
/* Bind all attributes to this buffer */
for(vector<Attribute>::const_iterator ait = attributes.begin(); ait != attributes.end(); ++ait)
if(TypeInfo::isIntegral(ait->type))
glVertexAttribIPointer(ait->attribute, ait->size, static_cast<GLenum>(ait->type), ait->stride, ait->pointer);
else glVertexAttribPointer(ait->attribute, ait->size, static_cast<GLenum>(ait->type), GL_FALSE, ait->stride, ait->pointer);
}
/* Mesh is now finalized, attribute binding is not allowed */

57
src/Mesh.h
Unescape View File

@ -134,14 +134,18 @@ class MAGNUM_EXPORT Mesh {
* data. Note that you have to call setVertexCount() manually for mesh
* to draw properly.
*/
inline Mesh(Primitive primitive = Primitive::Triangles): _primitive(primitive), _vertexCount(0), finalized(false) {}
inline Mesh(Primitive primitive = Primitive::Triangles): _primitive(primitive), _vertexCount(0), finalized(false) {
glGenVertexArrays(1, &vao);
}
/**
* @brief Constructor
* @param primitive Primitive type
* @param vertexCount Vertex count
*/
inline Mesh(Primitive primitive, GLsizei vertexCount): _primitive(primitive), _vertexCount(vertexCount), finalized(false) {}
inline Mesh(Primitive primitive, GLsizei vertexCount): _primitive(primitive), _vertexCount(vertexCount), finalized(false) {
glGenVertexArrays(1, &vao);
}
/**
* @brief Destructor
@ -226,6 +230,21 @@ class MAGNUM_EXPORT Mesh {
virtual void draw();
protected:
/** @brief Unbind any vertex array object */
inline static void unbind() { glBindVertexArray(0); }
/** @brief Bind vertex array object of current mesh */
inline void bind() { glBindVertexArray(vao); }
/**
* @brief Finalize the mesh
*
* Computes location and stride of each attribute in its buffer. After
* this function is called, no new attribute can be bound.
*/
void finalize();
private:
/** @brief Vertex attribute */
struct Attribute {
GLuint attribute; /**< @brief %Attribute ID */
@ -235,43 +254,25 @@ class MAGNUM_EXPORT Mesh {
const GLvoid* pointer; /**< @brief Pointer to first attribute of this type in the buffer */
};
GLuint vao;
Primitive _primitive;
GLsizei _vertexCount;
bool finalized;
/**
* @brief Buffers with their attributes
* @return Map of associated buffers, evey buffer has:
*
* Map of associated buffers, evey buffer has:
* - boolean value which signalizes whether the buffer is interleaved
* - list of bound attributes
*/
inline const std::map<Buffer*, std::pair<bool, std::vector<Attribute> > >& buffers() { return _buffers; }
std::map<Buffer*, std::pair<bool, std::vector<Attribute> > > _buffers;
/**
* @brief List of all bound attributes
*
* List of all bound attributes bound with bindAttribute().
*/
inline const std::set<GLuint>& attributes() { return _attributes; }
/**
* @brief Finalize the mesh
*
* Computes location and stride of each attribute in its buffer. After
* this function is called, no new attribute can be bound.
*/
virtual void finalize();
/**
* @brief Set the mesh dirty
*
* Sets the attribute locations in buffers as dirty, so they are
* recalculated on next drawing.
*/
inline void setDirty() { finalized = false; }
private:
Primitive _primitive;
GLsizei _vertexCount;
bool finalized;
std::map<Buffer*, std::pair<bool, std::vector<Attribute> > > _buffers;
std::set<GLuint> _attributes;
void bindAttribute(Buffer* buffer, GLuint attribute, GLint size, Type type);

8
src/Scene.cpp
Unescape View File

@ -17,14 +17,6 @@
namespace Magnum {
Scene::Scene(): Object(nullptr), _features(0) {
_parent = this;
/* Bind default VAO */
glGenVertexArrays(1, &vao);
glBindVertexArray(vao);
}
void Scene::setFeature(Scene::Feature feature, bool enabled) {
GLenum _feature;
switch(feature) {

15
src/Scene.h
Unescape View File

@ -33,19 +33,8 @@ class MAGNUM_EXPORT Scene: public Object {
FaceCulling = 0x04 /**< @brief Face culling */
};
/**
* @brief Constructor
*
* Creates one default vertex array.
*/
Scene();
/**
* @brief Destructor
*
* Deletes the default vertex array.
*/
inline ~Scene() { glDeleteVertexArrays(1, &vao); }
/** @brief Constructor */
inline Scene(): _features(0) { _parent = this; }
void setParent(Object* parent) = delete;
void setTransformation(const Matrix4& transformation) = delete;

Write Preview
Loading…
Cancel
Save