X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuffer.cpp;h=d8bb28028ee686380e48b77613c039906df40a35;hb=c233a90fd05f1f5424d7fca94bb6b999f3061271;hp=5a0f4762a22b287ed266c2acb15850889acfc67a;hpb=b250a711295f5ba00114f11a5b1c855eebe08d26;p=libs%2Fgl.git

diff --git a/source/buffer.cpp b/source/buffer.cpp
index 5a0f4762..d8bb2802 100644
--- a/source/buffer.cpp
+++ b/source/buffer.cpp
@@ -1,8 +1,10 @@
 #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;
@@ -67,12 +69,17 @@ void Buffer::bind_to(BufferType t) const
 {
 	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);
 }