From d846b04928ecfcfb319e75d7ed114d357edbeb89 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Mon, 17 Jun 2013 13:16:40 +0200
Subject: Fix Bug 735: GLAutoDrawable must issue glViewport(..) even w/o
 GLEventListener ; Optimize GLDrawableHelper's glViewportCall(..)

GLAutoDrawable must issue glViewport(..) even w/o GLEventListener
 - Same behavior w/ or w/o GLEventListener requires to issue glViewport, always.

Optimize GLDrawableHelper's glViewportCall(..)
  - 'private void init(..)' receives 'setViewport' argument to be passed to 'private void reshape(..)'
    allowing to only the the viewport once @ 'public void init(..)' and display.
---
 .../classes/jogamp/opengl/GLDrawableHelper.java    | 35 +++++++++++++---------
 1 file changed, 21 insertions(+), 14 deletions(-)

(limited to 'src/jogl/classes/jogamp')

diff --git a/src/jogl/classes/jogamp/opengl/GLDrawableHelper.java b/src/jogl/classes/jogamp/opengl/GLDrawableHelper.java
index ed3a1593e..8be910c1a 100644
--- a/src/jogl/classes/jogamp/opengl/GLDrawableHelper.java
+++ b/src/jogl/classes/jogamp/opengl/GLDrawableHelper.java
@@ -531,10 +531,10 @@ public class GLDrawableHelper {
       }
   }
   
-  private final void init(GLEventListener l, GLAutoDrawable drawable, boolean sendReshape) {
+  private final void init(GLEventListener l, GLAutoDrawable drawable, boolean sendReshape, boolean setViewport) {
       l.init(drawable);
       if(sendReshape) {
-          reshape(l, drawable, 0, 0, drawable.getWidth(), drawable.getHeight(), true /* setViewport */, false /* checkInit */);
+          reshape(l, drawable, 0, 0, drawable.getWidth(), drawable.getHeight(), setViewport, false /* checkInit */);
       }
   }
 
@@ -545,14 +545,20 @@ public class GLDrawableHelper {
   public final void init(GLAutoDrawable drawable, boolean sendReshape) {
     synchronized(listenersLock) {
         final ArrayList<GLEventListener> _listeners = listeners;
-        for (int i=0; i < _listeners.size(); i++) {
-          final GLEventListener listener = _listeners.get(i) ;
-
-          // If make ctx current, invoked by invokGL(..), results in a new ctx, init gets called.
-          // This may happen not just for initial setup, but for ctx recreation due to resource change (drawable/window),
-          // hence it must be called unconditional, always.
-          listenersToBeInit.remove(listener); // remove if exist, avoiding dbl init
-          init( listener, drawable, sendReshape);
+        final int listenerCount = _listeners.size();
+        if( listenerCount > 0 ) {
+            for (int i=0; i < listenerCount; i++) {
+              final GLEventListener listener = _listeners.get(i) ;
+    
+              // If make ctx current, invoked by invokGL(..), results in a new ctx, init gets called.
+              // This may happen not just for initial setup, but for ctx recreation due to resource change (drawable/window),
+              // hence it must be called unconditional, always.
+              listenersToBeInit.remove(listener); // remove if exist, avoiding dbl init
+              init( listener, drawable, sendReshape, 0==i /* setViewport */);
+            }
+        } else {
+            // Expose same GL initialization if not using GLEventListener
+            drawable.getGL().glViewport(0, 0, drawable.getWidth(), drawable.getHeight());
         }
     }
   }
@@ -566,12 +572,13 @@ public class GLDrawableHelper {
   private final void displayImpl(GLAutoDrawable drawable) {
       synchronized(listenersLock) {
           final ArrayList<GLEventListener> _listeners = listeners;
-          for (int i=0; i < _listeners.size(); i++) {
+          final int listenerCount = _listeners.size();
+          for (int i=0; i < listenerCount; i++) {
             final GLEventListener listener = _listeners.get(i) ;
             // GLEventListener may need to be init, 
             // in case this one is added after the realization of the GLAutoDrawable
             if( listenersToBeInit.remove(listener) ) {
-                init( listener, drawable, true /* sendReshape */) ;
+                init( listener, drawable, true /* sendReshape */, listenersToBeInit.size() + 1 == listenerCount /* setViewport if 1st init */ );
             }
             listener.display(drawable);
           }
@@ -585,7 +592,7 @@ public class GLDrawableHelper {
         // in case this one is added after the realization of the GLAutoDrawable
         synchronized(listenersLock) {
             if( listenersToBeInit.remove(listener) ) {
-                init( listener, drawable, false /* sendReshape */) ;
+                listener.init(drawable);
             }
         }
     }
@@ -598,7 +605,7 @@ public class GLDrawableHelper {
   public final void reshape(GLAutoDrawable drawable, int x, int y, int width, int height) {
     synchronized(listenersLock) {
         for (int i=0; i < listeners.size(); i++) {
-          reshape((GLEventListener) listeners.get(i), drawable, x, y, width, height, 0==i, true);
+          reshape((GLEventListener) listeners.get(i), drawable, x, y, width, height, 0==i /* setViewport */, true /* checkInit */);
         }
     }
   }
-- 
cgit v1.2.3