-#include <msp/gl/extensions/arb_draw_instanced.h>
-#include <msp/gl/extensions/msp_primitive_restart.h>
#include "batch.h"
-#include "bindable.h"
-#include "buffer.h"
#include "error.h"
-#include "mesh.h"
-#include "vertexarray.h"
using namespace std;
namespace {
template<typename T>
-void append(vector<Msp::UInt8> &data, T i)
+void append(vector<uint8_t> &data, T i)
{
data.insert(data.end(), sizeof(T), 0);
*(T *)(&data[data.size()-sizeof(T)]) = i;
}
template<typename T, typename U>
-void expand(vector<Msp::UInt8> &data)
+void expand(vector<uint8_t> &data)
{
unsigned count = data.size()/sizeof(T);
data.resize(count*sizeof(U));
}
template<typename T, typename U>
-void shrink(vector<Msp::UInt8> &data)
+void shrink(vector<uint8_t> &data)
{
unsigned count = data.size()/sizeof(T);
for(unsigned i=0; i<count; ++i)
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)
{
+ 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<UInt16, UInt32>(data);
+ expand<uint16_t, uint32_t>(data);
else if(index_type==UNSIGNED_INT && t==UNSIGNED_SHORT)
- shrink<UInt32, UInt16>(data);
+ shrink<uint32_t, uint16_t>(data);
index_type = t;
- gl_index_type = get_gl_type(t);
+ BatchBackend::set_index_type(t);
update_offset();
- dirty = true;
+ mark_dirty();
+}
+
+void Batch::set_patch_size(unsigned s)
+{
+ if(prim_type!=PATCHES)
+ throw invalid_operation("Batch::set_patch_size");
+ if(s<1)
+ throw invalid_argument("Batch::set_patch_size");
+
+ patch_size = s;
}
Batch &Batch::append(unsigned i)
append_index(i);
update_offset();
- dirty = true;
+ mark_dirty();
return *this;
}
return *this;
data.reserve(data.size()+ind.size()*get_index_size());
- for(vector<unsigned>::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;
}
{
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;
}
{
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;
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<UInt32>(data, 0xFFFFFFFF);
+ ::append<uint32_t>(data, 0xFFFFFFFF);
else
- ::append<UInt16>(data, 0xFFFF);
+ ::append<uint16_t>(data, 0xFFFF);
}
else if(prim_type==TRIANGLE_STRIP)
{
append_index(other.get_index(i));
update_offset();
- dirty = true;
+ mark_dirty();
return *this;
}
set_index_type(UNSIGNED_INT);
if(index_type==UNSIGNED_INT)
- ::append<UInt32>(data, i);
+ ::append<uint32_t>(data, i);
else
- ::append<UInt16>(data, i);
+ ::append<uint16_t>(data, i);
}
-unsigned Batch::get_index_size() const
-{
- return (index_type==UNSIGNED_INT ? sizeof(UInt32) : sizeof(UInt16));
-}
-
-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)];
+ return *(uint32_t *)&data[i*sizeof(uint32_t)];
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<const void *>(get_offset());
-}
-
-void Batch::set_restart_index(unsigned index)
-{
- if(index>0)
- {
- if(!restart_index)
- glEnable(GL_PRIMITIVE_RESTART);
- glPrimitiveRestartIndex(index);
- }
- else
- glDisable(GL_PRIMITIVE_RESTART);
-
- restart_index = index;
+ return *(uint16_t *)&data[i*sizeof(uint16_t)];
}
DataFile::ObjectLoader<Batch>(b)
{
add("indices", &Loader::indices);
+ add("patch_size", &Loader::patch_size);
}
void Batch::Loader::indices(const vector<unsigned> &ind)
obj.append(ind);
}
+void Batch::Loader::patch_size(unsigned s)
+{
+ obj.set_patch_size(s);
+}
+
} // namespace GL
} // namespace Msp
projects / libs / gl.git / blobdiff