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

diff --git a/source/glsl/features.cpp b/source/glsl/features.cpp
index dab230d3..73c95b0f 100644
--- a/source/glsl/features.cpp
+++ b/source/glsl/features.cpp
@@ -1,8 +1,12 @@
+#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 {
@@ -11,12 +15,17 @@ 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),
-	max_constant_id(0x7FFFFFFF)
+	constant_id_range(0x80000000U),
+	uniform_binding_range(84),
+	texture_binding_range(96)
 { }
 
 Features Features::from_context()
@@ -24,12 +33,16 @@ 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_texture_cube_map_array = ARB_texture_cube_map_array;
+	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;
 }
 
@@ -38,8 +51,11 @@ Features Features::all()
 	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;