diff options
Diffstat (limited to 'src/test/com/jogamp/opengl')
-rw-r--r-- | src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/shader/texsequence_xxx.fp (renamed from src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/shader/texsimple_xxx.fp) | 8 | ||||
-rw-r--r-- | src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/shader/texsequence_xxx.vp (renamed from src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/shader/texsimple_xxx.vp) | 2 | ||||
-rw-r--r-- | src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/shader/texsimple_es2.fp | 9 | ||||
-rw-r--r-- | src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/shader/texsimple_es2.vp | 7 | ||||
-rw-r--r-- | src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/shader/texsimple_es2_exttex.fp | 11 | ||||
-rw-r--r-- | src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/shader/texsimple_gl2.fp | 7 | ||||
-rw-r--r-- | src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/shader/texsimple_gl2.vp | 5 |
7 files changed, 7 insertions, 42 deletions
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/shader/texsimple_xxx.fp b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/shader/texsequence_xxx.fp index 1465b28ed..adde23d0a 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/shader/texsimple_xxx.fp +++ b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/shader/texsequence_xxx.fp @@ -1,13 +1,17 @@ -//Copyright 2010 JogAmp Community. All rights reserved. +// Copyright 2012 JogAmp Community. All rights reserved. varying vec2 mgl_texCoord; varying vec4 frontColor; +// Insert dynamic code after the following tag: +// TEXTURE-SEQUENCE-CODE-BEGIN +// TEXTURE-SEQUENCE-CODE-END + void main (void) { vec4 texColor; if(0.0 <= mgl_texCoord.t && mgl_texCoord.t<=1.0) { - texColor = texture2D(mgl_ActiveTexture, mgl_texCoord); + texColor = myTexture2D(mgl_ActiveTexture, mgl_texCoord); } else { texColor = vec4(1, 1, 1, 1); } diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/shader/texsimple_xxx.vp b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/shader/texsequence_xxx.vp index dea57ca9e..c521e3757 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/shader/texsimple_xxx.vp +++ b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/shader/texsequence_xxx.vp @@ -1,4 +1,4 @@ -//Copyright 2010 JogAmp Community. All rights reserved. +// Copyright 2012 JogAmp Community. All rights reserved. uniform mat4 mgl_PMVMatrix[2]; // uniform mat4 mgl_STMatrix; diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/shader/texsimple_es2.fp b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/shader/texsimple_es2.fp deleted file mode 100644 index 3a7dcf7a2..000000000 --- a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/shader/texsimple_es2.fp +++ /dev/null @@ -1,9 +0,0 @@ -//Copyright 2010 JogAmp Community. All rights reserved. - -#version 100 - -precision mediump float; - -uniform sampler2D mgl_ActiveTexture; - -#include texsimple_xxx.fp diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/shader/texsimple_es2.vp b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/shader/texsimple_es2.vp deleted file mode 100644 index 16c070a31..000000000 --- a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/shader/texsimple_es2.vp +++ /dev/null @@ -1,7 +0,0 @@ -//Copyright 2010 JogAmp Community. All rights reserved. - -#version 100 - -precision mediump float; - -#include texsimple_xxx.vp diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/shader/texsimple_es2_exttex.fp b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/shader/texsimple_es2_exttex.fp deleted file mode 100644 index c45cebaf3..000000000 --- a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/shader/texsimple_es2_exttex.fp +++ /dev/null @@ -1,11 +0,0 @@ -//Copyright 2010 JogAmp Community. All rights reserved. - -#version 100 - -#extension GL_OES_EGL_image_external : require - -precision mediump float; - -uniform samplerExternalOES mgl_ActiveTexture; - -#include texsimple_xxx.fp diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/shader/texsimple_gl2.fp b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/shader/texsimple_gl2.fp deleted file mode 100644 index 31a63e6a4..000000000 --- a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/shader/texsimple_gl2.fp +++ /dev/null @@ -1,7 +0,0 @@ -//Copyright 2010 JogAmp Community. All rights reserved. - -#version 110 - -uniform sampler2D mgl_ActiveTexture; - -#include texsimple_xxx.fp diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/shader/texsimple_gl2.vp b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/shader/texsimple_gl2.vp deleted file mode 100644 index 8fcdc0ac9..000000000 --- a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/shader/texsimple_gl2.vp +++ /dev/null @@ -1,5 +0,0 @@ -//Copyright 2010 JogAmp Community. All rights reserved. - -#version 110 - -#include texsimple_xxx.vp |