Some refactoring of the draw code path

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

diff --git a/source/batch.cpp b/source/batch.cpp
index cba63567497499260222b4f7cbe6dd1194d2abbe..a59fad99f03b988309ef60042324df71ebf3c6ab 100644 (file)
--- a/source/batch.cpp
+++ b/source/batch.cpp
@@ -60,12 +60,7 @@ Batch::Batch(PrimitiveType t):
        min_index(0),
        max_index(0),
        restart(false)
-{
-       /* Make sure we have glEnable/DisableClientState to go with
-       NV_primitive_restart */
-       if(!MSP_primitive_restart && NV_primitive_restart)
-               (void)(bool)MSP_legacy_features;
-}
+{ }
 
 Batch::~Batch()
 {
@@ -108,10 +103,10 @@ Batch &Batch::append(unsigned i)
        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)
@@ -119,6 +114,8 @@ void Batch::append(const vector<unsigned> &ind)
 
        update_offset();
        dirty = true;
+
+       return *this;
 }
 
 bool Batch::can_append(PrimitiveType other_type)
@@ -131,18 +128,22 @@ 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(prim_type==LINE_STRIP || prim_type==LINE_LOOP || prim_type==TRIANGLE_FAN)
        {
                if(!MSP_primitive_restart)
+               {
                        static Require _req(NV_primitive_restart);
+                       // Make sure we have glEnable/DisableClientState as well
+                       static Require _req2(MSP_legacy_features);
+               }
        }
 
        if(other.data.empty())
-               return;
+               return *this;
 
        if(prim_type==POINTS || prim_type==LINES || prim_type==TRIANGLES || prim_type==QUADS)
                ;
@@ -177,6 +178,8 @@ void Batch::append(const Batch &other)
 
        update_offset();
        dirty = true;
+
+       return *this;
 }
 
 void Batch::append_index(unsigned i)
@@ -222,6 +225,17 @@ unsigned Batch::get_index(unsigned i) const
 }
 
 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);
+}
+
+const void *Batch::setup_draw() const
 {
        if(restart)
        {
@@ -239,23 +253,15 @@ void Batch::draw() const
        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)