KevinMidboe/linguist
1
0
Fork 0
mirror of https://github.com/KevinMidboe/linguist.git synced 2025-10-29 17:50:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1311 from maximusvladimir/master

Browse Source 
Added 3 character glsl extensions.
This commit is contained in:
Arfon Smith
2014-06-26 17:37:42 +01:00
parent d40b4a33de 898f1e215e
commit bc53d0b55e
3 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/linguist/languages.yml
View File

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

6
samples/GLSL/myfragment.frg Normal file
View File

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

12
samples/GLSL/myvertex.vrx Normal file
View File

@@ -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;
}