Minor stuff

include/anki/gl/ShaderProgram.h

@@ -5,7 +5,6 @@
 #include "anki/util/Assert.h"
 #include "anki/util/Flags.h"
 #include "anki/math/Forward.h"
-#include "anki/util/NonCopyable.h"
 #include "anki/gl/Ogl.h"
 #include "anki/util/Vector.h"
 #include "anki/util/StdTypes.h"
@@ -34,7 +33,8 @@ public:
 		SPVT_UNIFORM
 	};
 
-	ShaderProgramVariable()
+	ShaderProgramVariable(ShaderProgramVariableType type_)
+		: type(type_)
 	{}
 	virtual ~ShaderProgramVariable()
 	{}
@@ -66,7 +66,7 @@ public:
 		return type;
 	}
 
-	size_t getSize() const
+	PtrSize getSize() const
 	{
 		return size;
 	}
@@ -74,11 +74,11 @@ public:
 
 	ShaderProgramVariable& operator=(const ShaderProgramVariable& b)
 	{
+		ANKI_ASSERT(type == b.type)
 		loc = b.loc;
 		name = b.name;
 		glDataType = b.glDataType;
 		size = b.size;
-		type = b.type;
 		fatherSProg = b.fatherSProg;
 		return *this;
 	}
@@ -89,7 +89,7 @@ private:
 	/// GL_FLOAT, GL_FLOAT_VEC2 etc. See
 	/// http://www.opengl.org/sdk/docs/man/xhtml/glGetActiveUniform.xml
 	GLenum glDataType;
-	size_t size; ///< Its 1 if it is a single or >1 if it is an array
+	PtrSize size; ///< Its 1 if it is a single or >1 if it is an array
 	ShaderProgramVariableType type;
 	/// We need the ShaderProg of this variable mainly for sanity checks
 	const ShaderProgram* fatherSProg;
@@ -103,6 +103,7 @@ class ShaderProgramUniformVariable: public ShaderProgramVariable
 
 public:
 	ShaderProgramUniformVariable()
+		: ShaderProgramVariable(SPVT_UNIFORM)
 	{}
 
 	/// @name Set the var
@@ -160,7 +161,7 @@ private:
 
 	/// Offset inside the uniform block. -1 if it's inside the default uniform 
 	/// block
-	GLint offset; 
+	GLint offset = -1; 
 
 	/// "An array identifying the stride between elements, in basic machine 
 	/// units, of each of the uniforms specified by the corresponding array of
@@ -182,6 +183,10 @@ private:
 class ShaderProgramAttributeVariable: public ShaderProgramVariable
 {
 	friend class ShaderProgram;
+
+	ShaderProgramAttributeVariable()
+		: ShaderProgramVariable(SPVT_ATTRIBUTE)
+	{}
 };
 
 /// Uniform shader block

src/gl/ShaderProgram.cpp

@@ -349,7 +349,7 @@ void ShaderProgram::link() const
 	glLinkProgram(glId);
 
 	// check if linked correctly
-	int success;
+	GLint success;
 	glGetProgramiv(glId, GL_LINK_STATUS, &success);
 
 	if(!success)
@@ -425,7 +425,6 @@ void ShaderProgram::initUniAndAttribVars()
 		var.name = &name_[0];
 		var.glDataType = type;
 		var.size = size;
-		var.type = ShaderProgramVariable::SPVT_ATTRIBUTE;
 		var.fatherSProg = this;
 
 		nameToAttribVar[var.name.c_str()] = &var;
@@ -452,7 +451,6 @@ void ShaderProgram::initUniAndAttribVars()
 		var.name = &name_[0];
 		var.glDataType = type;
 		var.size = size;
-		var.type = ShaderProgramVariable::SPVT_UNIFORM;
 		var.fatherSProg = this;
 
 		var.index = (GLuint)i;
@@ -506,6 +504,7 @@ void ShaderProgram::initUniformBlocks()
 	// Connect uniforms and blocks
 	for(ShaderProgramUniformVariable& uni : unis)
 	{
+		/* Block index */
 		GLint blockIndex;
 		glGetActiveUniformsiv(glId, 1, &(uni.index),  GL_UNIFORM_BLOCK_INDEX, 
 			&blockIndex);
@@ -517,6 +516,13 @@ void ShaderProgram::initUniformBlocks()
 
 		uni.block = &blocks[blockIndex];
 		blocks[blockIndex].uniforms.push_back(&uni);
+
+		/* Offset in block */
+		GLint offset;
+		glGetActiveUniformsiv(glId, 1, &(uni.index),  GL_UNIFORM_OFFSET, 
+			&blockIndex);
+		ANKI_ASSERT(offset != -1); // If -1 then it should break before
+		uni.offset = offset;
 	}
 }