Remove the deprecated ProgramBuilder class

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

diff --git a/source/batch.cpp b/source/batch.cpp
index b61da0bac79aee1507ac536efa46815c6a5c127a..f14cc307ff71b92deb212e9f759ac70f1c8d69f0 100644 (file)
--- a/source/batch.cpp
+++ b/source/batch.cpp
@@ -1,5 +1,4 @@
 #include <msp/gl/extensions/arb_draw_instanced.h>
-#include <msp/gl/extensions/ext_draw_range_elements.h>
 #include <msp/gl/extensions/msp_primitive_restart.h>
 #include "batch.h"
 #include "bindable.h"
@@ -13,7 +12,7 @@ using namespace std;
 namespace {
 
 template<typename T>
-void append(vector<unsigned char> &data, T i)
+void append(vector<Msp::UInt8> &data, T i)
 {
        data.insert(data.end(), sizeof(T), 0);
        *(T *)(&data[data.size()-sizeof(T)]) = i;
@@ -29,7 +28,7 @@ U convert(T n)
 }
 
 template<typename T, typename U>
-void expand(vector<unsigned char> &data)
+void expand(vector<Msp::UInt8> &data)
 {
        unsigned count = data.size()/sizeof(T);
        data.resize(count*sizeof(U));
@@ -38,7 +37,7 @@ void expand(vector<unsigned char> &data)
 }
 
 template<typename T, typename U>
-void shrink(vector<unsigned char> &data)
+void shrink(vector<Msp::UInt8> &data)
 {
        unsigned count = data.size()/sizeof(T);
        for(unsigned i=0; i<count; ++i)
@@ -55,8 +54,7 @@ unsigned Batch::restart_index = 0;
 
 Batch::Batch(PrimitiveType t):
        prim_type(t),
-       data_type(UNSIGNED_BYTE),
-       min_index(0),
+       index_type(UNSIGNED_SHORT),
        max_index(0),
        restart(false)
 { }
@@ -65,29 +63,19 @@ Batch::~Batch()
 {
 }
 
-void Batch::set_data_type(DataType t)
+void Batch::set_index_type(DataType t)
 {
-       if(t!=UNSIGNED_BYTE && t!=UNSIGNED_SHORT && t!=UNSIGNED_INT)
+       if(t!=UNSIGNED_SHORT && t!=UNSIGNED_INT)
                throw invalid_argument("Batch::set_data_type");
-       if(t==UNSIGNED_BYTE && max_index>0xFE)
-               throw invalid_operation("Batch::set_data_type");
-       else if(t==UNSIGNED_SHORT && max_index>0xFFFE)
+       if(t==UNSIGNED_SHORT && max_index>0xFFFE)
                throw invalid_operation("Batch::set_data_type");
 
-       if(data_type==UNSIGNED_BYTE && t==UNSIGNED_SHORT)
-               expand<unsigned char, unsigned short>(data);
-       else if(data_type==UNSIGNED_BYTE && t==UNSIGNED_INT)
-               expand<unsigned char, unsigned>(data);
-       else if(data_type==UNSIGNED_SHORT && t==UNSIGNED_INT)
-               expand<unsigned short, unsigned>(data);
-       else if(data_type==UNSIGNED_INT && t==UNSIGNED_BYTE)
-               shrink<unsigned, unsigned char>(data);
-       else if(data_type==UNSIGNED_INT && t==UNSIGNED_SHORT)
-               shrink<unsigned, unsigned short>(data);
-       else if(data_type==UNSIGNED_SHORT && t==UNSIGNED_BYTE)
-               shrink<unsigned short, unsigned char>(data);
-
-       data_type = t;
+       if(index_type==UNSIGNED_SHORT && t==UNSIGNED_INT)
+               expand<UInt16, UInt32>(data);
+       else if(index_type==UNSIGNED_INT && t==UNSIGNED_SHORT)
+               shrink<UInt32, UInt16>(data);
+
+       index_type = t;
        update_offset();
        dirty = true;
 }
@@ -137,17 +125,17 @@ Batch &Batch::append(const Batch &other)
        if(other.data.empty())
                return *this;
 
+       // TODO allow appending triangles to a triangle strip
+
        if(prim_type==POINTS || prim_type==LINES || prim_type==TRIANGLES)
                ;
        else if(MSP_primitive_restart)
        {
                restart = true;
-               if(data_type==UNSIGNED_SHORT)
-                       ::append<unsigned short>(data, 0xFFFF);
-               else if(data_type==UNSIGNED_INT)
-                       ::append<unsigned>(data, 0xFFFFFFFF);
+               if(index_type==UNSIGNED_INT)
+                       ::append<UInt32>(data, 0xFFFFFFFF);
                else
-                       data.push_back(0xFF);
+                       ::append<UInt16>(data, 0xFFFF);
        }
        else if(prim_type==TRIANGLE_STRIP)
        {
@@ -170,43 +158,30 @@ Batch &Batch::append(const Batch &other)
 void Batch::append_index(unsigned i)
 {
        if(data.empty())
-               min_index = max_index = i;
+               max_index = i;
        else
-       {
-               min_index = min(min_index, i);
                max_index = max(max_index, i);
-       }
 
-       if((data_type==UNSIGNED_BYTE || data_type==UNSIGNED_SHORT) && max_index>0xFFFE)
-               set_data_type(UNSIGNED_INT);
-       else if(data_type==UNSIGNED_BYTE && max_index>0xFE)
-               set_data_type(UNSIGNED_SHORT);
+       if(index_type==UNSIGNED_SHORT && max_index>0xFFFE)
+               set_index_type(UNSIGNED_INT);
 
-       if(data_type==UNSIGNED_SHORT)
-               ::append<unsigned short>(data, i);
-       else if(data_type==UNSIGNED_INT)
-               ::append<unsigned>(data, i);
+       if(index_type==UNSIGNED_INT)
+               ::append<UInt32>(data, i);
        else
-               data.push_back(i);
+               ::append<UInt16>(data, i);
 }
 
 unsigned Batch::get_index_size() const
 {
-       if(data_type==UNSIGNED_SHORT)
-               return sizeof(unsigned short);
-       else if(data_type==UNSIGNED_INT)
-               return sizeof(unsigned);
-       return sizeof(unsigned char);
+       return (index_type==UNSIGNED_INT ? sizeof(UInt32) : sizeof(UInt16));
 }
 
 unsigned Batch::get_index(unsigned i) const
 {
-       if(data_type==UNSIGNED_SHORT)
-               return *(unsigned short *)&data[i*sizeof(unsigned short)];
-       else if(data_type==UNSIGNED_INT)
-               return *(unsigned *)&data[i*sizeof(unsigned )];
+       if(index_type==UNSIGNED_INT)
+               return *(UInt32 *)&data[i*sizeof(UInt32)];
        else
-               return data[i];
+               return *(UInt16 *)&data[i*sizeof(UInt16)];
 }
 
 void Batch::draw() const
@@ -214,10 +189,7 @@ 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);
+       glDrawElements(prim_type, size(), index_type, data_ptr);
 }
 
 void Batch::draw_instanced(unsigned count) const
@@ -227,20 +199,17 @@ void Batch::draw_instanced(unsigned count) const
        BindRestore _bind_ibuf(get_buffer(), ELEMENT_ARRAY_BUFFER);
        const void *data_ptr = setup_draw();
 
-       glDrawElementsInstanced(prim_type, size(), data_type, data_ptr, count);
+       glDrawElementsInstanced(prim_type, size(), index_type, data_ptr, count);
 }
 
 const void *Batch::setup_draw() const
 {
+       if(!get_buffer())
+               throw invalid_operation("Batch::setup_draw");
+
        if(restart)
        {
-               unsigned index;
-               if(data_type==UNSIGNED_SHORT)
-                       index = 0xFFFF;
-               else if(data_type==UNSIGNED_INT)
-                       index = 0xFFFFFFFF;
-               else
-                       index = 0xFF;
+               unsigned index = (index_type==UNSIGNED_INT ? 0xFFFFFFFF : 0xFFFF);
 
                if(index!=restart_index)
                        set_restart_index(index);
@@ -248,15 +217,9 @@ const void *Batch::setup_draw() const
        else if(restart_index && restart_index<=max_index)
                set_restart_index(0);
 
-       if(get_buffer())
-       {
-               if(dirty)
-                       update_buffer();
+       refresh();
 
-               return reinterpret_cast<const void *>(get_offset());
-       }
-       else
-               return &data[0];
+       return reinterpret_cast<const void *>(get_offset());
 }
 
 void Batch::set_restart_index(unsigned index)