Remove support for legacy OpenGL features

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

diff --git a/source/batch.cpp b/source/batch.cpp
index 741d5a49413f5f2f0538e710ffe0148aa497de25..b61da0bac79aee1507ac536efa46815c6a5c127a 100644 (file)
--- a/source/batch.cpp
+++ b/source/batch.cpp
@@ -1,7 +1,6 @@
+#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>
-#include <msp/gl/extensions/nv_primitive_restart.h>
 #include "batch.h"
 #include "bindable.h"
 #include "buffer.h"
@@ -103,10 +102,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)
@@ -114,6 +113,8 @@ void Batch::append(const vector<unsigned> &ind)
 
        update_offset();
        dirty = true;
+
+       return *this;
 }
 
 bool Batch::can_append(PrimitiveType other_type)
@@ -121,31 +122,24 @@ 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)
-               return MSP_primitive_restart || NV_primitive_restart;
+               return MSP_primitive_restart;
        else
                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);
-               }
-       }
+               static Require _req(MSP_primitive_restart);
 
        if(other.data.empty())
-               return;
+               return *this;
 
-       if(prim_type==POINTS || prim_type==LINES || prim_type==TRIANGLES || prim_type==QUADS)
+       if(prim_type==POINTS || prim_type==LINES || prim_type==TRIANGLES)
                ;
-       else if(MSP_primitive_restart || NV_primitive_restart)
+       else if(MSP_primitive_restart)
        {
                restart = true;
                if(data_type==UNSIGNED_SHORT)
@@ -162,13 +156,6 @@ void Batch::append(const Batch &other)
                if(size()&1)
                        append(other.get_index(0));
        }
-       else if(prim_type==QUAD_STRIP)
-       {
-               append(get_index(size()-1));
-               append(get_index(size()-1));
-               append(other.get_index(0));
-               append(other.get_index(0));
-       }
 
        unsigned count = other.size();
        for(unsigned i=0; i<count; ++i)
@@ -176,6 +163,8 @@ void Batch::append(const Batch &other)
 
        update_offset();
        dirty = true;
+
+       return *this;
 }
 
 void Batch::append_index(unsigned i)
@@ -221,6 +210,27 @@ 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);
+}
+
+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)
        {
@@ -238,49 +248,27 @@ 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)
 {
-       if(MSP_primitive_restart)
+       if(index>0)
        {
-               if(index>0)
-               {
-                       if(!restart_index)
-                               glEnable(GL_PRIMITIVE_RESTART);
-                       glPrimitiveRestartIndex(index);
-               }
-               else
-                       glDisable(GL_PRIMITIVE_RESTART);
+               if(!restart_index)
+                       glEnable(GL_PRIMITIVE_RESTART);
+               glPrimitiveRestartIndex(index);
        }
        else
-       {
-               if(index>0)
-               {
-                       if(!restart_index)
-                               glEnableClientState(GL_PRIMITIVE_RESTART_NV);
-                       glPrimitiveRestartIndexNV(index);
-               }
-               else
-                       glDisableClientState(GL_PRIMITIVE_RESTART_NV);
-       }
+               glDisable(GL_PRIMITIVE_RESTART);
 
        restart_index = index;
 }