X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fcompatibility.cpp;h=128902f3b9f473bb9df87559d40a231c139ac55e;hb=5c33b56c3b97ca0381ac216a603c7553f4bea499;hp=a9f38a35cda42481935864b5bbd97285bbf63462;hpb=ab5f2e6f1ddd35f8f117460530d76c0ba0c9bc87;p=libs%2Fgl.git

diff --git a/source/glsl/compatibility.cpp b/source/glsl/compatibility.cpp
index a9f38a35..128902f3 100644
--- a/source/glsl/compatibility.cpp
+++ b/source/glsl/compatibility.cpp
@@ -1,11 +1,8 @@
 #include <msp/core/algorithm.h>
 #include <msp/core/raii.h>
-#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 <msp/strings/lexicalcast.h>
 #include "compatibility.h"
+#include "glsl_error.h"
 
 using namespace std;
 
@@ -20,7 +17,7 @@ DefaultPrecisionGenerator::DefaultPrecisionGenerator():
 void DefaultPrecisionGenerator::apply(Stage &s)
 {
 	stage = &s;
-	visit(s.content);
+	s.content.visit(*this);
 }
 
 void DefaultPrecisionGenerator::visit(Block &block)
@@ -68,7 +65,7 @@ void DefaultPrecisionGenerator::visit(VariableDeclaration &var)
 
 void PrecisionRemover::apply(Stage &stage)
 {
-	visit(stage.content);
+	stage.content.visit(*this);
 	NodeRemover().apply(stage, nodes_to_remove);
 }
 
@@ -84,15 +81,16 @@ void PrecisionRemover::visit(VariableDeclaration &var)
 
 
 LegacyConverter::LegacyConverter():
-	target_api(get_gl_api()),
-	target_version(get_glsl_version()),
 	frag_out(0)
 { }
 
-void LegacyConverter::apply(Stage &s)
+void LegacyConverter::apply(Stage &s, const Features &feat)
 {
 	stage = &s;
-	visit(s.content);
+	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);
 }
 
 void LegacyConverter::visit(Block &block)
@@ -107,29 +105,40 @@ void LegacyConverter::visit(Block &block)
 
 bool LegacyConverter::check_version(const Version &feature_version) const
 {
-	if(target_version<feature_version)
+	if(features.glsl_version<feature_version)
 		return false;
-	else if(stage->required_version<feature_version)
-		stage->required_version = feature_version;
+	else if(stage->required_features.glsl_version<feature_version)
+		stage->required_features.glsl_version = feature_version;
 
 	return true;
 }
 
-bool LegacyConverter::check_extension(const Extension &extension) const
+bool LegacyConverter::check_extension(bool Features::*extension) const
 {
-	if(!extension)
+	if(!(features.*extension))
 		return false;
 
-	vector<const Extension *>::iterator i = find(stage->required_extensions, &extension);
-	if(i==stage->required_extensions.end())
-		stage->required_extensions.push_back(&extension);
+	stage->required_features.*extension = true;
 
 	return true;
 }
 
+bool LegacyConverter::supports_stage(Stage::Type st) const
+{
+	if(st==Stage::GEOMETRY)
+	{
+		if(features.gl_api==OPENGL_ES2)
+			return check_version(Version(3, 20));
+		else
+			return check_version(Version(1, 50));
+	}
+	else
+		return true;
+}
+
 bool LegacyConverter::supports_unified_interface_syntax() const
 {
-	if(target_api==OPENGL_ES2)
+	if(features.gl_api==OPENGL_ES2)
 		return check_version(Version(3, 0));
 	else
 		return check_version(Version(1, 30));
@@ -158,7 +167,7 @@ void LegacyConverter::visit(Assignment &assign)
 
 bool LegacyConverter::supports_unified_sampling_functions() const
 {
-	if(target_api==OPENGL_ES2)
+	if(features.gl_api==OPENGL_ES2)
 		return check_version(Version(3, 0));
 	else
 		return check_version(Version(1, 30));
@@ -196,22 +205,22 @@ void LegacyConverter::visit(FunctionCall &call)
 				call.name = "shadow2D";
 			else if(sampler_type=="sampler1DArray")
 			{
-				check_extension(EXT_texture_array);
+				check_extension(&Features::ext_texture_array);
 				call.name = "texture1DArray";
 			}
 			else if(sampler_type=="sampler2DArray")
 			{
-				check_extension(EXT_texture_array);
+				check_extension(&Features::ext_texture_array);
 				call.name = "texture2DArray";
 			}
 			else if(sampler_type=="sampler1DArrayShadow")
 			{
-				check_extension(EXT_texture_array);
+				check_extension(&Features::ext_texture_array);
 				call.name = "shadow1DArray";
 			}
 			else if(sampler_type=="sampler2DArrayShadow")
 			{
-				check_extension(EXT_texture_array);
+				check_extension(&Features::ext_texture_array);
 				call.name = "shadow2DArray";
 			}
 		}
@@ -222,32 +231,32 @@ void LegacyConverter::visit(FunctionCall &call)
 
 bool LegacyConverter::supports_interface_layouts() const
 {
-	if(target_api==OPENGL_ES2)
+	if(features.gl_api==OPENGL_ES2)
 		return check_version(Version(3, 0));
 	else if(check_version(Version(3, 30)))
 		return true;
 	else
-		return check_extension(ARB_explicit_attrib_location);
+		return check_extension(&Features::arb_explicit_attrib_location);
 }
 
 bool LegacyConverter::supports_centroid_sampling() const
 {
-	if(target_api==OPENGL_ES2)
+	if(features.gl_api==OPENGL_ES2)
 		return check_version(Version(3, 0));
 	else if(check_version(Version(1, 20)))
 		return true;
 	else
-		return check_extension(EXT_gpu_shader4);
+		return check_extension(&Features::ext_gpu_shader4);
 }
 
 bool LegacyConverter::supports_sample_sampling() const
 {
-	if(target_api==OPENGL_ES2)
+	if(features.gl_api==OPENGL_ES2)
 		return check_version(Version(3, 20));
 	else if(check_version(Version(4, 0)))
 		return true;
 	else
-		return check_extension(ARB_gpu_shader5);
+		return check_extension(&Features::arb_gpu_shader5);
 }
 
 void LegacyConverter::visit(VariableDeclaration &var)
@@ -255,20 +264,19 @@ void LegacyConverter::visit(VariableDeclaration &var)
 	if(var.layout && !supports_interface_layouts())
 	{
 		vector<Layout::Qualifier>::iterator i;
-		for(i=var.layout->qualifiers.begin(); (i!=var.layout->qualifiers.end() && i->identifier!="location"); ++i) ;
+		for(i=var.layout->qualifiers.begin(); (i!=var.layout->qualifiers.end() && i->name!="location"); ++i) ;
 		if(i!=var.layout->qualifiers.end())
 		{
-			unsigned location = lexical_cast<unsigned>(i->value);
 			if(stage->type==Stage::VERTEX && var.interface=="in")
 			{
-				stage->locations[var.name] = location;
+				stage->locations[var.name] = i->value;
 				var.layout->qualifiers.erase(i);
 			}
 			else if(stage->type==Stage::FRAGMENT && var.interface=="out")
 			{
-				if(location!=0)
-					static Require _req(EXT_gpu_shader4);
-				stage->locations[var.name] = location;
+				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);
 			}
 
@@ -302,7 +310,7 @@ void LegacyConverter::visit(VariableDeclaration &var)
 
 bool LegacyConverter::supports_interface_blocks(const string &iface) const
 {
-	if(target_api==OPENGL_ES2)
+	if(features.gl_api==OPENGL_ES2)
 	{
 		if(iface=="uniform")
 			return check_version(Version(3, 0));
@@ -312,7 +320,7 @@ bool LegacyConverter::supports_interface_blocks(const string &iface) const
 	else if(check_version(Version(1, 50)))
 		return true;
 	else if(iface=="uniform")
-		return check_extension(ARB_uniform_buffer_object);
+		return check_extension(&Features::arb_uniform_buffer_object);
 	else
 		return false;
 }