X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fprogramcompiler.cpp;h=f30ccfa6233ad6b6dc8115488210c7f1dbd4c7a5;hb=c6604d0ee313f60b42b3a205c40ba7e1abbc3cb8;hp=00d217a06aebb4dcb83b731427e466a584fffe6b;hpb=ae1fe9121b341c7852e54aa586f23edaf21b664c;p=libs%2Fgl.git

diff --git a/source/programcompiler.cpp b/source/programcompiler.cpp
index 00d217a0..f30ccfa6 100644
--- a/source/programcompiler.cpp
+++ b/source/programcompiler.cpp
@@ -4,6 +4,7 @@
 #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/format.h>
 #include <msp/strings/regex.h>
 #include <msp/strings/utils.h>
@@ -208,6 +209,8 @@ void ProgramCompiler::append_stage(Stage &stage)
 		target = &*i;
 	}
 
+	if(stage.required_version>target->required_version)
+		target->required_version = stage.required_version;
 	for(NodeList<Statement>::iterator i=stage.content.body.begin(); i!=stage.content.body.end(); ++i)
 		target->content.body.push_back(*i);
 	apply<DeclarationCombiner>(*target);
@@ -244,6 +247,8 @@ void ProgramCompiler::import(const string &name)
 
 void ProgramCompiler::generate(Stage &stage)
 {
+	if(module->shared.required_version>stage.required_version)
+		stage.required_version = module->shared.required_version;
 	inject_block(stage.content, module->shared.content);
 
 	apply<DeclarationReorderer>(stage);
@@ -1954,6 +1959,26 @@ void ProgramCompiler::LegacyConverter::visit(FunctionCall &call)
 				call.name = "shadow1D";
 			else if(type=="sampler2DShadow")
 				call.name = "shadow2D";
+			else if(type=="sampler1DArray")
+			{
+				check_extension(EXT_texture_array);
+				call.name = "texture1DArray";
+			}
+			else if(type=="sampler2DArray")
+			{
+				check_extension(EXT_texture_array);
+				call.name = "texture2DArray";
+			}
+			else if(type=="sampler1DArrayShadow")
+			{
+				check_extension(EXT_texture_array);
+				call.name = "shadow1DArray";
+			}
+			else if(type=="sampler2DArrayShadow")
+			{
+				check_extension(EXT_texture_array);
+				call.name = "shadow2DArray";
+			}
 
 			for(; i!=call.arguments.end(); ++i)
 				(*i)->visit(*this);