Merge remote-tracking branch 'origin/master'

1 files changed, 15 insertions, 0 deletions

diff --git a/src/demos/instancedRendering/shader/triangles.fp b/src/demos/instancedRendering/shader/triangles.fp
new file mode 100644
index 0000000..005884a
--- /dev/null
+++ b/src/demos/instancedRendering/shader/triangles.fp
@@ -0,0 +1,15 @@
+// Copyright 2014 JogAmp Community. All rights reserved.
+
+#if __VERSION__ >= 130
+  #define varying in
+  out vec4 mgl_FragColor;
+  #define texture2D texture
+#else
+  #define mgl_FragColor gl_FragColor   
+#endif
+
+varying vec4    frontColor;
+
+void main (void) {
+	mgl_FragColor = frontColor; 
+}