Merging r5975 through r6036 from trunk to ogl-es branch.

GLES drivers adapted, but only did make compile-tests.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6038 dfc29bdd-3216-0410-991c-e03cc46cb475

source/Irrlicht/S2DVertex.h

@@ -0,0 +1,30 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#ifndef __S_K_2D_VERTEX_H_INCLUDED__
+#define __S_K_2D_VERTEX_H_INCLUDED__
+
+#include "vector2d.h"
+
+typedef signed short TZBufferType;
+
+namespace irr
+{
+namespace video
+{
+
+	struct S2DVertex
+	{
+		core::vector2d<s32> Pos;	// position
+		core::vector2d<s32> TCoords;	// texture coordinates
+		TZBufferType ZValue;		// zvalue
+		u16 Color;
+	};
+
+
+} // end namespace video
+} // end namespace irr
+
+#endif
+