X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Funiformblock.cpp;h=89032b5cf3f045e07c42d9a283f8693975a34687;hb=be6ffe96ecb4707599fe1a6f620c348760213d46;hp=18580149ce9f227c7ec00fe94bb573f5059cefcf;hpb=84e0e55710123e54617d342df852007f8b60af24;p=libs%2Fgl.git

diff --git a/source/core/uniformblock.cpp b/source/core/uniformblock.cpp
index 18580149..89032b5c 100644
--- a/source/core/uniformblock.cpp
+++ b/source/core/uniformblock.cpp
@@ -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;
 }
 
-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;