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

diff --git a/source/core/uniformblock.cpp b/source/core/uniformblock.cpp
index 76d657a1..89032b5c 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,21 +8,18 @@ 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
+size_t 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)
+void UniformBlock::store(const ReflectData::UniformInfo &info, size_t array_size, const void *value)
 {
-	array_size = min(array_size, max(info.array_size, 1U));
+	array_size = min(array_size, max<size_t>(info.array_size, 1U));
 
 	char *store_ptr;
 	bool packed;