+#include <msp/gl/extensions/arb_draw_instanced.h>
#include <msp/gl/extensions/ext_draw_range_elements.h>
#include <msp/gl/extensions/msp_legacy_features.h>
#include <msp/gl/extensions/msp_primitive_restart.h>
return *this;
}
-void Batch::append(const vector<unsigned> &ind)
+Batch &Batch::append(const vector<unsigned> &ind)
{
if(ind.empty())
- return;
+ return *this;
data.reserve(data.size()+ind.size()*get_index_size());
for(vector<unsigned>::const_iterator i=ind.begin(); i!=ind.end(); ++i)
update_offset();
dirty = true;
+
+ return *this;
}
bool Batch::can_append(PrimitiveType other_type)
return true;
}
-void Batch::append(const Batch &other)
+Batch &Batch::append(const Batch &other)
{
if(other.prim_type!=prim_type)
throw invalid_argument("Batch::append");
}
if(other.data.empty())
- return;
+ return *this;
if(prim_type==POINTS || prim_type==LINES || prim_type==TRIANGLES || prim_type==QUADS)
;
update_offset();
dirty = true;
+
+ return *this;
}
void Batch::append_index(unsigned i)
}
void Batch::draw() const
+{
+ BindRestore _bind_ibuf(get_buffer(), ELEMENT_ARRAY_BUFFER);
+ const void *data_ptr = setup_draw();
+
+ if(EXT_draw_range_elements)
+ glDrawRangeElements(prim_type, min_index, max_index, size(), data_type, data_ptr);
+ else
+ glDrawElements(prim_type, size(), data_type, data_ptr);
+}
+
+void Batch::draw_instanced(unsigned count) const
+{
+ static Require req(ARB_draw_instanced);
+
+ BindRestore _bind_ibuf(get_buffer(), ELEMENT_ARRAY_BUFFER);
+ const void *data_ptr = setup_draw();
+
+ glDrawElementsInstanced(prim_type, size(), data_type, data_ptr, count);
+}
+
+const void *Batch::setup_draw() const
{
if(restart)
{
else if(restart_index && restart_index<=max_index)
set_restart_index(0);
- Buffer *ibuf = get_buffer();
- const void *data_ptr;
- BindRestore _bind_ibuf(ibuf, ELEMENT_ARRAY_BUFFER);
- if(ibuf)
+ if(get_buffer())
{
if(dirty)
update_buffer();
- data_ptr = reinterpret_cast<const void *>(get_offset());
+ return reinterpret_cast<const void *>(get_offset());
}
else
- data_ptr = &data[0];
-
- if(EXT_draw_range_elements)
- glDrawRangeElements(prim_type, min_index, max_index, size(), data_type, data_ptr);
- else
- glDrawElements(prim_type, size(), data_type, data_ptr);
+ return &data[0];
}
void Batch::set_restart_index(unsigned index)