X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Ffeatures.cpp;h=3c44c11bba94b47c389c99cdeb5b5546ae8e6417;hb=009918e76dda88b0cb68fdaa20c63d6e952af260;hp=0b5b438b6b1acffc21649742eed47b9f22e57ce7;hpb=1401e69c17d06034af53f6e55e735be065b75c7b;p=libs%2Fgl.git

diff --git a/source/glsl/features.cpp b/source/glsl/features.cpp
index 0b5b438b..3c44c11b 100644
--- a/source/glsl/features.cpp
+++ b/source/glsl/features.cpp
@@ -1,3 +1,4 @@
+#include <msp/gl/deviceinfo.h>
 #include <msp/gl/extensions/arb_enhanced_layouts.h>
 #include <msp/gl/extensions/arb_explicit_attrib_location.h>
 #include <msp/gl/extensions/arb_explicit_uniform_location.h>
@@ -6,7 +7,6 @@
 #include <msp/gl/extensions/arb_uniform_buffer_object.h>
 #include <msp/gl/extensions/ext_gpu_shader4.h>
 #include <msp/gl/extensions/ext_texture_array.h>
-#include <msp/gl/misc.h>
 #include "features.h"
 
 namespace Msp {
@@ -41,8 +41,9 @@ Features Features::from_context()
 	features.arb_uniform_buffer_object = ARB_uniform_buffer_object;
 	features.ext_gpu_shader4 = EXT_gpu_shader4;
 	features.ext_texture_array = EXT_texture_array;
-	features.uniform_binding_range = get_i(GL_MAX_UNIFORM_BUFFER_BINDINGS);
-	features.texture_binding_range = get_i(GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS);
+	const Limits &limits = DeviceInfo::get_global().limits;
+	features.uniform_binding_range = limits.max_uniform_bindings;
+	features.texture_binding_range = limits.max_texture_bindings;
 	return features;
 }