Bug 724: Testing PNG Transparency / Fixing GLSL Shader of test case: Mix texture alpha properly (pre-multiply), due to lack of ALPHA_BLENDING.

7 files changed, 259 insertions, 14 deletions

diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/TextureDraw01ES2Listener.java b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/TextureDraw01ES2Listener.java
index f6b6d2873..55d0a4775 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/TextureDraw01ES2Listener.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/TextureDraw01ES2Listener.java
@@ -56,7 +56,7 @@ public class TextureDraw01ES2Listener implements GLEventListener, TextureDraw01A
     PMVMatrix pmvMatrix;
     GLUniformData pmvMatrixUniform;
     GLArrayDataServer interleavedVBO;
-    float[] clearColor = new float[] { 1.0f, 1.0f, 1.0f, 0.4f };
+    float[] clearColor = new float[] { 1.0f, 1.0f, 1.0f, 1.0f };
     
     public TextureDraw01ES2Listener(TextureData td) {
         this.textureData = td;
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/shader/texture01_xxx.fp b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/shader/texture01_xxx.fp
index c213f3ab4..93f252cd6 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/shader/texture01_xxx.fp
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/shader/texture01_xxx.fp
@@ -19,10 +19,10 @@ void main (void)
   if(0.0 <= mgl_texCoord.t && mgl_texCoord.t<=1.0) {
     texColor = texture2D(mgl_ActiveTexture, mgl_texCoord);
   } else {
-    texColor = vec4(1, 1, 1, 1);
+    discard;
   }
 
-  // mix frontColor with texture ..
-  mgl_FragColor = vec4(frontColor*texColor);
+  // mix frontColor with texture ..  pre-multiplying texture alpha
+  mgl_FragColor = vec4( mix( frontColor.rgb, texColor.rgb, texColor.a ), frontColor.a );
 }
 
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestJPEGImage01NEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestJPEGImage01NEWT.java
index bf8323e88..5181dc2d3 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestJPEGImage01NEWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestJPEGImage01NEWT.java
@@ -1,3 +1,30 @@
+/**
+ * Copyright 2012 JogAmp Community. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ * 
+ *    1. Redistributions of source code must retain the above copyright notice, this list of
+ *       conditions and the following disclaimer.
+ * 
+ *    2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *       of conditions and the following disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * The views and conclusions contained in the software and documentation are those of the
+ * authors and should not be interpreted as representing official policies, either expressed
+ * or implied, of JogAmp Community.
+ */
 package com.jogamp.opengl.test.junit.jogl.util.texture;
 
 import java.io.IOException;
@@ -28,24 +55,36 @@ import com.jogamp.opengl.util.texture.TextureIO;
 import com.jogamp.opengl.util.texture.spi.JPEGImage;
 import javax.media.opengl.GL;
 
+/**
+ * Test reading and displaying a JPG image.
+ * <p>
+ * Main function accepts arbitrary JPG file name for manual tests.
+ * </p>
+ */
 public class TestJPEGImage01NEWT extends UITestCase {
     
     static boolean showFPS = false;
     static long duration = 100; // ms
     
-    public void testImpl(final boolean withAlpha, final InputStream istream) throws InterruptedException, IOException {
+    public void testImpl(final InputStream istream) throws InterruptedException, IOException {
+        final JPEGImage image = JPEGImage.read(istream);
+        Assert.assertNotNull(image);
+        final boolean hasAlpha = 4 == image.getBytesPerPixel();
+        System.err.println("JPEGImage: "+image+", hasAlpha "+hasAlpha);
+        
         final GLReadBufferUtil screenshot = new GLReadBufferUtil(true, false);
         final GLProfile glp = GLProfile.getGL2ES2();
         final GLCapabilities caps = new GLCapabilities(glp);
-        if( withAlpha ) {
+        if( hasAlpha ) {
             caps.setAlphaBits(1);
         }
-        
-        final JPEGImage image = JPEGImage.read(istream);
-        Assert.assertNotNull(image);
-        System.err.println("JPEGImage: "+image);
-        
-        final int internalFormat = (image.getBytesPerPixel()==4)?GL.GL_RGBA:GL.GL_RGB;
+                
+        final int internalFormat;
+        if(glp.isGL2GL3()) {
+            internalFormat = hasAlpha ? GL.GL_RGBA8 : GL.GL_RGB8;
+        } else {
+            internalFormat = hasAlpha ? GL.GL_RGBA : GL.GL_RGB;
+        }        
         final TextureData texData = new TextureData(glp, internalFormat,
                                        image.getWidth(),
                                        image.getHeight(),
@@ -102,10 +141,10 @@ public class TestJPEGImage01NEWT extends UITestCase {
     }
     
     @Test
-    public void testReadES2_RGB() throws InterruptedException, IOException, MalformedURLException {
+    public void testReadES2_RGBn() throws InterruptedException, IOException, MalformedURLException {
         final String fname = null == _fname ? "test-ntscN_3-01-160x90-90pct-yuv444-base.jpg" : _fname;
         final URLConnection urlConn = IOUtil.getResource(this.getClass(), fname);
-        testImpl(false, urlConn.getInputStream());
+        testImpl(urlConn.getInputStream());
     }
 
     static String _fname = null;
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestPNGImage00NEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestPNGImage00NEWT.java
index 210d03afa..aedb6a573 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestPNGImage00NEWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestPNGImage00NEWT.java
@@ -1,3 +1,30 @@
+/**
+ * Copyright 2010 JogAmp Community. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ * 
+ *    1. Redistributions of source code must retain the above copyright notice, this list of
+ *       conditions and the following disclaimer.
+ * 
+ *    2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *       of conditions and the following disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * The views and conclusions contained in the software and documentation are those of the
+ * authors and should not be interpreted as representing official policies, either expressed
+ * or implied, of JogAmp Community.
+ */
 package com.jogamp.opengl.test.junit.jogl.util.texture;
 
 import java.io.File;
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestPNGImage01NEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestPNGImage01NEWT.java
new file mode 100644
index 000000000..839a198b9
--- /dev/null
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestPNGImage01NEWT.java
@@ -0,0 +1,179 @@
+/**
+ * Copyright 2010 JogAmp Community. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ * 
+ *    1. Redistributions of source code must retain the above copyright notice, this list of
+ *       conditions and the following disclaimer.
+ * 
+ *    2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *       of conditions and the following disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * The views and conclusions contained in the software and documentation are those of the
+ * authors and should not be interpreted as representing official policies, either expressed
+ * or implied, of JogAmp Community.
+ */
+package com.jogamp.opengl.test.junit.jogl.util.texture;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URLConnection;
+
+import javax.media.opengl.GL;
+import javax.media.opengl.GLAutoDrawable;
+import javax.media.opengl.GLCapabilities;
+import javax.media.opengl.GLEventListener;
+import javax.media.opengl.GLProfile;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import com.jogamp.common.util.IOUtil;
+import com.jogamp.newt.opengl.GLWindow;
+import com.jogamp.opengl.test.junit.jogl.demos.TextureDraw01Accessor;
+import com.jogamp.opengl.test.junit.jogl.demos.es2.TextureDraw01ES2Listener;
+import com.jogamp.opengl.test.junit.util.MiscUtils;
+import com.jogamp.opengl.test.junit.util.QuitAdapter;
+import com.jogamp.opengl.test.junit.util.UITestCase;
+import com.jogamp.opengl.util.Animator;
+import com.jogamp.opengl.util.GLReadBufferUtil;
+import com.jogamp.opengl.util.GLPixelBuffer.GLPixelAttributes;
+import com.jogamp.opengl.util.texture.TextureData;
+import com.jogamp.opengl.util.texture.TextureIO;
+import com.jogamp.opengl.util.texture.spi.PNGImage;
+
+/**
+ * Test reading and displaying a PNG image.
+ * <p>
+ * Main function accepts arbitrary PNG file name for manual tests.
+ * </p>
+ */
+public class TestPNGImage01NEWT extends UITestCase {
+    
+    static boolean showFPS = false;
+    static long duration = 200; // ms
+    
+    public void testImpl(final InputStream istream) throws InterruptedException, IOException {        
+        final PNGImage image = PNGImage.read(istream);
+        Assert.assertNotNull(image);
+        final boolean hasAlpha = 4 == image.getBytesPerPixel();        
+        System.err.println("PNGImage: "+image);
+        
+        final GLReadBufferUtil screenshot = new GLReadBufferUtil(true, false);
+        final GLProfile glp = GLProfile.getGL2ES2();
+        final GLCapabilities caps = new GLCapabilities(glp);
+        if( hasAlpha  ) {
+            caps.setAlphaBits(1);
+        }
+        
+        final int internalFormat;
+        if(glp.isGL2GL3()) {
+            internalFormat = hasAlpha ? GL.GL_RGBA8 : GL.GL_RGB8;
+        } else {
+            internalFormat = hasAlpha ? GL.GL_RGBA : GL.GL_RGB;
+        }        
+        final TextureData texData = new TextureData(glp, internalFormat,
+                                       image.getWidth(),
+                                       image.getHeight(),
+                                       0,
+                                       new GLPixelAttributes(image.getGLFormat(), image.getGLType()),
+                                       false /* mipmap */,
+                                       false /* compressed */,
+                                       false /* must flip-vert */,
+                                       image.getData(),
+                                       null);
+        
+        // final TextureData texData = TextureIO.newTextureData(glp, istream, false /* mipmap */, TextureIO.PNG);
+        System.err.println("TextureData: "+texData);        
+        
+        final GLWindow glad = GLWindow.create(caps);
+        glad.setTitle("TestPNGImage01NEWT");
+        // Size OpenGL to Video Surface
+        glad.setSize(texData.getWidth(), texData.getHeight());
+        
+        // load texture from file inside current GL context to match the way
+        // the bug submitter was doing it
+        final TextureDraw01ES2Listener gle = new TextureDraw01ES2Listener( texData ) ;
+        // gle.setClearColor(new float[] { 1.0f, 0.0f, 0.0f, 1.0f } );
+
+        glad.addGLEventListener(gle);
+        glad.addGLEventListener(new GLEventListener() {                    
+            boolean shot = false;
+            
+            @Override public void init(GLAutoDrawable drawable) {
+                System.err.println("Chosen Caps: " + drawable.getChosenGLCapabilities());
+                System.err.println("GL ctx: " + drawable.getGL().getContext());
+            }
+            
+            @Override public void display(GLAutoDrawable drawable) {
+                // 1 snapshot
+                if(null!=((TextureDraw01Accessor)gle).getTexture() && !shot) {
+                    shot = true;
+                    snapshot(0, null, drawable.getGL(), screenshot, TextureIO.PNG, null);
+                }
+            }
+            
+            @Override public void dispose(GLAutoDrawable drawable) { }
+            @Override public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height) { }
+        });
+
+        Animator animator = new Animator(glad);
+        animator.setUpdateFPSFrames(60, showFPS ? System.err : null);
+        QuitAdapter quitAdapter = new QuitAdapter();
+        glad.addKeyListener(quitAdapter);
+        glad.addWindowListener(quitAdapter);
+        glad.setVisible(true);
+        animator.start();
+
+        while(!quitAdapter.shouldQuit() && animator.isAnimating() && animator.getTotalFPSDuration()<duration) {
+            Thread.sleep(100);
+        }
+        
+        animator.stop();
+        glad.destroy();
+    }
+    
+    @Test
+    public void testRead01_RGBn_exp() throws InterruptedException, IOException, MalformedURLException {
+        final String fname = null == _fname ? "bug724-transparent-grey_gimpexp.png" : _fname;
+        final URLConnection urlConn = IOUtil.getResource(this.getClass(), fname);
+        testImpl(urlConn.getInputStream());
+    }
+
+    @Test
+    public void testRead02_RGBn_orig() throws InterruptedException, IOException, MalformedURLException {
+        if( null != _fname ) {
+            return;
+        }
+        final String fname = "bug724-transparent-grey_orig.png";
+        final URLConnection urlConn = IOUtil.getResource(this.getClass(), fname);
+        testImpl(urlConn.getInputStream());
+    }
+    
+    static String _fname = null;
+    public static void main(String args[]) {
+        for(int i=0; i<args.length; i++) {
+            if(args[i].equals("-time")) {
+                i++;
+                duration = MiscUtils.atol(args[i], duration);
+            } else if(args[i].equals("-file")) {
+                i++;
+                _fname = args[i];
+            }
+        }
+        org.junit.runner.JUnitCore.main(TestPNGImage01NEWT.class.getName());
+    }
+}
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/bug724-transparent-grey_gimpexp.png b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/bug724-transparent-grey_gimpexp.png
new file mode 100644
index 000000000..53b2ec07b
--- /dev/null
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/bug724-transparent-grey_gimpexp.png
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/bug724-transparent-grey_orig.png b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/bug724-transparent-grey_orig.png
new file mode 100644
index 000000000..b85bf7e15
--- /dev/null
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/bug724-transparent-grey_orig.png