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

diff --git a/source/glsl/features.cpp b/source/glsl/features.cpp
index 73c95b0f..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,27 +41,37 @@ 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;
 }
 
-Features Features::all()
+Features Features::from_version(const Version &ver)
 {
 	Features features;
 	features.gl_api = OPENGL;
-	features.glsl_version = Version(4, 60);
-	features.arb_enhanced_layouts = true;
-	features.arb_explicit_attrib_location = true;
-	features.arb_explicit_uniform_location = true;
-	features.arb_gpu_shader5 = true;
-	features.arb_separate_shader_objects = true;
-	features.arb_uniform_buffer_object = true;
-	features.ext_gpu_shader4 = true;
-	features.ext_texture_array = true;
+	features.glsl_version = ver;
+	features.arb_enhanced_layouts = (ver>=Version(4, 40));
+	features.arb_explicit_attrib_location = (ver>=Version(1, 30));
+	features.arb_explicit_uniform_location = (ver>=Version(4, 30));
+	features.arb_gpu_shader5 = (ver>=Version(4, 0));
+	features.arb_separate_shader_objects = (ver>=Version(4, 10));
+	features.arb_uniform_buffer_object = (ver>=Version(1, 50));
+	features.ext_gpu_shader4 = (ver>=Version(1, 20));
+	features.ext_texture_array = (ver>=Version(1, 30));
+	features.uniform_binding_range = (ver>=Version(4, 30) ? 84 : ver>=Version(4, 0) ? 60 :
+		ver>=Version(3, 30) ? 36 : 24);
+	features.texture_binding_range = (ver>=Version(4, 30) ? 96 : ver>=Version(4, 0) ? 80 :
+		ver>=Version(1, 50) ? 48 : ver>=Version(1, 40) ? 32 : 16);
 	return features;
 }
 
+Features Features::latest()
+{
+	return from_version(Version(4, 60));
+}
+
 } // namespace SL
 } // namespace GL
 } // namespace Msp