Don't try to access a nonexistent return expression

[libs/gl.git] / source / programcompiler.cpp

diff --git a/source/programcompiler.cpp b/source/programcompiler.cpp
index 5bb84269f30abe4fcd38198cef0b6a2ae416b2f8..c2ebb4b96ad3e474b2f636578e404601282b82ad 100644 (file)
--- a/source/programcompiler.cpp
+++ b/source/programcompiler.cpp
@@ -460,6 +460,8 @@ void ProgramCompiler::Formatter::visit(VariableDeclaration &var)
        }
        if(var.constant)
                formatted += "const ";
+       if(!var.interpolation.empty())
+               formatted += format("%s ", var.interpolation);
        if(!var.sampling.empty())
                formatted += format("%s ", var.sampling);
        if(!var.interface.empty() && var.interface!=block_interface)
@@ -555,8 +557,12 @@ void ProgramCompiler::Formatter::visit(Iteration &iter)
 
 void ProgramCompiler::Formatter::visit(Return &ret)
 {
-       formatted += "return ";
-       ret.expression->visit(*this);
+       formatted += "return";
+       if(ret.expression)
+       {
+               formatted += ' ';
+               ret.expression->visit(*this);
+       }
        formatted += ';';
 }
 
@@ -1198,12 +1204,14 @@ void ProgramCompiler::FunctionInliner::visit(Return &ret)
 
 ProgramCompiler::ExpressionEvaluator::ExpressionEvaluator():
        variable_values(0),
+       const_only(false),
        result(0.0f),
        result_valid(false)
 { }
 
-ProgramCompiler::ExpressionEvaluator::ExpressionEvaluator(const ValueMap &v):
-       variable_values(&v),
+ProgramCompiler::ExpressionEvaluator::ExpressionEvaluator(const ValueMap *v, bool c):
+       variable_values(v),
+       const_only(c),
        result(0.0f),
        result_valid(false)
 { }
@@ -1228,6 +1236,8 @@ void ProgramCompiler::ExpressionEvaluator::visit(VariableReference &var)
 {
        if(!var.declaration)
                return;
+       if(const_only && !var.declaration->constant)
+               return;
 
        if(variable_values)
        {
@@ -1287,7 +1297,8 @@ void ProgramCompiler::ExpressionEvaluator::visit(BinaryExpression &binary)
 
 
 ProgramCompiler::ConstantConditionEliminator::ConstantConditionEliminator():
-       scope_level(0)
+       scope_level(0),
+       in_loop(false)
 { }
 
 void ProgramCompiler::ConstantConditionEliminator::visit(Block &block)
@@ -1312,7 +1323,7 @@ void ProgramCompiler::ConstantConditionEliminator::visit(VariableDeclaration &va
 
 void ProgramCompiler::ConstantConditionEliminator::visit(Conditional &cond)
 {
-       ExpressionEvaluator eval(variable_values);
+       ExpressionEvaluator eval(&variable_values, in_loop);
        cond.condition->visit(eval);
        if(eval.result_valid)
                flatten_block(eval.result ? cond.body : cond.else_body);
@@ -1322,9 +1333,10 @@ void ProgramCompiler::ConstantConditionEliminator::visit(Conditional &cond)
 
 void ProgramCompiler::ConstantConditionEliminator::visit(Iteration &iter)
 {
+       // XXX Should this not visit init_statement first?
        if(iter.condition)
        {
-               ExpressionEvaluator eval;
+               ExpressionEvaluator eval(0, in_loop);
                iter.condition->visit(eval);
                if(eval.result_valid && !eval.result)
                {
@@ -1333,6 +1345,7 @@ void ProgramCompiler::ConstantConditionEliminator::visit(Iteration &iter)
                }
        }
 
+       SetFlag set_loop(in_loop);
        TraversingVisitor::visit(iter);
 }
 
@@ -1763,6 +1776,22 @@ bool ProgramCompiler::LegacyConverter::supports_interface_layouts() const
                return check_version(Version(3, 30));
 }
 
+bool ProgramCompiler::LegacyConverter::supports_centroid_sampling() const
+{
+       if(target_api==OPENGL_ES2)
+               return check_version(Version(3, 0));
+       else
+               return check_version(Version(1, 20));
+}
+
+bool ProgramCompiler::LegacyConverter::supports_sample_sampling() const
+{
+       if(target_api==OPENGL_ES2)
+               return check_version(Version(3, 20));
+       else
+               return check_version(Version(4, 0));
+}
+
 void ProgramCompiler::LegacyConverter::visit(VariableDeclaration &var)
 {
        if(var.layout && !supports_interface_layouts())
@@ -1790,6 +1819,17 @@ void ProgramCompiler::LegacyConverter::visit(VariableDeclaration &var)
                }
        }
 
+       if(var.sampling=="centroid")
+       {
+               if(!supports_centroid_sampling())
+                       var.sampling = string();
+       }
+       else if(var.sampling=="sample")
+       {
+               if(!supports_sample_sampling())
+                       var.sampling = string();
+       }
+
        if((var.interface=="in" || var.interface=="out") && !supports_unified_interface_syntax())
        {
                if(stage->type==FRAGMENT && var.interface=="out")