From 96ae8202621dfa1f7ae4995e7749d1b0d9918b54 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Sat, 7 Apr 2012 16:02:17 +0200 Subject: GLMediaPlayer: Fix destruction (NPE) / Fix MovieSimple shader, no GL_OES_EGL_image_external for plain ES2. --- .../jogamp/opengl/test/junit/jogl/demos/es2/shader/moviesimple_es2.fp | 3 --- .../jogamp/opengl/test/junit/jogl/demos/es2/shader/moviesimple_es2.vp | 1 - .../opengl/test/junit/jogl/demos/es2/shader/moviesimple_es2_exttex.fp | 1 - 3 files changed, 5 deletions(-) (limited to 'src/test') diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/shader/moviesimple_es2.fp b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/shader/moviesimple_es2.fp index 466d9ecd7..e3b9eea04 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/shader/moviesimple_es2.fp +++ b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/shader/moviesimple_es2.fp @@ -2,10 +2,7 @@ #version 100 -#extension GL_OES_EGL_image_external : enable - precision mediump float; -precision mediump int; uniform sampler2D mgl_ActiveTexture; diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/shader/moviesimple_es2.vp b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/shader/moviesimple_es2.vp index ca5d69ebb..6708d546e 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/shader/moviesimple_es2.vp +++ b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/shader/moviesimple_es2.vp @@ -3,6 +3,5 @@ #version 100 precision mediump float; -precision mediump int; #include moviesimple_xxx.vp \ No newline at end of file diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/shader/moviesimple_es2_exttex.fp b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/shader/moviesimple_es2_exttex.fp index 96efaf357..39b0fe8d0 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/shader/moviesimple_es2_exttex.fp +++ b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/shader/moviesimple_es2_exttex.fp @@ -5,7 +5,6 @@ #extension GL_OES_EGL_image_external : require precision mediump float; -precision mediump int; uniform samplerExternalOES mgl_ActiveTexture; -- cgit v1.2.3