Remove a number of rarely used legacy features

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

diff --git a/source/batch.cpp b/source/batch.cpp
index bca33484ce976cc585d8da88187c8ba568baed23..e097fd6365d52b65db4a8d37110ef0f3010a7ccf 100644 (file)
--- a/source/batch.cpp
+++ b/source/batch.cpp
@@ -122,7 +122,7 @@ bool Batch::can_append(PrimitiveType other_type)
 {
        if(other_type!=prim_type)
                return false;
-       else if(prim_type==LINE_STRIP || prim_type==LINE_LOOP || prim_type==TRIANGLE_FAN || prim_type==POLYGON)
+       else if(prim_type==LINE_STRIP || prim_type==LINE_LOOP || prim_type==TRIANGLE_FAN)
                return NV_primitive_restart;
        else
                return true;
@@ -132,7 +132,7 @@ void 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 || prim_type==POLYGON)
+       if(prim_type==LINE_STRIP || prim_type==LINE_LOOP || prim_type==TRIANGLE_FAN)
                static Require _req(NV_primitive_restart);
 
        if(other.data.empty())
@@ -196,11 +196,6 @@ void Batch::append_index(unsigned i)
                data.push_back(i);
 }
 
-void Batch::upload_data() const
-{
-       get_buffer()->sub_data(get_offset(), data.size(), &data[0]);
-}
-
 unsigned Batch::get_index_size() const
 {
        if(data_type==UNSIGNED_SHORT)
@@ -246,27 +241,14 @@ void Batch::draw() const
                restart_index = 0;
        }
 
-       if(Buffer *ibuf = get_buffer())
+       Buffer *ibuf = get_buffer();
+       BindRestore _bind_ibuf(ibuf, ELEMENT_ARRAY_BUFFER);
+       if(ibuf)
        {
-               bool have_vao = Mesh::current();
-               const Buffer *old_ibuf = 0;
-               if(!have_vao)
-               {
-                       old_ibuf = Buffer::current(ELEMENT_ARRAY_BUFFER);
-                       ibuf->bind_to(ELEMENT_ARRAY_BUFFER);
-               }
-
                if(dirty)
                        update_buffer();
 
                glDrawRangeElements(prim_type, min_index, max_index, size(), data_type, reinterpret_cast<void *>(get_offset()));
-               if(!have_vao)
-               {
-                       if(old_ibuf)
-                               old_ibuf->bind_to(ELEMENT_ARRAY_BUFFER);
-                       else
-                               Buffer::unbind_from(ELEMENT_ARRAY_BUFFER);
-               }
        }
        else
                glDrawRangeElements(prim_type, min_index, max_index, size(), data_type, &data[0]);