+#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"
#include "error.h"
-#include "ext_draw_range_elements.h"
-#include "nv_primitive_restart.h"
+#include "mesh.h"
#include "vertexarray.h"
using namespace std;
min_index(0),
max_index(0),
restart(false)
-{
- /* XXX Should probably provide a fallback to glDrawElements since this class
- is pretty much required to render anything. */
- static Require _req(EXT_draw_range_elements);
-}
+{ }
Batch::~Batch()
{
Batch &Batch::append(unsigned i)
{
- if(data.empty())
- min_index = max_index = i;
- else
- {
- min_index = min(min_index, i);
- max_index = max(max_index, i);
- }
+ append_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(data_type==UNSIGNED_SHORT)
- ::append<unsigned short>(data, i);
- else if(data_type==UNSIGNED_INT)
- ::append<unsigned>(data, i);
- else
- data.push_back(i);
-
update_offset();
dirty = true;
return *this;
}
-void Batch::append(const vector<unsigned> &ind)
+Batch &Batch::append(const vector<unsigned> &ind)
{
if(ind.empty())
- return;
-
- if(data.empty())
- min_index = max_index = ind.front();
+ return *this;
+ data.reserve(data.size()+ind.size()*get_index_size());
for(vector<unsigned>::const_iterator i=ind.begin(); i!=ind.end(); ++i)
- {
- min_index = min(min_index, *i);
- max_index = max(max_index, *i);
- }
+ append_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);
+ update_offset();
+ dirty = true;
- unsigned base = data.size();
- data.resize(data.size()+ind.size()*get_index_size());
- if(data_type==UNSIGNED_SHORT)
- {
- unsigned short *ptr = reinterpret_cast<unsigned short *>(&data[base]);
- for(unsigned i=0; i<ind.size(); ++i)
- ptr[i] = ind[i];
- }
- else if(data_type==UNSIGNED_INT)
- {
- unsigned *ptr = reinterpret_cast<unsigned *>(&data[base]);
- for(unsigned i=0; i<ind.size(); ++i)
- ptr[i] = ind[i];
- }
+ 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 MSP_primitive_restart || NV_primitive_restart;
else
- {
- for(unsigned i=0; i<ind.size(); ++i)
- data[base+i] = ind[i];
- }
- dirty = true;
+ 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)
- throw incompatible_data("Batch::append");
- else if(prim_type==POLYGON)
- throw incompatible_data("Batch::append");
- else if(prim_type==TRIANGLE_FAN)
- static Require _req(NV_primitive_restart);
+ 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);
+ }
+ }
if(other.data.empty())
- return;
+ return *this;
- if(NV_primitive_restart)
+ if(prim_type==POINTS || prim_type==LINES || prim_type==TRIANGLES || prim_type==QUADS)
+ ;
+ else if(MSP_primitive_restart || NV_primitive_restart)
{
restart = true;
if(data_type==UNSIGNED_SHORT)
unsigned count = other.size();
for(unsigned i=0; i<count; ++i)
- append(other.get_index(i));
+ append_index(other.get_index(i));
+
+ update_offset();
+ dirty = true;
+
+ return *this;
}
-void Batch::upload_data() const
+void Batch::append_index(unsigned i)
{
- get_buffer()->sub_data(get_offset(), data.size(), &data[0]);
+ if(data.empty())
+ min_index = 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(data_type==UNSIGNED_SHORT)
+ ::append<unsigned short>(data, i);
+ else if(data_type==UNSIGNED_INT)
+ ::append<unsigned>(data, i);
+ else
+ data.push_back(i);
}
unsigned Batch::get_index_size() const
index = 0xFF;
if(index!=restart_index)
- {
- if(!restart_index)
- glEnableClientState(GL_PRIMITIVE_RESTART_NV);
- glPrimitiveRestartIndexNV(index);
- restart_index = index;
- }
- }
- else if(restart_index && restart_index<max_index)
- {
- glDisableClientState(GL_PRIMITIVE_RESTART_NV);
- restart_index = 0;
+ set_restart_index(index);
}
+ else if(restart_index && restart_index<=max_index)
+ set_restart_index(0);
- if(get_buffer())
+ Buffer *ibuf = get_buffer();
+ const void *data_ptr;
+ BindRestore _bind_ibuf(ibuf, ELEMENT_ARRAY_BUFFER);
+ if(ibuf)
{
if(dirty)
update_buffer();
- BufferAlias<ELEMENT_ARRAY_BUFFER> alias(*get_buffer());
- Bind bind_ibuf(alias, true);
+ data_ptr = reinterpret_cast<const void *>(get_offset());
+ }
+ else
+ data_ptr = &data[0];
+
+ 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);
+}
- glDrawRangeElements(prim_type, min_index, max_index, size(), data_type, reinterpret_cast<void *>(get_offset()));
+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
- glDrawRangeElements(prim_type, min_index, max_index, size(), data_type, &data[0]);
+ {
+ if(index>0)
+ {
+ if(!restart_index)
+ glEnableClientState(GL_PRIMITIVE_RESTART_NV);
+ glPrimitiveRestartIndexNV(index);
+ }
+ else
+ glDisableClientState(GL_PRIMITIVE_RESTART_NV);
+ }
+
+ restart_index = index;
}
projects / libs / gl.git / blobdiff