X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fglsl%2Ffeatures.cpp;h=a174f644fedec10c5b906cbd8a6feda19ed1dc63;hp=eff7dd8d7e1869547e70d04627607c91004db8bf;hb=aa389f9840d961f7edbcf64eadced812134d8481;hpb=c32051dc7e77faf0fe6bdad2a6f1025e7b43da19

diff --git a/source/glsl/features.cpp b/source/glsl/features.cpp
index eff7dd8d..a174f644 100644
--- a/source/glsl/features.cpp
+++ b/source/glsl/features.cpp
@@ -1,32 +1,63 @@
+#include <stdexcept>
 #include "features.h"
 
+using namespace std;
+
 namespace Msp {
 namespace GL {
 namespace SL {
 
-Features Features::from_opengl_version(const Version &ver)
+Features Features::from_api_version(GraphicsApi api, const Version &ver)
 {
 	Features features;
-	features.target_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:
+		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);
+		break;
+	case OPENGL_ES:
+		features.arb_enhanced_layouts = (ver>=Version(3, 20));
+		features.arb_explicit_attrib_location = (ver>=Version(3, 0));
+		features.arb_explicit_uniform_location = (ver>=Version(3, 10));
+		features.arb_gpu_shader5 = (ver>=Version(3, 20));
+		features.arb_separate_shader_objects = (ver>=Version(3, 10));
+		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, 20) ? 72 : ver>=Version(3, 10) ? 36 : 24);
+		features.texture_binding_range = (ver>=Version(3, 20) ? 96 : ver>=Version(3, 10) ? 48 :
+			ver>=Version(3, 0) ? 32 : 8);
+		break;
+	default:
+		throw invalid_argument("Features::from_api_version");
+	}
 	return features;
 }
 
-Features Features::opengl_latest()
+Features Features::latest(GraphicsApi api)
 {
-	return from_opengl_version(Version(4, 60));
+	switch(api)
+	{
+	case OPENGL:
+		return from_api_version(api, Version(4, 60));
+	case OPENGL_ES:
+		return from_api_version(api, Version(3, 20));
+	default:
+		throw invalid_argument("Features::latest");
+	}
 }
 
 } // namespace SL