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

diff --git a/source/glsl/features.cpp b/source/glsl/features.cpp
index 3c44c11b..eff7dd8d 100644
--- a/source/glsl/features.cpp
+++ b/source/glsl/features.cpp
@@ -1,56 +1,13 @@
-#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>
-#include <msp/gl/extensions/arb_gpu_shader5.h>
-#include <msp/gl/extensions/arb_separate_shader_objects.h>
-#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 "features.h"
 
 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_context()
-{
-	Features features;
-	features.gl_api = get_gl_api();
-	features.glsl_version = get_glsl_version();
-	features.arb_enhanced_layouts = ARB_enhanced_layouts;
-	features.arb_explicit_attrib_location = ARB_explicit_attrib_location;
-	features.arb_explicit_uniform_location = ARB_explicit_uniform_location;
-	features.arb_gpu_shader5 = ARB_gpu_shader5;
-	features.arb_separate_shader_objects = ARB_separate_shader_objects;
-	features.arb_uniform_buffer_object = ARB_uniform_buffer_object;
-	features.ext_gpu_shader4 = EXT_gpu_shader4;
-	features.ext_texture_array = EXT_texture_array;
-	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::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));
@@ -67,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