X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fcore%2Funiformblock.cpp;h=18580149ce9f227c7ec00fe94bb573f5059cefcf;hb=9813f8711628a0fbe786406e974dc33546dc9cee;hp=8f85b87f0ba1573e8749b7f8c405382da8201360;hpb=729a477b47e97aea41f3f0b5db551f02bf70d1ee;p=libs%2Fgl.git

diff --git a/source/core/uniformblock.cpp b/source/core/uniformblock.cpp
index 8f85b87f..18580149 100644
--- a/source/core/uniformblock.cpp
+++ b/source/core/uniformblock.cpp
@@ -1,13 +1,6 @@
 #include <algorithm>
-#include <msp/gl/extensions/arb_shader_objects.h>
-#include <msp/gl/extensions/arb_uniform_buffer_object.h>
-#include "buffer.h"
-#include "color.h"
 #include "deviceinfo.h"
-#include "error.h"
-#include "matrix.h"
 #include "uniformblock.h"
-#include "vector.h"
 
 using namespace std;
 
@@ -15,16 +8,13 @@ namespace Msp {
 namespace GL {
 
 UniformBlock::UniformBlock(const ReflectData::UniformBlockInfo &info):
+	UniformBlockBackend(info.bind_point>=0),
 	data(info.data_size)
-{
-	static Require _req(ARB_shader_objects);
-	if(info.bind_point>=0)
-		static Require _req2(ARB_uniform_buffer_object);
-}
+{ }
 
 unsigned UniformBlock::get_alignment() const
 {
-	return Limits::get_global().uniform_buffer_alignment;
+	return DeviceInfo::get_global().limits.uniform_buffer_alignment;
 }
 
 void UniformBlock::store(const ReflectData::UniformInfo &info, unsigned array_size, const void *value)