Check for existence of required version in Formatter

[libs/gl.git] / source / glsl / output.cpp

diff --git a/source/glsl/output.cpp b/source/glsl/output.cpp
index b277ba8ee09fef2b2c38c4152dc136982c16d68f..43f337cabc3e6296e9afdc1f91130e3d8bd7b56f 100644 (file)
--- a/source/glsl/output.cpp
+++ b/source/glsl/output.cpp
@@ -10,16 +10,14 @@ namespace SL {
 
 Formatter::Formatter():
        stage(0),
-       mode(Compiler::PROGRAM),
        source_index(0),
        source_line(1),
        indent(0),
        parameter_list(false)
 { }
 
-const string &Formatter::apply(Stage &s, Compiler::Mode m)
+const string &Formatter::apply(Stage &s)
 {
-       mode = m;
        stage = &s;
 
        const Version &ver = s.required_features.glsl_version;
@@ -73,7 +71,7 @@ void Formatter::set_source(unsigned index, unsigned line)
                else
                {
                        unsigned l = line;
-                       if(mode==Compiler::PROGRAM && stage && stage->required_features.glsl_version<Version(3, 30))
+                       if(stage && stage->required_features.glsl_version && stage->required_features.glsl_version<Version(3, 30))
                                --l;
                        formatted += format("#line %d %d\n", l, index);
                }
@@ -238,7 +236,7 @@ void Formatter::visit(VariableDeclaration &var)
        if(!var.interface.empty())
        {
                string interface = var.interface;
-               if(mode==Compiler::PROGRAM && stage && stage->required_features.glsl_version<Version(1, 30))
+               if(stage && stage->required_features.glsl_version && stage->required_features.glsl_version<Version(1, 30))
                {
                        if(stage->type==Stage::VERTEX && var.interface=="in")
                                interface = "attribute";