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

media/ogles2.frag

@@ -0,0 +1,13 @@
+precision mediump float;
+
+varying vec2 v_texCoord;
+varying vec4 v_color;
+
+uniform sampler2D myTexture;
+
+void main (void)
+{
+    vec4 col = texture2D(myTexture, v_texCoord);
+    col *= v_color;
+    gl_FragColor = col * 4.0;
+}