X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Ffeatures.cpp;h=eff7dd8d7e1869547e70d04627607c91004db8bf;hb=241cf36a6d7735706804bb3c517529bbe078f1ee;hp=78233bfcf48a3ff884bac0344b464c3e7ca17a33;hpb=8e553af57b712051f47293c971671f4f6a939be2;p=libs%2Fgl.git

diff --git a/source/glsl/features.cpp b/source/glsl/features.cpp
index 78233bfc..eff7dd8d 100644
--- a/source/glsl/features.cpp
+++ b/source/glsl/features.cpp
@@ -4,25 +4,10 @@ namespace Msp {
 namespace GL {
 namespace SL {
 
-Features::Features():
-	gl_api(OPENGL),
-	arb_enhanced_layouts(false),
-	arb_explicit_attrib_location(false),
-	arb_explicit_uniform_location(false),
-	arb_gpu_shader5(false),
-	arb_separate_shader_objects(false),
-	arb_uniform_buffer_object(false),
-	ext_gpu_shader4(false),
-	ext_texture_array(false),
-	constant_id_range(0x80000000U),
-	uniform_binding_range(84),
-	texture_binding_range(96)
-{ }
-
-Features Features::from_version(const Version &ver)
+Features Features::from_opengl_version(const Version &ver)
 {
 	Features features;
-	features.gl_api = OPENGL;
+	features.target_api = OPENGL;
 	features.glsl_version = ver;
 	features.arb_enhanced_layouts = (ver>=Version(4, 40));
 	features.arb_explicit_attrib_location = (ver>=Version(1, 30));
@@ -39,9 +24,9 @@ Features Features::from_version(const Version &ver)
 	return features;
 }
 
-Features Features::latest()
+Features Features::opengl_latest()
 {
-	return from_version(Version(4, 60));
+	return from_opengl_version(Version(4, 60));
 }
 
 } // namespace SL