From b83a364b0ebae0cd47dd721d39e3e6b01ce188a7 Mon Sep 17 00:00:00 2001 From: "Max K." Date: Mon, 23 Jun 2014 15:46:28 -0500 Subject: [PATCH 1/2] Added 3 character glsl extensions. --- lib/linguist/languages.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml index 4871c0f4..47a04fef 100644 --- a/lib/linguist/languages.yml +++ b/lib/linguist/languages.yml @@ -735,12 +735,14 @@ GLSL: - .glsl - .fp - .frag + - .frg - .fshader - .geom - .glslv - .gshader - .shader - .vert + - .vrx - .vshader Genshi: From 898f1e215ed03ff0de927b77aa8eebc9fce7f0e5 Mon Sep 17 00:00:00 2001 From: "Max K." Date: Thu, 26 Jun 2014 09:25:40 -0500 Subject: [PATCH 2/2] Added sample files for glsl. --- samples/GLSL/myfragment.frg | 6 ++++++ samples/GLSL/myvertex.vrx | 12 ++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 samples/GLSL/myfragment.frg create mode 100644 samples/GLSL/myvertex.vrx diff --git a/samples/GLSL/myfragment.frg b/samples/GLSL/myfragment.frg new file mode 100644 index 00000000..a4e84395 --- /dev/null +++ b/samples/GLSL/myfragment.frg @@ -0,0 +1,6 @@ +varying vec4 v_color; + +void main() +{ + gl_FragColor = v_color; +} \ No newline at end of file diff --git a/samples/GLSL/myvertex.vrx b/samples/GLSL/myvertex.vrx new file mode 100644 index 00000000..5371affa --- /dev/null +++ b/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; +} \ No newline at end of file