X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fcompatibility.cpp;h=a5ba8247a53d705c82223d9b8241e5d28dbea14e;hb=02c43c5aebb2214af8144eaf19f25b9a04aa2414;hp=9ed0d20c82c8b2a0ecc109c9db4adb55fff5040b;hpb=8173340a7737e32cb25b21b67049102bd1526beb;p=libs%2Fgl.git

diff --git a/source/glsl/compatibility.cpp b/source/glsl/compatibility.cpp
index 9ed0d20c..a5ba8247 100644
--- a/source/glsl/compatibility.cpp
+++ b/source/glsl/compatibility.cpp
@@ -88,9 +88,20 @@ void LegacyConverter::apply(Stage &s, const Features &feat)
 {
 	stage = &s;
 	features = feat;
-	if(!supports_stage(s.type))
-		throw unsupported_shader(format("Stage %s is not supported", Stage::get_stage_name(s.type)));
-	s.content.visit(*this);
+	if(supports_stage(s.type))
+		s.content.visit(*this);
+	else
+		unsupported(format("Stage %s is not supported", Stage::get_stage_name(s.type)));
+}
+
+void LegacyConverter::unsupported(const string &reason)
+{
+	Diagnostic diagnostic;
+	diagnostic.severity = Diagnostic::ERR;
+	diagnostic.source = GENERATED_SOURCE;
+	diagnostic.line = 0;
+	diagnostic.message = reason;
+	stage->diagnostics.push_back(diagnostic);
 }
 
 void LegacyConverter::visit(Block &block)
@@ -274,10 +285,13 @@ void LegacyConverter::visit(VariableDeclaration &var)
 			}
 			else if(stage->type==Stage::FRAGMENT && var.interface=="out")
 			{
-				if(i->value!=0 && !check_extension(&Features::ext_gpu_shader4))
-					throw unsupported_shader("EXT_gpu_shader4 is required");
-				stage->locations[var.name] = i->value;
-				var.layout->qualifiers.erase(i);
+				if(check_extension(&Features::ext_gpu_shader4))
+				{
+					stage->locations[var.name] = i->value;
+					var.layout->qualifiers.erase(i);
+				}
+				else if(i->value!=0)
+					unsupported("EXT_gpu_shader4 required for multiple fragment shader outputs");
 			}
 
 			if(var.layout->qualifiers.empty())
@@ -329,8 +343,13 @@ void LegacyConverter::visit(InterfaceBlock &iface)
 {
 	if(!supports_interface_blocks(iface.interface))
 	{
-		stage->content.body.splice(uniform_insert_point, iface.members.body);
-		nodes_to_remove.insert(&iface);
+		if(!iface.instance_name.empty())
+			unsupported("ARB_uniform_buffer_object required for interface block instances");
+		else
+		{
+			stage->content.body.splice(uniform_insert_point, iface.members.body);
+			nodes_to_remove.insert(&iface);
+		}
 	}
 }