X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fglsl%2Ffeatures.cpp;h=c67cf2dca79943f1e39ee7254eec9b6add4ff210;hp=db213e833deea22b250768e5cb81791fddd2be39;hb=HEAD;hpb=b877c737bc5f759e6da25f886ad965e4a274cf2a

diff --git a/source/glsl/features.cpp b/source/glsl/features.cpp
index db213e83..d66226e3 100644
--- a/source/glsl/features.cpp
+++ b/source/glsl/features.cpp
@@ -1,75 +1,85 @@
-#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 <stdexcept>
 #include "features.h"
 
+using namespace std;
+
 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::from_api_version(GraphicsApi api, const Version &ver)
 {
 	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 = Limits::get_global();
-	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;
-	features.gl_api = OPENGL;
+	features.target_api = api;
 	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);
+	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::latest()
+Features Features::latest(GraphicsApi api)
 {
-	return from_version(Version(4, 60));
+	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