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

diff --git a/source/glsl/features.cpp b/source/glsl/features.cpp
index 0b5b438b..a66eefc5 100644
--- a/source/glsl/features.cpp
+++ b/source/glsl/features.cpp
@@ -1,12 +1,3 @@
-#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 <msp/gl/misc.h>
 #include "features.h"
 
 namespace Msp {
@@ -14,7 +5,7 @@ namespace GL {
 namespace SL {
 
 Features::Features():
-	gl_api(OPENGL),
+	target_api(OPENGL),
 	arb_enhanced_layouts(false),
 	arb_explicit_attrib_location(false),
 	arb_explicit_uniform_location(false),
@@ -28,28 +19,10 @@ Features::Features():
 	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;
-	features.uniform_binding_range = get_i(GL_MAX_UNIFORM_BUFFER_BINDINGS);
-	features.texture_binding_range = get_i(GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS);
-	return features;
-}
-
 Features Features::from_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));