Check the flat qualifier from the correct member

[libs/gl.git] / source / vertexsetup.cpp

diff --git a/source/vertexsetup.cpp b/source/vertexsetup.cpp
deleted file mode 100644 (file)
index 275585b..0000000
--- a/source/vertexsetup.cpp
+++ /dev/null
@@ -1,97 +0,0 @@
-#include <msp/gl/extensions/arb_vertex_array_object.h>
-#include <msp/gl/extensions/arb_vertex_buffer_object.h>
-#include <msp/gl/extensions/arb_vertex_shader.h>
-#include "buffer.h"
-#include "gl.h"
-#include "vertexarray.h"
-#include "vertexsetup.h"
-
-namespace Msp {
-namespace GL {
-
-VertexSetup::VertexSetup():
-       dirty(0),
-       array(0),
-       index_buffer(0)
-{
-       static Require req(ARB_vertex_array_object);
-       glGenVertexArrays(1, &id);
-}
-
-VertexSetup::~VertexSetup()
-{
-       if(current()==this)
-               unbind();
-       glDeleteVertexArrays(1, &id);
-}
-
-void VertexSetup::set_vertex_array(const VertexArray &a)
-{
-       array = &a;
-       update(VERTEX_ARRAY);
-}
-
-void VertexSetup::set_index_buffer(const Buffer &ibuf)
-{
-       index_buffer = &ibuf;
-       update(INDEX_BUFFER);
-}
-
-void VertexSetup::update(unsigned mask) const
-{
-       if(current()!=this)
-       {
-               dirty |= mask;
-               return;
-       }
-
-       if(mask&VERTEX_ARRAY)
-               update_vertex_array();
-
-       if(mask&INDEX_BUFFER)
-               glBindBuffer(ELEMENT_ARRAY_BUFFER, index_buffer->get_id());
-}
-
-void VertexSetup::update_vertex_array() const
-{
-       Bind bind_vbuf(array->get_buffer(), ARRAY_BUFFER);
-
-       const VertexFormat &fmt = array->get_format();
-       unsigned stride = get_stride(fmt)*sizeof(float);
-       float *ptr = 0;
-       for(const unsigned char *c=fmt.begin(); c!=fmt.end(); ++c)
-       {
-               unsigned t = get_component_type(*c);
-               if(t>=get_component_type(ATTRIB1))
-                       t -= get_component_type(ATTRIB1);
-               unsigned sz = get_component_size(*c);
-               if(*c==COLOR4_UBYTE)
-                       glVertexAttribPointer(t, 4, GL_UNSIGNED_BYTE, true, stride, ptr);
-               else
-                       glVertexAttribPointer(t, sz, GL_FLOAT, false, stride, ptr);
-               glEnableVertexAttribArray(t);
-               ptr += sz;
-       }
-}
-
-void VertexSetup::bind() const
-{
-       if(set_current(this))
-       {
-               glBindVertexArray(id);
-               if(dirty)
-               {
-                       update(dirty);
-                       dirty = 0;
-               }
-       }
-}
-
-void VertexSetup::unbind()
-{
-       if(set_current(0))
-               glBindVertexArray(0);
-}
-
-} // namespace GL
-} // namespace Msp