#include <stdexcept>
-#include "arb_pixel_buffer_object.h"
-#include "arb_uniform_buffer_object.h"
-#include "arb_vertex_buffer_object.h"
+#include <msp/gl/extensions/arb_pixel_buffer_object.h>
+#include <msp/gl/extensions/arb_uniform_buffer_object.h>
+#include <msp/gl/extensions/arb_vertex_buffer_object.h>
#include "buffer.h"
+#include "error.h"
+#include "mesh.h"
#include "misc.h"
using namespace std;
{
if(t!=type)
require_buffer_type(t);
+ // Don't change the binding in a mesh's vertex array object
+ if(t==ELEMENT_ARRAY_BUFFER && Mesh::current())
+ throw invalid_operation("Buffer::bind_to(ELEMENT_ARRAY_BUFFER)");
if(set_current(t, this))
glBindBuffer(t, id);
}
void Buffer::unbind_from(BufferType type)
{
+ if(type==ELEMENT_ARRAY_BUFFER && Mesh::current())
+ throw invalid_operation("Buffer::unbind_from(ELEMENT_ARRAY_BUFFER)");
if(set_current(type, 0))
glBindBuffer(type, 0);
}
if(type==UNIFORM_BUFFER)
{
if(index>=get_n_uniform_buffer_bindings())
- throw out_of_range("Buffer::binding");
+ throw out_of_range("BufferRange::binding");
if(bound_uniform.size()<=index)
bound_uniform.resize(index+1);
return bound_uniform[index];
}
else
- throw invalid_argument("Buffer::binding");
+ throw invalid_argument("BufferRange::binding");
}
bool BufferRange::set_current(BufferType type, unsigned index, const BufferRange *buf)