Merge remote-tracking branch 'origin/master'

2 files changed, 32 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; 
+} 
diff --git a/src/demos/instancedRendering/shader/triangles.vp b/src/demos/instancedRendering/shader/triangles.vp
new file mode 100644
index 0000000..91cc6ef
--- /dev/null
+++ b/src/demos/instancedRendering/shader/triangles.vp
@@ -0,0 +1,17 @@
+// Copyright 2014 JogAmp Community. All rights reserved.
+
+#if __VERSION__ >= 130
+  #define attribute in
+  #define varying out
+#endif
+
+uniform mat4 mgl_PMatrix;
+uniform mat4 mgl_MVMatrix[NO_OF_INSTANCE];
+attribute vec3  mgl_Vertex; 
+attribute vec4  mgl_Color; 
+varying vec4    frontColor;
+ 
+void main(void) { 
+  frontColor = mgl_Color; 
+  gl_Position = mgl_PMatrix * mgl_MVMatrix[gl_InstanceID] * vec4(mgl_Vertex, 1); 
+}