X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fcore%2Fbatch.cpp;h=c68beab908f8dc2a07c699a8b7bd6a9e41b5f35c;hp=68e232ba29de5447fd9050d27894000f2765e86f;hb=3efe3bab1c8290bd49a957ebec0ad97e58a35fcf;hpb=efb45a6851563cdb8077b6aad3ab92d4006d8790 diff --git a/source/core/batch.cpp b/source/core/batch.cpp index 68e232ba..c68beab9 100644 --- a/source/core/batch.cpp +++ b/source/core/batch.cpp @@ -1,18 +1,12 @@ -#include -#include #include "batch.h" -#include "bindable.h" -#include "buffer.h" #include "error.h" -#include "mesh.h" -#include "vertexarray.h" using namespace std; namespace { template -void append(vector &data, T i) +void append(vector &data, T i) { data.insert(data.end(), sizeof(T), 0); *(T *)(&data[data.size()-sizeof(T)]) = i; @@ -28,7 +22,7 @@ U convert(T n) } template -void expand(vector &data) +void expand(vector &data) { unsigned count = data.size()/sizeof(T); data.resize(count*sizeof(U)); @@ -37,7 +31,7 @@ void expand(vector &data) } template -void shrink(vector &data) +void shrink(vector &data) { unsigned count = data.size()/sizeof(T); for(unsigned i=0; i &data) namespace Msp { namespace GL { -unsigned Batch::restart_index = 0; - Batch::Batch(PrimitiveType t): + BatchBackend(t), prim_type(t), - index_type(UNSIGNED_SHORT), - gl_index_type(get_gl_type(index_type)), - max_index(0), - restart(false) -{ } - -Batch::~Batch() + index_type(VOID), + max_index(0) { + set_index_type(UNSIGNED_SHORT); } void Batch::set_index_type(DataType t) { + if(t==index_type) + return; if(t!=UNSIGNED_SHORT && t!=UNSIGNED_INT) throw invalid_argument("Batch::set_data_type"); if(t==UNSIGNED_SHORT && max_index>0xFFFE) throw invalid_operation("Batch::set_data_type"); if(index_type==UNSIGNED_SHORT && t==UNSIGNED_INT) - expand(data); + expand(data); else if(index_type==UNSIGNED_INT && t==UNSIGNED_SHORT) - shrink(data); + shrink(data); index_type = t; - gl_index_type = get_gl_type(t); + BatchBackend::set_index_type(t); update_offset(); - dirty = true; + mark_dirty(); } Batch &Batch::append(unsigned i) @@ -87,7 +78,7 @@ Batch &Batch::append(unsigned i) append_index(i); update_offset(); - dirty = true; + mark_dirty(); return *this; } @@ -98,11 +89,11 @@ Batch &Batch::append(const vector &ind) return *this; data.reserve(data.size()+ind.size()*get_index_size()); - for(vector::const_iterator i=ind.begin(); i!=ind.end(); ++i) - append_index(*i); + for(unsigned i: ind) + append_index(i); update_offset(); - dirty = true; + mark_dirty(); return *this; } @@ -111,8 +102,8 @@ 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; + else if(prim_type==LINE_STRIP || prim_type==TRIANGLE_FAN) + return check_restart(false); else return true; } @@ -121,8 +112,8 @@ 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) - static Require _req(MSP_primitive_restart); + if(prim_type==LINE_STRIP || prim_type==TRIANGLE_FAN) + check_restart(true); if(other.data.empty()) return *this; @@ -131,13 +122,12 @@ Batch &Batch::append(const Batch &other) if(prim_type==POINTS || prim_type==LINES || prim_type==TRIANGLES) ; - else if(MSP_primitive_restart) + else if(check_restart(false)) { - restart = true; if(index_type==UNSIGNED_INT) - ::append(data, 0xFFFFFFFF); + ::append(data, 0xFFFFFFFF); else - ::append(data, 0xFFFF); + ::append(data, 0xFFFF); } else if(prim_type==TRIANGLE_STRIP) { @@ -152,7 +142,7 @@ Batch &Batch::append(const Batch &other) append_index(other.get_index(i)); update_offset(); - dirty = true; + mark_dirty(); return *this; } @@ -168,74 +158,17 @@ void Batch::append_index(unsigned i) set_index_type(UNSIGNED_INT); if(index_type==UNSIGNED_INT) - ::append(data, i); + ::append(data, i); else - ::append(data, i); -} - -unsigned Batch::get_index_size() const -{ - return (index_type==UNSIGNED_INT ? sizeof(UInt32) : sizeof(UInt16)); + ::append(data, i); } -unsigned Batch::get_index(unsigned i) const +unsigned Batch::get_index(size_t i) const { if(index_type==UNSIGNED_INT) - return *(UInt32 *)&data[i*sizeof(UInt32)]; - else - return *(UInt16 *)&data[i*sizeof(UInt16)]; -} - -void Batch::draw() const -{ - BindRestore _bind_ibuf(get_buffer(), ELEMENT_ARRAY_BUFFER); - const void *data_ptr = setup_draw(); - - glDrawElements(prim_type, size(), gl_index_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(), gl_index_type, data_ptr, count); -} - -const void *Batch::setup_draw() const -{ - if(!get_buffer()) - throw invalid_operation("Batch::setup_draw"); - - if(restart) - { - unsigned index = (index_type==UNSIGNED_INT ? 0xFFFFFFFF : 0xFFFF); - - if(index!=restart_index) - set_restart_index(index); - } - else if(restart_index && restart_index<=max_index) - set_restart_index(0); - - refresh(); - - return reinterpret_cast(get_offset()); -} - -void Batch::set_restart_index(unsigned index) -{ - if(index>0) - { - if(!restart_index) - glEnable(GL_PRIMITIVE_RESTART); - glPrimitiveRestartIndex(index); - } + return *(uint32_t *)&data[i*sizeof(uint32_t)]; else - glDisable(GL_PRIMITIVE_RESTART); - - restart_index = index; + return *(uint16_t *)&data[i*sizeof(uint16_t)]; }