Move backend information into Device

[libs/gl.git] / source / core / uniformblock.cpp

diff --git a/source/core/uniformblock.cpp b/source/core/uniformblock.cpp
index 8f85b87f0ba1573e8749b7f8c405382da8201360..adadf0561c8051c54d06c2ac43a3a3608e6539dd 100644 (file)
--- 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 "device.h"
 #include "uniformblock.h"
-#include "vector.h"
 
 using namespace std;
 
@@ -15,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 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;