Bug 904: 'User Vertical Flip' for GLJPanel w/o vertical flip must be considered in AWTTilePainter: 'Origin of GL image is still on Bottom'

6 files changed, 197 insertions, 68 deletions

diff --git a/src/jogl/classes/javax/media/opengl/awt/GLCanvas.java b/src/jogl/classes/javax/media/opengl/awt/GLCanvas.java
index 36c0144a9..0bc002f8e 100644
--- a/src/jogl/classes/javax/media/opengl/awt/GLCanvas.java
+++ b/src/jogl/classes/javax/media/opengl/awt/GLCanvas.java
@@ -858,7 +858,7 @@ public class GLCanvas extends Canvas implements AWTGLAutoDrawable, WindowClosing
               GLDrawableUtil.swapGLContextAndAllGLEventListener(GLCanvas.this, printGLAD);
               printDrawable = printGLAD.getDelegatedDrawable();
           }
-          printAWTTiles.setIsGLOriented(printGLAD.isGLOriented());
+          printAWTTiles.setGLOrientation(printGLAD.isGLOriented(), printGLAD.isGLOriented());
           printAWTTiles.renderer.setTileSize(printDrawable.getWidth(), printDrawable.getHeight(), 0);
           printAWTTiles.renderer.attachAutoDrawable(printGLAD);
           if( DEBUG ) {
diff --git a/src/jogl/classes/javax/media/opengl/awt/GLJPanel.java b/src/jogl/classes/javax/media/opengl/awt/GLJPanel.java
index 8670c3746..a71b47c64 100644
--- a/src/jogl/classes/javax/media/opengl/awt/GLJPanel.java
+++ b/src/jogl/classes/javax/media/opengl/awt/GLJPanel.java
@@ -649,7 +649,7 @@ public class GLJPanel extends JPanel implements AWTGLAutoDrawable, WindowClosing
               GLDrawableUtil.swapGLContextAndAllGLEventListener(GLJPanel.this, printGLAD);
               printDrawable = printGLAD.getDelegatedDrawable();
           }
-          printAWTTiles.setIsGLOriented( !GLJPanel.this.skipGLOrientationVerticalFlip && printGLAD.isGLOriented() );
+          printAWTTiles.setGLOrientation( !GLJPanel.this.skipGLOrientationVerticalFlip && printGLAD.isGLOriented(), printGLAD.isGLOriented() );
           printAWTTiles.renderer.setTileSize(printDrawable.getWidth(), printDrawable.getHeight(), 0);
           printAWTTiles.renderer.attachAutoDrawable(printGLAD);
           if( DEBUG ) {
diff --git a/src/jogl/classes/jogamp/opengl/awt/AWTTilePainter.java b/src/jogl/classes/jogamp/opengl/awt/AWTTilePainter.java
index ff07b04d0..1c1d2350a 100644
--- a/src/jogl/classes/jogamp/opengl/awt/AWTTilePainter.java
+++ b/src/jogl/classes/jogamp/opengl/awt/AWTTilePainter.java
@@ -74,7 +74,10 @@ public class AWTTilePainter {
     public final int customTileWidth, customTileHeight, customNumSamples;
     public final boolean verbose;
 
+    /** Default for OpenGL: True */
     public boolean flipVertical;
+    /** Default for OpenGL: True */
+    public boolean originBottomLeft;
     private AWTGLPixelBuffer tBuffer = null;
     private BufferedImage vFlipImage = null;
     private Graphics2D g2d = null;
@@ -148,10 +151,18 @@ public class AWTTilePainter {
     }
 
     @Override
-    public String toString() { return renderer.toString(); }
+    public String toString() {
+        return "AWTTilePainter[flipVertical "+flipVertical+", startFromBottom "+originBottomLeft+", "+
+                renderer.toString()+"]";
+    }
 
-    public void setIsGLOriented(boolean v) {
-        flipVertical = v;
+    /**
+     * @param flipVertical if <code>true</code>, the image will be flipped vertically (Default for OpenGL).
+     * @param originBottomLeft if <code>true</code>, the image's origin is on the bottom left (Default for OpenGL).
+     */
+    public void setGLOrientation(boolean flipVertical, boolean originBottomLeft) {
+        this.flipVertical = flipVertical;
+        this.originBottomLeft = originBottomLeft;
     }
 
     private static Rectangle2D getClipBounds2D(Graphics2D g) {
@@ -307,7 +318,7 @@ public class AWTTilePainter {
             final int tHeight = renderer.getParam(TileRendererBase.TR_CURRENT_TILE_HEIGHT);
             final int tY = renderer.getParam(TileRendererBase.TR_CURRENT_TILE_Y_POS);
             final int tYOff = renderer.getParam(TileRenderer.TR_TILE_Y_OFFSET);
-            final int imgYOff = flipVertical ? 0 : renderer.getParam(TileRenderer.TR_TILE_HEIGHT) - tHeight; // imgYOff will be cut-off via sub-image
+            final int imgYOff = originBottomLeft ? 0 : renderer.getParam(TileRenderer.TR_TILE_HEIGHT) - tHeight; // imgYOff will be cut-off via sub-image
             final int pX = renderer.getParam(TileRendererBase.TR_CURRENT_TILE_X_POS); // tileX == pX
             final int pY = cis.getHeight() - ( tY - tYOff + tHeight ) + scaledYOffset;
 
@@ -380,7 +391,7 @@ public class AWTTilePainter {
                 System.err.println("XXX tile-post.X "+renderer);
                 System.err.println("XXX tile-post.X dst-img "+dstImage.getWidth()+"x"+dstImage.getHeight());
                 System.err.println("XXX tile-post.X out-img "+outImage.getWidth()+"x"+outImage.getHeight());
-                System.err.println("XXX tile-post.X y-flip "+flipVertical+" -> "+pX+"/"+pY+", drawDone "+drawDone);
+                System.err.println("XXX tile-post.X y-flip "+flipVertical+", originBottomLeft "+originBottomLeft+" -> "+pX+"/"+pY+", drawDone "+drawDone);
             }
         }
         @Override
diff --git a/src/newt/classes/com/jogamp/newt/awt/NewtCanvasAWT.java b/src/newt/classes/com/jogamp/newt/awt/NewtCanvasAWT.java
index b6b8cf9e8..d0ec8ae36 100644
--- a/src/newt/classes/com/jogamp/newt/awt/NewtCanvasAWT.java
+++ b/src/newt/classes/com/jogamp/newt/awt/NewtCanvasAWT.java
@@ -673,7 +673,7 @@ public class NewtCanvasAWT extends java.awt.Canvas implements WindowClosingProto
                     GLDrawableUtil.swapGLContextAndAllGLEventListener(glad, printGLAD);
                     printDrawable = printGLAD.getDelegatedDrawable();
                 }
-                printAWTTiles.setIsGLOriented(printGLAD.isGLOriented());
+                printAWTTiles.setGLOrientation(printGLAD.isGLOriented(), printGLAD.isGLOriented());
                 printAWTTiles.renderer.setTileSize(printDrawable.getWidth(), printDrawable.getHeight(), 0);
                 printAWTTiles.renderer.attachAutoDrawable(printGLAD);
                 if( DEBUG ) {
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/tile/TestTiledPrintingGearsSwingAWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/tile/TestTiledPrintingGearsSwingAWT.java
index e0d0e00dc..3dd3a83c8 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/tile/TestTiledPrintingGearsSwingAWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/tile/TestTiledPrintingGearsSwingAWT.java
@@ -100,11 +100,12 @@ public class TestTiledPrintingGearsSwingAWT extends TiledPrintingAWTBase  {
     public static void releaseClass() {
     }
 
-    protected void runTestGL(GLCapabilities caps, boolean layered) throws InterruptedException, InvocationTargetException {
+    protected void runTestGL(GLCapabilities caps, boolean layered, boolean skipGLOrientationVerticalFlip) throws InterruptedException, InvocationTargetException {
         final int layerStepX = width/6, layerStepY = height/6;
         final Dimension glc_sz = new Dimension(layered ? width - 2*layerStepX : width/2, layered ? height - 2*layerStepY : height);
         final GLJPanel glJPanel1 = new GLJPanel(caps);
         Assert.assertNotNull(glJPanel1);
+        glJPanel1.setSkipGLOrientationVerticalFlip(skipGLOrientationVerticalFlip);
         glJPanel1.setMinimumSize(glc_sz);
         glJPanel1.setPreferredSize(glc_sz);
         if( layered ) {
@@ -112,10 +113,15 @@ public class TestTiledPrintingGearsSwingAWT extends TiledPrintingAWTBase  {
         } else {
             glJPanel1.setBounds(0, 0, glc_sz.width, glc_sz.height);
         }
-        glJPanel1.addGLEventListener(new Gears());
+        {
+            final Gears demo = new Gears();
+            demo.setFlipVerticalInGLOrientation(skipGLOrientationVerticalFlip);
+            glJPanel1.addGLEventListener(demo);
+        }
 
         final GLJPanel glJPanel2 = new GLJPanel(caps);
         Assert.assertNotNull(glJPanel2);
+        glJPanel2.setSkipGLOrientationVerticalFlip(skipGLOrientationVerticalFlip);
         glJPanel2.setMinimumSize(glc_sz);
         glJPanel2.setPreferredSize(glc_sz);
         if( layered ) {
@@ -123,8 +129,11 @@ public class TestTiledPrintingGearsSwingAWT extends TiledPrintingAWTBase  {
         } else {
             glJPanel2.setBounds(0, 0, glc_sz.width, glc_sz.height);
         }
-        glJPanel2.addGLEventListener(new RedSquareES1());
-        // glJPanel2.addGLEventListener(new Gears());
+        {
+            final RedSquareES1 demo = new RedSquareES1();
+            demo.setFlipVerticalInGLOrientation(skipGLOrientationVerticalFlip);
+            glJPanel2.addGLEventListener(demo);
+        }
 
         final JComponent demoPanel;
         if( layered ) {
@@ -293,43 +302,83 @@ public class TestTiledPrintingGearsSwingAWT extends TiledPrintingAWTBase  {
     }
 
     @Test
-    public void test01_aa0() throws InterruptedException, InvocationTargetException {
+    public void test01_flip1_aa0() throws InterruptedException, InvocationTargetException {
+        GLCapabilities caps = new GLCapabilities(glp);
+        runTestGL(caps, false, false);
+    }
+
+    @Test
+    public void test01_flip1_aa0_layered() throws InterruptedException, InvocationTargetException {
+        GLCapabilities caps = new GLCapabilities(glp);
+        caps.setAlphaBits(8);
+        runTestGL(caps, true, false);
+    }
+
+    @Test
+    public void test01_flip1_aa0_bitmap() throws InterruptedException, InvocationTargetException {
+        if( Platform.OSType.WINDOWS == Platform.getOSType() ) {
+            GLCapabilities caps = new GLCapabilities(glp);
+            caps.setBitmap(true);
+            runTestGL(caps, false, false);
+        } // issues w/ AMD catalyst driver and pixmap surface ..
+    }
+
+    @Test
+    public void test01_flip1_aa0_bitmap_layered() throws InterruptedException, InvocationTargetException {
+        if( Platform.OSType.WINDOWS == Platform.getOSType() ) {
+            GLCapabilities caps = new GLCapabilities(glp);
+            caps.setBitmap(true);
+            caps.setAlphaBits(8);
+            runTestGL(caps, true, false);
+        } // issues w/ AMD catalyst driver and pixmap surface ..
+    }
+
+    @Test
+    public void test02_flip1_aa8() throws InterruptedException, InvocationTargetException {
+        GLCapabilities caps = new GLCapabilities(glp);
+        caps.setSampleBuffers(true);
+        caps.setNumSamples(8);
+        runTestGL(caps, false, false);
+    }
+
+    @Test
+    public void test11_flip0_aa0() throws InterruptedException, InvocationTargetException {
         GLCapabilities caps = new GLCapabilities(glp);
-        runTestGL(caps, false);
+        runTestGL(caps, false, true);
     }
 
     @Test
-    public void test01_aa0_layered() throws InterruptedException, InvocationTargetException {
+    public void test11_flip0_aa0_layered() throws InterruptedException, InvocationTargetException {
         GLCapabilities caps = new GLCapabilities(glp);
         caps.setAlphaBits(8);
-        runTestGL(caps, true);
+        runTestGL(caps, true, true);
     }
 
     @Test
-    public void test01_aa0_bitmap() throws InterruptedException, InvocationTargetException {
+    public void test11_flip0_aa0_bitmap() throws InterruptedException, InvocationTargetException {
         if( Platform.OSType.WINDOWS == Platform.getOSType() ) {
             GLCapabilities caps = new GLCapabilities(glp);
             caps.setBitmap(true);
-            runTestGL(caps, false);
+            runTestGL(caps, false, true);
         } // issues w/ AMD catalyst driver and pixmap surface ..
     }
 
     @Test
-    public void test01_aa0_bitmap_layered() throws InterruptedException, InvocationTargetException {
+    public void test11_flip0_aa0_bitmap_layered() throws InterruptedException, InvocationTargetException {
         if( Platform.OSType.WINDOWS == Platform.getOSType() ) {
             GLCapabilities caps = new GLCapabilities(glp);
             caps.setBitmap(true);
             caps.setAlphaBits(8);
-            runTestGL(caps, true);
+            runTestGL(caps, true, true);
         } // issues w/ AMD catalyst driver and pixmap surface ..
     }
 
     @Test
-    public void test02_aa8() throws InterruptedException, InvocationTargetException {
+    public void test12_flip0_aa8() throws InterruptedException, InvocationTargetException {
         GLCapabilities caps = new GLCapabilities(glp);
         caps.setSampleBuffers(true);
         caps.setNumSamples(8);
-        runTestGL(caps, false);
+        runTestGL(caps, false, true);
     }
 
     static long duration = 500; // ms
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/tile/TestTiledPrintingGearsSwingAWT2.java b/src/test/com/jogamp/opengl/test/junit/jogl/tile/TestTiledPrintingGearsSwingAWT2.java
index 2d4973d6b..29bf8a6c3 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/tile/TestTiledPrintingGearsSwingAWT2.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/tile/TestTiledPrintingGearsSwingAWT2.java
@@ -3,14 +3,14 @@
  *
  * 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
@@ -20,12 +20,12 @@
  * 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.tile;
 
 import java.awt.BorderLayout;
@@ -77,7 +77,7 @@ public class TestTiledPrintingGearsSwingAWT2 extends TiledPrintingAWTBase  {
     static boolean waitForKey = false;
     static GLProfile glp;
     static int width, height;
-    
+
     @BeforeClass
     public static void initClass() {
         if(GLProfile.isAvailable(GLProfile.GL2)) {
@@ -95,16 +95,21 @@ public class TestTiledPrintingGearsSwingAWT2 extends TiledPrintingAWTBase  {
     @AfterClass
     public static void releaseClass() {
     }
-    
-    protected void runTestGL(GLCapabilities caps, final boolean addLayout, boolean layered, boolean useAnim) throws InterruptedException, InvocationTargetException {
+
+    protected void runTestGL(GLCapabilities caps, final boolean addLayout, boolean layered, boolean skipGLOrientationVerticalFlip, boolean useAnim) throws InterruptedException, InvocationTargetException {
         final Dimension glc_sz = new Dimension(width, height);
         final GLJPanel glJPanel1 = new GLJPanel(caps);
-        Assert.assertNotNull(glJPanel1);        
+        Assert.assertNotNull(glJPanel1);
+        glJPanel1.setSkipGLOrientationVerticalFlip(skipGLOrientationVerticalFlip);
         glJPanel1.setMinimumSize(glc_sz);
         glJPanel1.setPreferredSize(glc_sz);
         glJPanel1.setBounds(0, 0, glc_sz.width, glc_sz.height);
-        glJPanel1.addGLEventListener(new Gears());
-        
+        {
+            final Gears demo = new Gears();
+            demo.setFlipVerticalInGLOrientation(skipGLOrientationVerticalFlip);
+            glJPanel1.addGLEventListener(demo);
+        }
+
         final JComponent tPanel, demoPanel;
         if( layered ) {
             glJPanel1.setOpaque(true);
@@ -133,13 +138,13 @@ public class TestTiledPrintingGearsSwingAWT2 extends TiledPrintingAWTBase  {
                 demoPanel = new JPanel();
                 demoPanel.add(glJPanel1);
             } else {
-                demoPanel = glJPanel1;                
+                demoPanel = glJPanel1;
             }
         }
-        
+
         final JFrame frame = new JFrame("Swing Print");
         Assert.assertNotNull(frame);
-        
+
         final ActionListener print72DPIAction = new ActionListener() {
             public void actionPerformed(ActionEvent e) {
                 doPrintManual(frame, 72, 0, -1, -1);
@@ -158,7 +163,7 @@ public class TestTiledPrintingGearsSwingAWT2 extends TiledPrintingAWTBase  {
         print150DPIButton.addActionListener(print150DPIAction);
         final Button print300DPIButton = new Button("300dpi");
         print300DPIButton.addActionListener(print300DPIAction);
-            
+
         final JPanel printPanel = new JPanel();
         printPanel.add(print72DPIButton);
         printPanel.add(print150DPIButton);
@@ -169,7 +174,7 @@ public class TestTiledPrintingGearsSwingAWT2 extends TiledPrintingAWTBase  {
         eastPanel.add(new Label("East"));
         final JPanel westPanel = new JPanel();
         westPanel.add(new Label("West"));
-        
+
         final Animator animator = useAnim ? new Animator() : null;
         if( null != animator ) {
             animator.add(glJPanel1);
@@ -181,7 +186,7 @@ public class TestTiledPrintingGearsSwingAWT2 extends TiledPrintingAWTBase  {
 
         SwingUtilities.invokeAndWait(new Runnable() {
                 public void run() {
-                    final Container fcont = frame.getContentPane();        
+                    final Container fcont = frame.getContentPane();
                     if( addLayout ) {
                         fcont.setLayout(new BorderLayout());
                         fcont.add(printPanel, BorderLayout.NORTH);
@@ -201,12 +206,12 @@ public class TestTiledPrintingGearsSwingAWT2 extends TiledPrintingAWTBase  {
                     }
                     frame.setVisible(true);
                 } } ) ;
-        
+
         Assert.assertEquals(true,  AWTRobotUtil.waitForVisible(frame, true));
         Assert.assertEquals(true,  AWTRobotUtil.waitForRealized(glJPanel1, true));
-        
+
         if( null != animator ) {
-            animator.setUpdateFPSFrames(60, System.err);        
+            animator.setUpdateFPSFrames(60, System.err);
             animator.start();
             Assert.assertEquals(true, animator.isAnimating());
         }
@@ -226,11 +231,11 @@ public class TestTiledPrintingGearsSwingAWT2 extends TiledPrintingAWTBase  {
             }
             t1 = System.currentTimeMillis();
         }
-        
+
         Assert.assertNotNull(frame);
         Assert.assertNotNull(glJPanel1);
 
-        if( null != animator ) {        
+        if( null != animator ) {
             animator.stop();
             Assert.assertEquals(false, animator.isAnimating());
         }
@@ -248,69 +253,133 @@ public class TestTiledPrintingGearsSwingAWT2 extends TiledPrintingAWTBase  {
     }
 
     @Test
-    public void test01_norm_layout0_layered0() throws InterruptedException, InvocationTargetException {
+    public void test001_flip1_norm_layout0_layered0() throws InterruptedException, InvocationTargetException {
         GLCapabilities caps = new GLCapabilities(glp);
-        runTestGL(caps, false /* addLayout */, false /* layered */, false /* useAnim */);
+        runTestGL(caps, false /* addLayout */, false /* layered */, false /* skipGLOrientationVerticalFlip */, false /* useAnim */);
     }
-    
+
     @Test
-    public void test02_norm_layout1_layered0() throws InterruptedException, InvocationTargetException {
+    public void test002_flip1_norm_layout1_layered0() throws InterruptedException, InvocationTargetException {
         GLCapabilities caps = new GLCapabilities(glp);
-        runTestGL(caps, true /* addLayout */, false /* layered */, false /* useAnim */);
+        runTestGL(caps, true /* addLayout */, false /* layered */, false /* skipGLOrientationVerticalFlip */, false /* useAnim */);
     }
-    
+
     @Test
-    public void test03_norm_layout0_layered1() throws InterruptedException, InvocationTargetException {
+    public void test003_flip1_norm_layout0_layered1() throws InterruptedException, InvocationTargetException {
         GLCapabilities caps = new GLCapabilities(glp);
-        runTestGL(caps, false /* addLayout */, true /* layered */, false /* useAnim */);
+        runTestGL(caps, false /* addLayout */, true /* layered */, false /* skipGLOrientationVerticalFlip */, false /* useAnim */);
     }
-    
+
     @Test
-    public void test04_norm_layout1_layered1() throws InterruptedException, InvocationTargetException {
+    public void test004_flip1_norm_layout1_layered1() throws InterruptedException, InvocationTargetException {
         GLCapabilities caps = new GLCapabilities(glp);
-        runTestGL(caps, true /* addLayout */, true /* layered */, false /* useAnim */);
+        runTestGL(caps, true /* addLayout */, true /* layered */, false /* skipGLOrientationVerticalFlip */, false /* useAnim */);
     }
-    
+
     @Test
-    public void test11_bitm_layout0_layered0() throws InterruptedException, InvocationTargetException {
+    public void test011_flip1_bitm_layout0_layered0() throws InterruptedException, InvocationTargetException {
         if( Platform.OSType.WINDOWS != Platform.getOSType() ) {
             return;
         }
         GLCapabilities caps = new GLCapabilities(glp);
         caps.setBitmap(true);
-        runTestGL(caps, false /* addLayout */, false /* layered */, false /* useAnim */);
+        runTestGL(caps, false /* addLayout */, false /* layered */, false /* skipGLOrientationVerticalFlip */, false /* useAnim */);
     }
-    
+
     @Test
-    public void test12_bitm_layout1_layered0() throws InterruptedException, InvocationTargetException {
+    public void test012_flip1_bitm_layout1_layered0() throws InterruptedException, InvocationTargetException {
         if( Platform.OSType.WINDOWS != Platform.getOSType() ) {
             return;
         }
         GLCapabilities caps = new GLCapabilities(glp);
         caps.setBitmap(true);
-        runTestGL(caps, true /* addLayout */, false /* layered */, false /* useAnim */);
+        runTestGL(caps, true /* addLayout */, false /* layered */, false /* skipGLOrientationVerticalFlip */, false /* useAnim */);
     }
-    
+
     @Test
-    public void test13_bitm_layout0_layered1() throws InterruptedException, InvocationTargetException {
+    public void test013_flip1_bitm_layout0_layered1() throws InterruptedException, InvocationTargetException {
         if( Platform.OSType.WINDOWS != Platform.getOSType() ) {
             return;
         }
         GLCapabilities caps = new GLCapabilities(glp);
         caps.setBitmap(true);
-        runTestGL(caps, false /* addLayout */, true /* layered */, false /* useAnim */);
+        runTestGL(caps, false /* addLayout */, true /* layered */, false /* skipGLOrientationVerticalFlip */, false /* useAnim */);
     }
-    
+
     @Test
-    public void test14_bitm_layout1_layered1() throws InterruptedException, InvocationTargetException {
+    public void test014_flip1_bitm_layout1_layered1() throws InterruptedException, InvocationTargetException {
         if( Platform.OSType.WINDOWS != Platform.getOSType() ) {
             return;
         }
         GLCapabilities caps = new GLCapabilities(glp);
         caps.setBitmap(true);
-        runTestGL(caps, true /* addLayout */, true /* layered */, false /* useAnim */);
+        runTestGL(caps, true /* addLayout */, true /* layered */, false /* skipGLOrientationVerticalFlip */, false /* useAnim */);
+    }
+
+    @Test
+    public void test101_flip1_norm_layout0_layered0() throws InterruptedException, InvocationTargetException {
+        GLCapabilities caps = new GLCapabilities(glp);
+        runTestGL(caps, false /* addLayout */, false /* layered */, true /* skipGLOrientationVerticalFlip */, false /* useAnim */);
+    }
+
+    @Test
+    public void test102_flip1_norm_layout1_layered0() throws InterruptedException, InvocationTargetException {
+        GLCapabilities caps = new GLCapabilities(glp);
+        runTestGL(caps, true /* addLayout */, false /* layered */, true /* skipGLOrientationVerticalFlip */, false /* useAnim */);
+    }
+
+    @Test
+    public void test103_flip1_norm_layout0_layered1() throws InterruptedException, InvocationTargetException {
+        GLCapabilities caps = new GLCapabilities(glp);
+        runTestGL(caps, false /* addLayout */, true /* layered */, true /* skipGLOrientationVerticalFlip */, false /* useAnim */);
     }
-    
+
+    @Test
+    public void test104_flip1_norm_layout1_layered1() throws InterruptedException, InvocationTargetException {
+        GLCapabilities caps = new GLCapabilities(glp);
+        runTestGL(caps, true /* addLayout */, true /* layered */, true /* skipGLOrientationVerticalFlip */, false /* useAnim */);
+    }
+
+    @Test
+    public void test111_flip1_bitm_layout0_layered0() throws InterruptedException, InvocationTargetException {
+        if( Platform.OSType.WINDOWS != Platform.getOSType() ) {
+            return;
+        }
+        GLCapabilities caps = new GLCapabilities(glp);
+        caps.setBitmap(true);
+        runTestGL(caps, false /* addLayout */, false /* layered */, true /* skipGLOrientationVerticalFlip */, false /* useAnim */);
+    }
+
+    @Test
+    public void test112_flip1_bitm_layout1_layered0() throws InterruptedException, InvocationTargetException {
+        if( Platform.OSType.WINDOWS != Platform.getOSType() ) {
+            return;
+        }
+        GLCapabilities caps = new GLCapabilities(glp);
+        caps.setBitmap(true);
+        runTestGL(caps, true /* addLayout */, false /* layered */, true /* skipGLOrientationVerticalFlip */, false /* useAnim */);
+    }
+
+    @Test
+    public void test113_flip1_bitm_layout0_layered1() throws InterruptedException, InvocationTargetException {
+        if( Platform.OSType.WINDOWS != Platform.getOSType() ) {
+            return;
+        }
+        GLCapabilities caps = new GLCapabilities(glp);
+        caps.setBitmap(true);
+        runTestGL(caps, false /* addLayout */, true /* layered */, true /* skipGLOrientationVerticalFlip */, false /* useAnim */);
+    }
+
+    @Test
+    public void test114_flip1_bitm_layout1_layered1() throws InterruptedException, InvocationTargetException {
+        if( Platform.OSType.WINDOWS != Platform.getOSType() ) {
+            return;
+        }
+        GLCapabilities caps = new GLCapabilities(glp);
+        caps.setBitmap(true);
+        runTestGL(caps, true /* addLayout */, true /* layered */, true /* skipGLOrientationVerticalFlip */, false /* useAnim */);
+    }
+
     static long duration = 500; // ms
 
     public static void main(String args[]) {