#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"
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;
}
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 *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)
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)
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;
}