Process loop initialization outside the body in UnusedVariableRemover

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

diff --git a/source/glsl/validate.cpp b/source/glsl/validate.cpp
index ec322f4207751af90482893dc21dc4f4dce39e0a..f12177db4a4236109f4060ffc72c13098f66093f 100644 (file)
--- a/source/glsl/validate.cpp
+++ b/source/glsl/validate.cpp
@@ -1,5 +1,5 @@
-#include <algorithm>
 #include <cstring>
+#include <msp/core/algorithm.h>
 #include <msp/core/raii.h>
 #include <msp/strings/format.h>
 #include <msp/strings/utils.h>
@@ -497,8 +497,17 @@ void ReferenceValidator::visit(FunctionDeclaration &func)
 
 void ExpressionValidator::visit(VariableReference &var)
 {
-       if(var.declaration && constant_expression && !var.declaration->constant)
-               error(var, format("Reference to non-constant variable '%s' in a constant expression", var.name));
+       if(var.declaration && constant_expression)
+       {
+               if(!var.declaration->constant)
+                       error(var, format("Reference to non-constant variable '%s' in a constant expression", var.name));
+               else if(var.declaration->layout && constant_expression==FIXED_CONSTANT)
+               {
+                       auto i = find_member(var.declaration->layout->qualifiers, string("constant_id"), &Layout::Qualifier::name);
+                       if(i!=var.declaration->layout->qualifiers.end())
+                               error(var, format("Reference to specialization constant '%s' in a fixed constant expression", var.name));
+               }
+       }
 }
 
 void ExpressionValidator::visit(InterfaceBlockReference &iface)
@@ -524,7 +533,7 @@ void ExpressionValidator::visit(Swizzle &swizzle)
                int flavour = -1;
                for(unsigned i=0; i<swizzle.count; ++i)
                {
-                       unsigned component_flavour = (find(component_names, component_names+12, swizzle.component_group[i])-component_names)/4;
+                       unsigned component_flavour = (std::find(component_names, component_names+12, swizzle.component_group[i])-component_names)/4;
                        if(flavour==-1)
                                flavour = component_flavour;
                        else if(flavour>=0 && component_flavour!=static_cast<unsigned>(flavour))
@@ -614,6 +623,12 @@ void ExpressionValidator::visit(TernaryExpression &ternary)
        TraversingVisitor::visit(ternary);
 }
 
+void ExpressionValidator::visit(StructDeclaration &strct)
+{
+       SetFlag set_struct(in_struct);
+       TraversingVisitor::visit(strct);
+}
+
 void ExpressionValidator::visit(VariableDeclaration &var)
 {
        if(var.init_expression && var.init_expression->type && var.type_declaration && var.init_expression->type!=var.type_declaration)
@@ -624,12 +639,20 @@ void ExpressionValidator::visit(VariableDeclaration &var)
                var.layout->visit(*this);
        if(var.init_expression)
        {
-               SetFlag set_const(constant_expression, var.constant);
+               ConstantKind const_kind = (var.constant ? SPEC_CONSTANT : NOT_CONSTANT);
+               if(var.layout)
+               {
+                       auto i = find_member(var.layout->qualifiers, string("constant_id"), &Layout::Qualifier::name);
+                       if(i!=var.layout->qualifiers.end())
+                               const_kind = FIXED_CONSTANT;
+               }
+
+               SetForScope<ConstantKind> set_const(constant_expression, const_kind);
                TraversingVisitor::visit(var.init_expression);
        }
        if(var.array_size)
        {
-               SetFlag set_const(constant_expression);
+               SetForScope<ConstantKind> set_const(constant_expression, (in_struct || !var.interface.empty() ? FIXED_CONSTANT : SPEC_CONSTANT));
                TraversingVisitor::visit(var.array_size);
        }
 }