X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fprogramcompiler.cpp;h=f9a14f2f00a119ffbd7ba7604fd36a84e5a96585;hp=0d61c6853c737a75bac34212114077e1b691286c;hb=6b89fb751617dd51eddf2adcc55e9a8da66f8e84;hpb=a873639a9346082f9e71145a2b318bea32bfdeb6 diff --git a/source/programcompiler.cpp b/source/programcompiler.cpp index 0d61c685..f9a14f2f 100644 --- a/source/programcompiler.cpp +++ b/source/programcompiler.cpp @@ -368,7 +368,17 @@ void ProgramCompiler::Formatter::visit(VariableDeclaration &var) if(!var.sampling.empty()) formatted += format("%s ", var.sampling); if(!var.interface.empty() && var.interface!=block_interface) - formatted += format("%s ", var.interface); + { + string interface = var.interface; + if(stage->required_versiontype==VERTEX && var.interface=="in") + interface = "attribute"; + else if((stage->type==VERTEX && var.interface=="out") || (stage->type==FRAGMENT && var.interface=="in")) + interface = "varying"; + } + formatted += format("%s ", interface); + } formatted += format("%s %s", var.type, var.name); if(var.array) { @@ -1569,11 +1579,7 @@ void ProgramCompiler::LegacyConverter::visit(VariableDeclaration &var) if((var.interface=="in" || var.interface=="out") && !check_version(Version(1, 30))) { - if(stage->type==VERTEX && var.interface=="in") - var.interface = "attribute"; - else if((stage->type==VERTEX && var.interface=="out") || (stage->type==FRAGMENT && var.interface=="in")) - var.interface = "varying"; - else if(stage->type==FRAGMENT && var.interface=="out") + if(stage->type==FRAGMENT && var.interface=="out") { frag_out_name = var.name; remove_node = true;