Check the flat qualifier from the correct member

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

diff --git a/source/glsl/features.cpp b/source/glsl/features.cpp
index dab230d339c517f2a4f4bd5a3ecf895b07c08c10..d66226e327fee4a384b7d2eabb60cf0a21a98c02 100644 (file)
--- a/source/glsl/features.cpp
+++ b/source/glsl/features.cpp
@@ -1,49 +1,85 @@
-#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 <stdexcept>
 #include "features.h"
 
+using namespace std;
+
 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_api_version(GraphicsApi api, 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 = api;
+       features.glsl_version = ver;
+       switch(api)
+       {
+       case OPENGL:
+               if(ver.major==2)
+                       features.glsl_version = Version(1, (ver.minor+1)*10);
+               else if(ver.major==3 && ver.minor<3)
+                       features.glsl_version = Version(1, (ver.minor+3)*10);
+               else
+                       features.glsl_version = Version(ver.major, ver.minor*10);
+
+               features.arb_enhanced_layouts = (ver>=Version(4, 4));
+               features.arb_explicit_attrib_location = (ver>=Version(3, 3));
+               features.arb_explicit_uniform_location = (ver>=Version(4, 3));
+               features.arb_gpu_shader5 = (ver>=Version(4, 0));
+               features.arb_separate_shader_objects = (ver>=Version(4, 1));
+               features.arb_uniform_buffer_object = (ver>=Version(3, 2));
+               features.ext_gpu_shader4 = (ver>=Version(2, 1));
+               features.ext_texture_array = (ver>=Version(3, 0));
+               features.uniform_binding_range = (ver>=Version(4, 3) ? 84 : ver>=Version(4, 0) ? 60 :
+                       ver>=Version(3, 3) ? 36 : 24);
+               features.texture_binding_range = (ver>=Version(4, 3) ? 96 : ver>=Version(4, 0) ? 80 :
+                       ver>=Version(3, 2) ? 48 : ver>=Version(1, 4) ? 32 : 16);
+               features.storage_texture_binding_range = 8;
+               break;
+       case OPENGL_ES:
+               if(ver.major==2)
+                       features.glsl_version = Version(1, 0);
+               else
+                       features.glsl_version = Version(ver.major, ver.minor*10);
+
+               features.arb_enhanced_layouts = (ver>=Version(3, 2));
+               features.arb_explicit_attrib_location = (ver>=Version(3, 0));
+               features.arb_explicit_uniform_location = (ver>=Version(3, 1));
+               features.arb_gpu_shader5 = (ver>=Version(3, 2));
+               features.arb_separate_shader_objects = (ver>=Version(3, 1));
+               features.arb_uniform_buffer_object = (ver>=Version(3, 0));
+               features.ext_gpu_shader4 = (ver>=Version(3, 0));
+               features.ext_texture_array = (ver>=Version(3, 0));
+               features.uniform_binding_range = (ver>=Version(3, 2) ? 72 : ver>=Version(3, 1) ? 36 : 24);
+               features.texture_binding_range = (ver>=Version(3, 2) ? 96 : ver>=Version(3, 1) ? 48 :
+                       ver>=Version(3, 0) ? 32 : 8);
+               features.storage_texture_binding_range = 4;
+               break;
+       case VULKAN:
+               features.glsl_version = Version(4, 60);
+               features.uniform_binding_range = 72;
+               features.texture_binding_range = 96;
+               features.storage_texture_binding_range = 24;
+               break;
+       default:
+               throw invalid_argument("Features::from_api_version");
+       }
        return features;
 }
 
-Features Features::all()
+Features Features::latest(GraphicsApi api)
 {
-       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;
+       switch(api)
+       {
+       case OPENGL:
+               return from_api_version(api, Version(4, 6));
+       case OPENGL_ES:
+               return from_api_version(api, Version(3, 2));
+       case VULKAN:
+               return from_api_version(api, Version(1, 2));
+       default:
+               throw invalid_argument("Features::latest");
+       }
 }
 
 } // namespace SL