Mostly cosmetic tweaks

diff --git a/source/glsl/compiler.h b/source/glsl/compiler.h
index dde50841819731f8cca7241a1b34b73de62032da..223c6e1e0858b594a4179dc5a59698b945eaa4e3 100644 (file)
--- a/source/glsl/compiler.h
+++ b/source/glsl/compiler.h
@@ -131,7 +131,7 @@ private:
        /** Appends a single stage to the matching stage of the target. */
        void append_stage(const Stage &);
 
-       /// Imports a module by name and appends it to the target. */
+       /** Imports a module by name and appends it to the target. */
        void import(ModuleCache &, const std::string &);
 
        /** Generates any implicitly defines syntactic structures and resolves

diff --git a/source/glsl/generate.h b/source/glsl/generate.h
index bc25a7129778a7be684e689d72c28b194d1a3c39..190d3ecfe13c826f28fdfb64df5db1a73bbe10dd 100644 (file)
--- a/source/glsl/generate.h
+++ b/source/glsl/generate.h
@@ -63,6 +63,10 @@ private:
        void visit(Passthrough &) override;
 };
 
+/**
+Adds default global input and output layout qualifiers for stages which need
+them (currently tessellation evaluation).
+*/
 class LayoutDefaulter: private TraversingVisitor
 {
 private:

diff --git a/source/glsl/optimize.cpp b/source/glsl/optimize.cpp
index a3eb20f2855ffda73820ddc4f9abbd38ec008748..0086a072d8955483ad14f2248d68018f2ae5d226 100644 (file)
--- a/source/glsl/optimize.cpp
+++ b/source/glsl/optimize.cpp
@@ -694,7 +694,6 @@ void AggregateDismantler::visit(VariableDeclaration &var)
                        const FunctionCall *init_call = var.init_expression.get_as<const FunctionCall>();
                        if((init_call && init_call->constructor) || !var.init_expression)
                        {
-
                                Aggregate &aggre = aggregates[&var];
                                aggre.declaration = &var;
                                aggre.decl_scope = current_block;

diff --git a/source/glsl/resolve.cpp b/source/glsl/resolve.cpp
index bd8358803741e7ffe479edad7babb949d3a8e349..77989f30c1b54bb4697d42749c4d1759ca70f424 100644 (file)
--- a/source/glsl/resolve.cpp
+++ b/source/glsl/resolve.cpp
@@ -1076,7 +1076,7 @@ void ExpressionResolver::visit_constructor(FunctionCall &call)
                                                if(column_component_count==row_count)
                                                {
                                                        /* The column has filled up.  Create a vector constructor
-                                                       for it.*/
+                                                       for it. */
                                                        unique_ptr<FunctionCall> column_call = make_unique<FunctionCall>();
                                                        column_call->name = basic->base_type->name;
                                                        column_call->constructor = true;

diff --git a/source/glsl/syntax.h b/source/glsl/syntax.h
index 61083dee02a0c941c07786ae5bd7706e7cd1c33c..bc5982045f91ee28309f598ebdf7592bd16087d4 100644 (file)
--- a/source/glsl/syntax.h
+++ b/source/glsl/syntax.h
@@ -66,9 +66,7 @@ struct Node
 
        Node() = default;
        Node(const Node &) = default;
-private:
-       Node &operator=(const Node &);
-public:
+       Node &operator=(const Node &) = delete;
        virtual ~Node() = default;
 
        virtual Node *clone() const = 0;