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

diff --git a/source/glsl/features.cpp b/source/glsl/features.cpp
index a174f644..d66226e3 100644
--- a/source/glsl/features.cpp
+++ b/source/glsl/features.cpp
@@ -15,31 +15,51 @@ Features Features::from_api_version(GraphicsApi api, const Version &ver)
 	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));
+		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, 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);
+		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:
-		features.arb_enhanced_layouts = (ver>=Version(3, 20));
+		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, 10));
-		features.arb_gpu_shader5 = (ver>=Version(3, 20));
-		features.arb_separate_shader_objects = (ver>=Version(3, 10));
+		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, 20) ? 72 : ver>=Version(3, 10) ? 36 : 24);
-		features.texture_binding_range = (ver>=Version(3, 20) ? 96 : ver>=Version(3, 10) ? 48 :
+		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");
@@ -52,9 +72,11 @@ Features Features::latest(GraphicsApi api)
 	switch(api)
 	{
 	case OPENGL:
-		return from_api_version(api, Version(4, 60));
+		return from_api_version(api, Version(4, 6));
 	case OPENGL_ES:
-		return from_api_version(api, Version(3, 20));
+		return from_api_version(api, Version(3, 2));
+	case VULKAN:
+		return from_api_version(api, Version(1, 2));
 	default:
 		throw invalid_argument("Features::latest");
 	}