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)
{ }
{
if(!var.declaration)
return;
+ if(const_only && !var.declaration->constant)
+ return;
if(variable_values)
{
ProgramCompiler::ConstantConditionEliminator::ConstantConditionEliminator():
- scope_level(0)
+ scope_level(0),
+ in_loop(false)
{ }
void ProgramCompiler::ConstantConditionEliminator::visit(Block &block)
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);
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)
{
}
}
+ SetFlag set_loop(in_loop);
TraversingVisitor::visit(iter);
}
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())
}
}
+ 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")