Add support for storage images in shaders

[libs/gl.git] / source / glsl / syntax.h

diff --git a/source/glsl/syntax.h b/source/glsl/syntax.h
index 95347e1bbb5831deaf9ffceb58cc1e196df25cde..63e419212f6a68da5f37568d21681d23d8656929 100644 (file)
--- a/source/glsl/syntax.h
+++ b/source/glsl/syntax.h
@@ -219,11 +219,11 @@ struct Assignment: BinaryExpression
                        ARRAY = 0xC0
                };
 
-               Statement *declaration = 0;
+               VariableDeclaration *declaration = 0;
                std::uint8_t chain_len = 0;
                std::uint8_t chain[7] = { };
 
-               Target(Statement *d = 0): declaration(d) { }
+               Target(VariableDeclaration *d = 0): declaration(d) { }
 
                bool operator<(const Target &) const;
        };
@@ -364,11 +364,14 @@ struct ImageTypeDeclaration: TypeDeclaration
 
        Dimensions dimensions = TWO;
        bool array = false;
-       bool sampled = true;
+       bool sampled = false;
        bool shadow = false;
+       bool multisample = false;
        std::string base;
+       std::string format;
 
        TypeDeclaration *base_type = 0;
+       ImageTypeDeclaration *base_image = 0;
 
        virtual ImageTypeDeclaration *clone() const { return new ImageTypeDeclaration(*this); }
        virtual void visit(NodeVisitor &);