Nothing important

include/anki/gl/ShaderProgram.h

@@ -3,7 +3,6 @@
 
 #include "anki/util/ConstCharPtrHashMap.h"
 #include "anki/util/Assert.h"
-#include "anki/util/Flags.h"
 #include "anki/math/Forward.h"
 #include "anki/gl/Ogl.h"
 #include "anki/util/Vector.h"
@@ -40,6 +39,8 @@ public:
 	virtual ~ShaderProgramVariable()
 	{}
 
+	ShaderProgramVariable& operator=(const ShaderProgramVariable& b);
+
 	/// @name Accessors
 	/// @{
 	const ShaderProgram& getFatherShaderProgram() const
@@ -73,17 +74,6 @@ public:
 	}
 	/// @}
 
-	ShaderProgramVariable& operator=(const ShaderProgramVariable& b)
-	{
-		ANKI_ASSERT(type == b.type);
-		loc = b.loc;
-		name = b.name;
-		glDataType = b.glDataType;
-		size = b.size;
-		fatherSProg = b.fatherSProg;
-		return *this;
-	}
-
 private:
 	GLint loc; ///< GL location
 	std::string name; ///< The name inside the shader program
@@ -108,14 +98,7 @@ public:
 	{}
 
 	ShaderProgramUniformVariable& operator=(
-		const ShaderProgramUniformVariable& b)
-	{
-		ShaderProgramVariable::operator=(b);
-		index = b.index;
-		offset = b.offset;
-		arrayStride = b.arrayStride;
-		return *this;
-	}
+		const ShaderProgramUniformVariable& b);
 
 	const ShaderProgramUniformBlock* getUniformBlock() const
 	{
@@ -162,6 +145,9 @@ public:
 	}
 	/// @}
 
+	/// @name Uniform block setters
+	/// Write a client memory that represents the uniform block
+	/// @{
 	void setClientMemory(void* buff, U32 buffSize,
 		const F32 arr[], U32 size) const;
 
@@ -179,6 +165,7 @@ public:
 
 	void setClientMemory(void* buff, U32 buffSize,
 		const Mat4 arr[], U32 size) const;
+	/// @}
 
 private:
 	GLuint index;
@@ -402,7 +389,7 @@ public:
 
 	static GLuint getCurrentProgramGlId()
 	{
-		int i;
+		GLint i;
 		glGetIntegerv(GL_CURRENT_PROGRAM, &i);
 		return i;
 	}

include/anki/resource/MeshLoader.h

@@ -123,7 +123,7 @@ private:
 	Vector<VertexWeight> vertWeights; ///< Optional
 	Vector<Triangle> tris; ///< Required
 	/// Generated. Used for vertex arrays & VBOs
-	Vector<ushort> vertIndeces;
+	Vector<U16> vertIndeces;
 	/// @}
 
 	/// Load the mesh data from a binary file

src/gl/ShaderProgram.cpp

@@ -17,10 +17,40 @@ namespace anki {
 static const char* padding = "======================================="
                              "=======================================";
 
+//==============================================================================
+// ShaderProgramVariable                                                       =
+//==============================================================================
+
+//==============================================================================
+ShaderProgramVariable& ShaderProgramVariable::operator=(
+	const ShaderProgramVariable& b)
+{
+	ANKI_ASSERT(type == b.type);
+	loc = b.loc;
+	name = b.name;
+	glDataType = b.glDataType;
+	size = b.size;
+	fatherSProg = b.fatherSProg;
+	return *this;
+}
+
 //==============================================================================
 // ShaderProgramUniformVariable                                                =
 //==============================================================================
 
+//==============================================================================
+ShaderProgramUniformVariable& ShaderProgramUniformVariable::operator=(
+	const ShaderProgramUniformVariable& b)
+{
+	ShaderProgramVariable::operator=(b);
+	index = b.index;
+	block = b.block;
+	offset = b.offset;
+	arrayStride = b.arrayStride;
+	matrixStride = b.matrixStride;
+	return *this;
+}
+
 //==============================================================================
 void ShaderProgramUniformVariable::doCommonSetCode() const
 {
@@ -28,8 +58,6 @@ void ShaderProgramUniformVariable::doCommonSetCode() const
 		&& "You cannot set variable in uniform block");
 	ANKI_ASSERT(ShaderProgram::getCurrentProgramGlId() == 
 		getFatherShaderProgram().getGlId());
-
-	/*enableFlag(SPUVF_DIRTY);*/
 }
 
 //==============================================================================
@@ -143,7 +171,7 @@ void ShaderProgramUniformVariable::set(const Texture* const texes[],
 }
 
 //==============================================================================
-/// XXX
+// Template functions that return the GL type using an AnKi type
 template<typename T>
 static Bool checkType(GLenum glDataType);
 
@@ -582,7 +610,7 @@ void ShaderProgram::initUniAndAttribVars()
 	attribs.resize(attribsCount);
 	attribs.shrink_to_fit();
 	attribsCount = 0;
-	for(int i = 0; i < num; i++) // loop all attributes
+	for(GLint i = 0; i < num; i++) // loop all attributes
 	{
 		// Name
 		glGetActiveAttrib(glId, i, sizeof(name_), &length,
@@ -602,6 +630,7 @@ void ShaderProgram::initUniAndAttribVars()
 
 		var.loc = loc;
 		var.name = &name_[0];
+		var.name.shrink_to_fit();
 		var.glDataType = type;
 		var.size = size;
 		var.fatherSProg = this;
@@ -670,6 +699,7 @@ void ShaderProgram::initUniAndAttribVars()
 
 		var.loc = loc;
 		var.name = &name_[0];
+		var.name.shrink_to_fit();
 		var.glDataType = type;
 		var.size = size;
 		var.fatherSProg = this;
@@ -683,23 +713,30 @@ void ShaderProgram::initUniAndAttribVars()
 //==============================================================================
 void ShaderProgram::initUniformBlocks()
 {
+	// Get blocks count and create the vector
 	GLint blocksCount;
 	glGetProgramiv(glId, GL_ACTIVE_UNIFORM_BLOCKS, &blocksCount);
-
+	if(blocksCount < 1)
+	{
+		// Early exit
+		return;
+	}
 	blocks.resize(blocksCount);
 	blocks.shrink_to_fit();
 
+	// Init all blocks
 	GLuint i = 0;
 	for(ShaderProgramUniformBlock& block : blocks)
 	{
 		GLint gli; // General purpose int
 
 		// Name
-		char name[256];
+		Array<char, 256> name;
 		GLsizei len;
-		glGetActiveUniformBlockName(glId, i, sizeof(name), &len, name);
+		glGetActiveUniformBlockName(glId, i, sizeof(name), &len, &name[0]);
+		// The name is null terminated
 
-		block.name = name;
+		block.name = &name[0];
 		block.name.shrink_to_fit();
 
 		// Index

src/resource/Mesh.cpp

@@ -3,7 +3,6 @@
 #include "anki/resource/MeshLoader.h"
 #include "anki/gl/Vbo.h"
 #include "anki/util/Functions.h"
-#include <fstream>
 
 namespace anki {