X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Funiformblock.cpp;h=18580149ce9f227c7ec00fe94bb573f5059cefcf;hb=8751e01c31094455bbe72d23ac1bffd9a86c7c45;hp=76d657a10456a895539ddeef2246aa09a91d702a;hpb=acaefb4c669f01855252818ef0a2958cbdababc3;p=libs%2Fgl.git

diff --git a/source/core/uniformblock.cpp b/source/core/uniformblock.cpp
index 76d657a1..18580149 100644
--- a/source/core/uniformblock.cpp
+++ b/source/core/uniformblock.cpp
@@ -1,6 +1,4 @@
 #include <algorithm>
-#include <msp/gl/extensions/arb_shader_objects.h>
-#include <msp/gl/extensions/arb_uniform_buffer_object.h>
 #include "deviceinfo.h"
 #include "uniformblock.h"
 
@@ -10,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)