From c9dcb92e7977d51473653f318f060665071cd4b6 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Tue, 3 Feb 2015 01:31:23 +0100 Subject: Revert "Added." This reverts commit 5a37c7f33e5b3584a3561f240392814940a69956. --- src/demos/instancedRendering/shader/triangles.fp | 15 --------------- src/demos/instancedRendering/shader/triangles.vp | 17 ----------------- 2 files changed, 32 deletions(-) delete mode 100644 src/demos/instancedRendering/shader/triangles.fp delete mode 100644 src/demos/instancedRendering/shader/triangles.vp (limited to 'src/demos/instancedRendering/shader') 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); -} -- cgit v1.2.3