Use default member initializers for simple types

[libs/gl.git] / source / glsl / features.cpp

diff --git a/source/glsl/features.cpp b/source/glsl/features.cpp
index dab230d339c517f2a4f4bd5a3ecf895b07c08c10..943f3b06fb8080b04defa5f807219b32ab404f4c 100644 (file)
--- a/source/glsl/features.cpp
+++ b/source/glsl/features.cpp
@@ -1,49 +1,32 @@
-#include <msp/gl/extensions/arb_explicit_attrib_location.h>
-#include <msp/gl/extensions/arb_gpu_shader5.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_explicit_attrib_location(false),
-       arb_gpu_shader5(false),
-       arb_uniform_buffer_object(false),
-       ext_gpu_shader4(false),
-       ext_texture_array(false),
-       max_constant_id(0x7FFFFFFF)
-{ }
-
-Features Features::from_context()
+Features Features::from_version(const Version &ver)
 {
        Features features;
-       features.gl_api = get_gl_api();
-       features.glsl_version = get_glsl_version();
-       features.arb_explicit_attrib_location = ARB_explicit_attrib_location;
-       features.arb_gpu_shader5 = ARB_gpu_shader5;
-       //features.arb_texture_cube_map_array = ARB_texture_cube_map_array;
-       features.arb_uniform_buffer_object = ARB_uniform_buffer_object;
-       features.ext_gpu_shader4 = EXT_gpu_shader4;
-       features.ext_texture_array = EXT_texture_array;
+       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));
+       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::all()
+Features Features::latest()
 {
-       Features features;
-       features.gl_api = OPENGL;
-       features.glsl_version = Version(4, 60);
-       features.arb_explicit_attrib_location = true;
-       features.arb_gpu_shader5 = true;
-       features.arb_uniform_buffer_object = true;
-       features.ext_gpu_shader4 = true;
-       features.ext_texture_array = true;
-       return features;
+       return from_version(Version(4, 60));
 }
 
 } // namespace SL