X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fbackends%2Fopengl%2Fbuffer_backend.cpp;h=13944a86d439231e93603b84454fceed5f781900;hp=e0f5525a9a2b211f8b2f5367ee78379aa8415146;hb=a6d84d93ce8c0adde41679a6c6852335e19ada17;hpb=b23a9af95c65c01d949153fc49e5091aaa7c3d30

diff --git a/source/backends/opengl/buffer_backend.cpp b/source/backends/opengl/buffer_backend.cpp
index e0f5525a..13944a86 100644
--- a/source/backends/opengl/buffer_backend.cpp
+++ b/source/backends/opengl/buffer_backend.cpp
@@ -6,14 +6,13 @@
 #include <msp/gl/extensions/oes_mapbuffer.h>
 #include "buffer.h"
 #include "buffer_backend.h"
+#include "device.h"
 
 using namespace std;
 
 namespace Msp {
 namespace GL {
 
-OpenGLBuffer *OpenGLBuffer::scratch_binding = 0;
-
 OpenGLBuffer::OpenGLBuffer()
 {
 	static Require _req(ARB_vertex_buffer_object);
@@ -32,7 +31,7 @@ OpenGLBuffer::OpenGLBuffer(OpenGLBuffer &&other):
 
 OpenGLBuffer::~OpenGLBuffer()
 {
-	if(this==scratch_binding)
+	if(this==Device::get_current().get_state().scratch_buffer)
 		unbind_scratch();
 	if(id)
 		glDeleteBuffers(1, &id);
@@ -115,6 +114,7 @@ void OpenGLBuffer::set_debug_name(const string &name)
 
 void OpenGLBuffer::bind_scratch()
 {
+	const OpenGLBuffer *&scratch_binding = Device::get_current().get_state().scratch_buffer;
 	if(scratch_binding!=this)
 	{
 		glBindBuffer(GL_ARRAY_BUFFER, id);
@@ -124,6 +124,7 @@ void OpenGLBuffer::bind_scratch()
 
 void OpenGLBuffer::unbind_scratch()
 {
+	const OpenGLBuffer *&scratch_binding = Device::get_current().get_state().scratch_buffer;
 	if(scratch_binding)
 	{
 		glBindBuffer(GL_ARRAY_BUFFER, 0);