+ case UNIFORM_BUFFER: return bound[4];
+ default: throw invalid_argument("Buffer::binding");
+ }
+}
+
+bool Buffer::set_current(BufferType type, const Buffer *buf)
+{
+ const Buffer *&ptr = binding(type);
+ if(ptr==buf)
+ return false;
+
+ ptr = buf;
+ return true;
+}
+
+void Buffer::restore(const Buffer *buf, BufferType type)
+{
+ if(buf!=current(type))
+ {
+ if(buf)
+ buf->bind_to(type);
+ else
+ unbind_from(type);
+ }
+}
+
+
+vector<const BufferRange *> BufferRange::bound_uniform;
+
+BufferRange::BufferRange(Buffer &b, unsigned o, unsigned s):
+ buffer(b),
+ offset(o),
+ size(s)
+{
+ if(o>buffer.get_size() || o+s>buffer.get_size())
+ throw out_of_range("BufferRange::BufferRange");
+}
+
+void BufferRange::data(const void *d)
+{
+ buffer.sub_data(offset, size, d);
+}
+
+void BufferRange::bind_to(BufferType t, unsigned i)
+{
+ if(t!=buffer.type)
+ Buffer::require_buffer_type(t);
+ // Intentionally using bitwise | to avoid short-circuiting
+ if(Buffer::set_current(t, &buffer) | set_current(t, i, this))
+ glBindBufferRange(t, i, buffer.id, offset, size);
+}
+
+void BufferRange::unbind_from(BufferType t, unsigned i)
+{
+ if(set_current(t, i, 0))
+ {
+ Buffer::set_current(t, 0);
+ glBindBufferBase(t, i, 0);