X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fcore%2Funiformblock.cpp;h=adadf0561c8051c54d06c2ac43a3a3608e6539dd;hp=18580149ce9f227c7ec00fe94bb573f5059cefcf;hb=d16d28d2ccf7c6255204f02975834f713ff1df08;hpb=160e9eea29bd10034733d59507fa1bcca36be401

diff --git a/source/core/uniformblock.cpp b/source/core/uniformblock.cpp
index 18580149..adadf056 100644
--- a/source/core/uniformblock.cpp
+++ b/source/core/uniformblock.cpp
@@ -1,5 +1,5 @@
 #include <algorithm>
-#include "deviceinfo.h"
+#include "device.h"
 #include "uniformblock.h"
 
 using namespace std;
@@ -12,14 +12,14 @@ UniformBlock::UniformBlock(const ReflectData::UniformBlockInfo &info):
 	data(info.data_size)
 { }
 
-unsigned UniformBlock::get_alignment() const
+size_t UniformBlock::get_alignment() const
 {
-	return DeviceInfo::get_global().limits.uniform_buffer_alignment;
+	return Device::get_current().get_info().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;