X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fsyntax.h;h=1f43eac303bf6db2e7e6c5f705ee77a40ee23d37;hb=abcd1fa06f9fab27c5934b4069523dd009862b18;hp=95347e1bbb5831deaf9ffceb58cc1e196df25cde;hpb=03b2ea5c9c611cfa5f02afb49ed7e05743e691b4;p=libs%2Fgl.git

diff --git a/source/glsl/syntax.h b/source/glsl/syntax.h
index 95347e1b..1f43eac3 100644
--- 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 &);
@@ -487,7 +490,8 @@ struct Stage
 		SHARED,
 		VERTEX,
 		GEOMETRY,
-		FRAGMENT
+		FRAGMENT,
+		COMPUTE
 	};
 
 	Type type;