Merge pull request #1311 from maximusvladimir/master

Added 3 character glsl extensions.

lib/linguist/languages.yml

@@ -735,12 +735,14 @@ GLSL:
   - .glsl
   - .fp
   - .frag
+  - .frg
   - .fshader
   - .geom
   - .glslv
   - .gshader
   - .shader
   - .vert
+  - .vrx
   - .vshader
 
 Genshi:

samples/GLSL/myfragment.frg

@@ -0,0 +1,6 @@
+varying vec4 v_color;
+
+void main()
+{
+	gl_FragColor = v_color;
+}

samples/GLSL/myvertex.vrx

@@ -0,0 +1,12 @@
+uniform mat4 u_MVPMatrix;
+
+attribute vec4 a_position;
+attribute vec4 a_color;
+
+varying vec4 v_color;
+
+void main()
+{
+	v_color = a_color;
+	gl_Position =  u_MVPMatrix * pos;
+}