summaryrefslogtreecommitdiffstats
path: root/src/demos/instancedRendering/shader
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2015-02-03 01:31:23 +0100
committerSven Gothel <[email protected]>2015-02-03 01:31:23 +0100
commitc9dcb92e7977d51473653f318f060665071cd4b6 (patch)
treeee329a63ffeda586a32d22aa533e692dfae9af4a /src/demos/instancedRendering/shader
parentbb384d07649c01f5cac29fffadf88684220ab693 (diff)
Revert "Added."
This reverts commit 5a37c7f33e5b3584a3561f240392814940a69956.
Diffstat (limited to 'src/demos/instancedRendering/shader')
-rw-r--r--src/demos/instancedRendering/shader/triangles.fp15
-rw-r--r--src/demos/instancedRendering/shader/triangles.vp17
2 files changed, 0 insertions, 32 deletions
diff --git a/src/demos/instancedRendering/shader/triangles.fp b/src/demos/instancedRendering/shader/triangles.fp
deleted file mode 100644
index 005884a..0000000
--- a/src/demos/instancedRendering/shader/triangles.fp
+++ /dev/null
@@ -1,15 +0,0 @@
-// 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
deleted file mode 100644
index 91cc6ef..0000000
--- a/src/demos/instancedRendering/shader/triangles.vp
+++ /dev/null
@@ -1,17 +0,0 @@
-// 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);
-}