NEWT: Remove loading of non-existing nativewindow lib; BroadcomEGL: use libEGL(EglUtil) and libGLES_CM(nexus), setSize to screen-size on creation, more debug output

4 files changed, 12 insertions, 7 deletions

diff --git a/make/build-newt.xml b/make/build-newt.xml
index be9547684..acf78f09a 100644
--- a/make/build-newt.xml
+++ b/make/build-newt.xml
@@ -357,8 +357,8 @@
       <!-- linker configuration -->
  
       <linker id="linker.cfg.linux.newt.broadcom_egl" extends="linker.cfg.linux">
-        <syslibset dir="/nfsroot/lg/lib" libs="EglUtil"/>
-        <syslibset dir="/nfsroot/lg/lib" libs="nexus"/>
+        <syslibset dir="/nfsroot/lg/lib" libs="EGL"/>
+        <syslibset dir="/nfsroot/lg/lib" libs="GLES_CM"/>
       </linker>
 
       <linker id="linker.cfg.linux.newt.x11" extends="linker.cfg.linux">
diff --git a/src/jogl/classes/com/sun/opengl/impl/egl/EGLES1DynamicLookupHelper.java b/src/jogl/classes/com/sun/opengl/impl/egl/EGLES1DynamicLookupHelper.java
index 68630344a..7e60e25c0 100755
--- a/src/jogl/classes/com/sun/opengl/impl/egl/EGLES1DynamicLookupHelper.java
+++ b/src/jogl/classes/com/sun/opengl/impl/egl/EGLES1DynamicLookupHelper.java
@@ -58,8 +58,6 @@ public class EGLES1DynamicLookupHelper extends EGLDynamicLookupHelper {
     protected List/*<String>*/ getGLESLibNames() {
         List/*<String>*/ glesLibNames = new ArrayList();
 
-        glesLibNames.add("nexus");
-        
         glesLibNames.add("GLES_CM");
         glesLibNames.add("GLES_CL");
         glesLibNames.add("GLESv1_CM");
diff --git a/src/newt/classes/com/sun/javafx/newt/impl/NativeLibLoader.java b/src/newt/classes/com/sun/javafx/newt/impl/NativeLibLoader.java
index 6316e750f..d96c56f6e 100644
--- a/src/newt/classes/com/sun/javafx/newt/impl/NativeLibLoader.java
+++ b/src/newt/classes/com/sun/javafx/newt/impl/NativeLibLoader.java
@@ -53,8 +53,7 @@ public class NativeLibLoader extends NativeLibLoaderBase {
   public static void loadNEWT() {
     AccessController.doPrivileged(new PrivilegedAction() {
       public Object run() {
-        String[] preload = { "nativewindow" };
-        loadLibrary("newt", preload, true);
+        loadLibrary("newt", null, true);
         return null;
       }
     });
diff --git a/src/newt/classes/com/sun/javafx/newt/opengl/broadcom/BCEGLWindow.java b/src/newt/classes/com/sun/javafx/newt/opengl/broadcom/BCEGLWindow.java
index 29b92bc8f..c8436b928 100755
--- a/src/newt/classes/com/sun/javafx/newt/opengl/broadcom/BCEGLWindow.java
+++ b/src/newt/classes/com/sun/javafx/newt/opengl/broadcom/BCEGLWindow.java
@@ -56,6 +56,7 @@ public class BCEGLWindow extends Window {
         if (config == null) {
             throw new NativeWindowException("Error choosing GraphicsConfiguration creating window: "+this);
         }
+        setSize(getScreen().getWidth(), getScreen().getHeight());
     }
 
     protected void closeNative() {
@@ -82,6 +83,10 @@ public class BCEGLWindow extends Window {
             // n/a in BroadcomEGL
             System.err.println("setSize n/a in BroadcomEGL with realized window");
         } else {
+            if(DEBUG_IMPLEMENTATION) {
+                Exception e = new Exception("BCEGLWindow.setSize() "+this.width+"x"+this.height+" -> "+width+"x"+height);
+                e.printStackTrace();
+            }
             this.width = width;
             this.height = height;
         }
@@ -108,6 +113,9 @@ public class BCEGLWindow extends Window {
 
 
     private long realizeWindow(boolean chromaKey, int width, int height) {
+        if(DEBUG_IMPLEMENTATION) {
+            System.out.println("BCEGLWindow.realizeWindow() with: chroma "+chromaKey+", "+width+"x"+height+", "+config);
+        }
         long handle = CreateWindow(getDisplayHandle(), chromaKey, width, height);
         if (0 == handle) {
             throw new NativeWindowException("Error native Window Handle is null");
@@ -125,7 +133,7 @@ public class BCEGLWindow extends Window {
             throw new NativeWindowException("Error creating EGLGraphicsConfiguration from id: "+cfgID+", "+this);
         }
         if(DEBUG_IMPLEMENTATION) {
-            System.out.println("BCEGLWindow.windowCreated: 0x"+Integer.toHexString(cfgID)+", "+width+"x"+height+", "+config);
+            System.out.println("BCEGLWindow.windowCreated(): 0x"+Integer.toHexString(cfgID)+", "+width+"x"+height+", "+config);
         }
     }