#include "bindable.h"
#include "buffer.h"
#include "error.h"
-#include "extension.h"
+#include "ext_draw_range_elements.h"
#include "nv_primitive_restart.h"
#include "vertexarray.h"
using namespace std;
+namespace {
+
+template<typename T>
+void append(vector<unsigned char> &data, T i)
+{
+ data.insert(data.end(), sizeof(T), 0);
+ *(T *)(&data[data.size()-sizeof(T)]) = i;
+}
+
+template<typename T, typename U>
+U convert(T n)
+{
+ if(!static_cast<T>(~n))
+ return ~0;
+ else
+ return n;
+}
+
+template<typename T, typename U>
+void expand(vector<unsigned char> &data)
+{
+ unsigned count = data.size()/sizeof(T);
+ data.resize(count*sizeof(U));
+ for(unsigned i=count; i--;)
+ *(U *)(&data[i*sizeof(U)]) = convert<T, U>(*(T *)(&data[i*sizeof(T)]));
+}
+
+template<typename T, typename U>
+void shrink(vector<unsigned char> &data)
+{
+ unsigned count = data.size()/sizeof(T);
+ for(unsigned i=0; i<count; ++i)
+ *(U *)(&data[i*sizeof(U)]) = convert<T, U>(*(T *)(&data[i*sizeof(T)]));
+ data.resize(count*sizeof(U));
+}
+
+}
+
namespace Msp {
namespace GL {
data_type(UNSIGNED_BYTE),
min_index(0),
max_index(0),
- restart(false),
- ibuf(0),
- ibuf_offset(0),
- next_in_ibuf(0),
- prev_in_ibuf(0),
- dirty(false)
-{ }
+ 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()
{
- unlink_from_ibuf();
}
void Batch::set_data_type(DataType t)
throw invalid_operation("Batch::set_data_type");
if(data_type==UNSIGNED_BYTE && t==UNSIGNED_SHORT)
- expand_data<unsigned char, unsigned short>();
+ expand<unsigned char, unsigned short>(data);
else if(data_type==UNSIGNED_BYTE && t==UNSIGNED_INT)
- expand_data<unsigned char, unsigned>();
+ expand<unsigned char, unsigned>(data);
else if(data_type==UNSIGNED_SHORT && t==UNSIGNED_INT)
- expand_data<unsigned short, unsigned>();
+ expand<unsigned short, unsigned>(data);
else if(data_type==UNSIGNED_INT && t==UNSIGNED_BYTE)
- shrink_data<unsigned, unsigned char>();
+ shrink<unsigned, unsigned char>(data);
else if(data_type==UNSIGNED_INT && t==UNSIGNED_SHORT)
- shrink_data<unsigned, unsigned short>();
+ shrink<unsigned, unsigned short>(data);
else if(data_type==UNSIGNED_SHORT && t==UNSIGNED_BYTE)
- shrink_data<unsigned short, unsigned char>();
+ shrink<unsigned short, unsigned char>(data);
data_type = t;
- update_ibuf_offsets();
- dirty = true;
-}
-
-void Batch::use_index_buffer(Buffer *buf, Batch *prev)
-{
- if(buf && prev && prev->ibuf!=buf)
- throw invalid_argument("Batch::use_index_buffer");
-
- if(!buf)
- {
- prev = 0;
- unlink_from_ibuf();
- }
-
- ibuf = buf;
- prev_in_ibuf = prev;
- next_in_ibuf = 0;
- if(prev)
- {
- prev->next_in_ibuf = this;
- ibuf_offset = prev->ibuf_offset+prev->data.size();
- }
- else
- ibuf_offset = 0;
-
+ update_offset();
dirty = true;
}
set_data_type(UNSIGNED_SHORT);
if(data_type==UNSIGNED_SHORT)
- append_index<unsigned short>(i);
+ ::append<unsigned short>(data, i);
else if(data_type==UNSIGNED_INT)
- append_index<unsigned>(i);
+ ::append<unsigned>(data, i);
else
data.push_back(i);
- update_ibuf_offsets();
+ update_offset();
dirty = true;
return *this;
for(unsigned i=0; i<ind.size(); ++i)
data[base+i] = ind[i];
}
+ dirty = true;
}
void Batch::append(const Batch &other)
else if(prim_type==POLYGON)
throw incompatible_data("Batch::append");
else if(prim_type==TRIANGLE_FAN)
- static RequireExtension _ext("GL_NV_primitive_restart");
+ static Require _req(NV_primitive_restart);
if(other.data.empty())
return;
- if(is_supported("GL_NV_primitive_restart"))
+ if(NV_primitive_restart)
{
restart = true;
if(data_type==UNSIGNED_SHORT)
- append_index<unsigned short>(0xFFFF);
+ ::append<unsigned short>(data, 0xFFFF);
else if(data_type==UNSIGNED_INT)
- append_index<unsigned>(0xFFFFFFFF);
+ ::append<unsigned>(data, 0xFFFFFFFF);
else
data.push_back(0xFF);
}
append(other.get_index(i));
}
+void Batch::upload_data() const
+{
+ get_buffer()->sub_data(get_offset(), data.size(), &data[0]);
+}
+
+unsigned Batch::get_index_size() const
+{
+ if(data_type==UNSIGNED_SHORT)
+ return sizeof(unsigned short);
+ else if(data_type==UNSIGNED_INT)
+ return sizeof(unsigned);
+ return sizeof(unsigned char);
+}
+
+unsigned Batch::get_index(unsigned i) const
+{
+ if(data_type==UNSIGNED_SHORT)
+ return *(unsigned short *)&data[i*sizeof(unsigned short)];
+ else if(data_type==UNSIGNED_INT)
+ return *(unsigned *)&data[i*sizeof(unsigned )];
+ else
+ return data[i];
+}
+
void Batch::draw() const
{
if(restart)
restart_index = 0;
}
- if(ibuf)
+ if(get_buffer())
{
if(dirty)
- {
- const Batch *b = this;
- for(; b->prev_in_ibuf; b=b->prev_in_ibuf) ;
-
- unsigned chain_size = 0;
- for(const Batch *a=b; a; a=a->next_in_ibuf)
- chain_size += a->data.size();
+ update_buffer();
- ibuf->data(chain_size, 0);
-
- for(; b; b=b->next_in_ibuf)
- {
- ibuf->sub_data(b->ibuf_offset, b->data.size(), &b->data[0]);
- b->dirty = false;
- }
- }
-
- BufferAlias<ELEMENT_ARRAY_BUFFER> alias(*ibuf);
+ BufferAlias<ELEMENT_ARRAY_BUFFER> alias(*get_buffer());
Bind bind_ibuf(alias, true);
- glDrawRangeElements(prim_type, min_index, max_index, size(), data_type, (void *)ibuf_offset);
+ glDrawRangeElements(prim_type, min_index, max_index, size(), data_type, reinterpret_cast<void *>(get_offset()));
}
else
glDrawRangeElements(prim_type, min_index, max_index, size(), data_type, &data[0]);
}
-unsigned Batch::get_index_size() const
-{
- if(data_type==UNSIGNED_SHORT)
- return sizeof(unsigned short);
- else if(data_type==UNSIGNED_INT)
- return sizeof(unsigned);
- return sizeof(unsigned char);
-}
-
-template<typename T>
-void Batch::append_index(T i)
-{
- data.insert(data.end(), sizeof(T), 0);
- *(T *)(&data[data.size()-sizeof(T)]) = i;
-}
-
-unsigned Batch::get_index(unsigned i) const
-{
- if(data_type==UNSIGNED_SHORT)
- return *(unsigned short *)&data[i*sizeof(unsigned short)];
- else if(data_type==UNSIGNED_INT)
- return *(unsigned *)&data[i*sizeof(unsigned )];
- else
- return data[i];
-}
-
-template<typename T, typename U>
-void Batch::expand_data()
-{
- unsigned count = data.size()/sizeof(T);
- data.resize(count*sizeof(U));
- for(unsigned i=count; i--;)
- *(U *)(&data[i*sizeof(U)]) = convert<T, U>(*(T *)(&data[i*sizeof(T)]));
-}
-
-template<typename T, typename U>
-void Batch::shrink_data()
-{
- unsigned count = data.size()/sizeof(T);
- for(unsigned i=0; i<count; ++i)
- *(U *)(&data[i*sizeof(U)]) = convert<T, U>(*(T *)(&data[i*sizeof(T)]));
- data.resize(count*sizeof(U));
-}
-
-template<typename T, typename U>
-U Batch::convert(T i) const
-{
- if(!static_cast<T>(~i))
- return ~0;
- else
- return i;
-}
-
-void Batch::unlink_from_ibuf()
-{
- if(next_in_ibuf)
- next_in_ibuf->prev_in_ibuf = prev_in_ibuf;
- if(prev_in_ibuf)
- {
- prev_in_ibuf->next_in_ibuf = next_in_ibuf;
- prev_in_ibuf->update_ibuf_offsets();
- }
- else if(next_in_ibuf)
- {
- next_in_ibuf->ibuf_offset = 0;
- next_in_ibuf->update_ibuf_offsets();
- }
-}
-
-void Batch::update_ibuf_offsets()
-{
- for(Batch *b=this; b->next_in_ibuf; b=b->next_in_ibuf)
- b->next_in_ibuf->ibuf_offset = b->ibuf_offset+b->data.size();
-}
-
Batch::Loader::Loader(Batch &b):
DataFile::ObjectLoader<Batch>(b)
projects / libs / gl.git / blobdiff