X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fsyntax.h;h=7fa116b717dd388e5a2acba6001dc34c74226bab;hb=c4aeeced7b397d46772577775bd3a0d6c4706cba;hp=ac876db44e2e6b0f95c9224f5df6a74333a6ce0a;hpb=a4cd67f1c9f1f375bacacfbb421d40f78a22644b;p=libs%2Fgl.git

diff --git a/source/glsl/syntax.h b/source/glsl/syntax.h
index ac876db4..7fa116b7 100644
--- a/source/glsl/syntax.h
+++ b/source/glsl/syntax.h
@@ -6,7 +6,7 @@
 #include <set>
 #include <string>
 #include <vector>
-#include <msp/core/inttypes.h>
+#include <cstdint>
 #include <msp/core/refptr.h>
 #include <msp/core/variant.h>
 #include "features.h"
@@ -40,7 +40,7 @@ struct Operator
 
 	char token[4];
 	char token2[2];
-	UInt8 precedence;
+	std::uint8_t precedence;
 	Type type;
 	Associativity assoc;
 
@@ -96,6 +96,9 @@ class NodeContainer: public C
 public:
 	NodeContainer() { }
 	NodeContainer(const NodeContainer &);
+
+	void push_back_nocopy(const typename C::value_type &v)
+	{ C::push_back(0); C::back() = v; }
 };
 
 template<typename T>
@@ -184,6 +187,7 @@ struct MemberAccess: Expression
 	std::string member;
 
 	VariableDeclaration *declaration;
+	int index;
 
 	MemberAccess();
 	MemberAccess(const MemberAccess &);
@@ -197,7 +201,7 @@ struct Swizzle: Expression
 	NodePtr<Expression> left;
 	std::string component_group;
 	unsigned count;
-	UInt8 components[4];
+	std::uint8_t components[4];
 
 	Swizzle();
 
@@ -234,8 +238,8 @@ struct Assignment: BinaryExpression
 		};
 
 		Statement *declaration;
-		Msp::UInt8 chain_len;
-		Msp::UInt8 chain[7];
+		std::uint8_t chain_len;
+		std::uint8_t chain[7];
 
 		Target(Statement * = 0);
 
@@ -310,6 +314,9 @@ struct Layout: Node
 		std::string name;
 		bool has_value;
 		int value;
+
+		Qualifier(const std::string &n = std::string()): name(n), has_value(false), value(0) { }
+		Qualifier(const std::string &n, int v): name(n), has_value(true), value(v) { }
 	};
 
 	std::vector<Qualifier> qualifiers;
@@ -350,6 +357,7 @@ struct BasicTypeDeclaration: TypeDeclaration
 
 	Kind kind;
 	unsigned size;
+	bool sign;
 	std::string base;
 
 	TypeDeclaration *base_type;
@@ -426,8 +434,9 @@ struct VariableDeclaration: Statement
 
 struct InterfaceBlock: Statement
 {
+	NodePtr<Layout> layout;
 	std::string interface;
-	std::string name;
+	std::string block_name;
 	NodePtr<Block> members;
 	std::string instance_name;
 	bool array;
@@ -528,6 +537,8 @@ struct Stage
 	std::map<std::string, InterfaceBlock *> interface_blocks;
 	std::map<std::string, FunctionDeclaration *> functions;
 	std::map<std::string, unsigned> locations;
+	std::map<std::string, unsigned> texture_bindings;
+	std::map<std::string, unsigned> uniform_block_bindings;
 	Features required_features;
 	std::vector<Diagnostic> diagnostics;
 
@@ -545,6 +556,11 @@ struct Module
 	Module();
 };
 
+std::string get_unused_variable_name(const Block &, const std::string &);
+
+int get_layout_value(const Layout &, const std::string &, int = -1);
+void add_to_chain(Assignment::Target &, Assignment::Target::ChainType, unsigned);
+
 } // namespace SL
 } // namespace GL
 } // namespace Msp