#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"
min_index(0),
max_index(0),
restart(false)
-{
- /* Make sure we have glEnable/DisableClientState to go with
- NV_primitive_restart */
- if(NV_primitive_restart)
- (bool)MSP_legacy_features;
-}
+{ }
Batch::~Batch()
{
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)
update_offset();
dirty = true;
+
+ return *this;
}
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 NV_primitive_restart;
+ return MSP_primitive_restart || NV_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)
- static Require _req(NV_primitive_restart);
+ {
+ if(!MSP_primitive_restart)
+ {
+ static Require _req(NV_primitive_restart);
+ // Make sure we have glEnable/DisableClientState as well
+ static Require _req2(MSP_legacy_features);
+ }
+ }
if(other.data.empty())
- return;
+ return *this;
if(prim_type==POINTS || prim_type==LINES || prim_type==TRIANGLES || prim_type==QUADS)
;
- else if(NV_primitive_restart)
+ else if(MSP_primitive_restart || NV_primitive_restart)
{
restart = true;
if(data_type==UNSIGNED_SHORT)
update_offset();
dirty = true;
+
+ return *this;
}
void Batch::append_index(unsigned i)
index = 0xFF;
if(index!=restart_index)
- {
- if(!restart_index)
- glEnableClientState(GL_PRIMITIVE_RESTART_NV);
- glPrimitiveRestartIndexNV(index);
- restart_index = index;
- }
+ set_restart_index(index);
}
else if(restart_index && restart_index<=max_index)
- {
- glDisableClientState(GL_PRIMITIVE_RESTART_NV);
- restart_index = 0;
- }
+ set_restart_index(0);
Buffer *ibuf = get_buffer();
const void *data_ptr;
glDrawElements(prim_type, size(), data_type, data_ptr);
}
+void Batch::set_restart_index(unsigned index)
+{
+ if(MSP_primitive_restart)
+ {
+ if(index>0)
+ {
+ if(!restart_index)
+ glEnable(GL_PRIMITIVE_RESTART);
+ glPrimitiveRestartIndex(index);
+ }
+ else
+ glDisable(GL_PRIMITIVE_RESTART);
+ }
+ else
+ {
+ if(index>0)
+ {
+ if(!restart_index)
+ glEnableClientState(GL_PRIMITIVE_RESTART_NV);
+ glPrimitiveRestartIndexNV(index);
+ }
+ else
+ glDisableClientState(GL_PRIMITIVE_RESTART_NV);
+ }
+
+ restart_index = index;
+}
+
Batch::Loader::Loader(Batch &b):
DataFile::ObjectLoader<Batch>(b)