From 598c3b25c3bb6a8e46f8d9c3045fc7a196ac5342 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Sat, 1 Aug 2009 07:45:23 -0700
Subject: Fix: updateGLProcAddressTable() call order - child before parent,
 broke WGL

---
 src/jogl/classes/com/sun/opengl/impl/egl/EGLContext.java                | 2 +-
 src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXCGLContext.java   | 2 +-
 src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsWGLContext.java | 2 +-
 src/jogl/classes/com/sun/opengl/impl/x11/glx/X11GLXContext.java         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/jogl/classes/com/sun')

diff --git a/src/jogl/classes/com/sun/opengl/impl/egl/EGLContext.java b/src/jogl/classes/com/sun/opengl/impl/egl/EGLContext.java
index 1a75f03a9..cc4dafa4c 100755
--- a/src/jogl/classes/com/sun/opengl/impl/egl/EGLContext.java
+++ b/src/jogl/classes/com/sun/opengl/impl/egl/EGLContext.java
@@ -225,7 +225,6 @@ public abstract class EGLContext extends GLContextImpl {
     }
 
     protected void updateGLProcAddressTable() {
-        super.updateGLProcAddressTable();
         if (DEBUG) {
           System.err.println(getThreadName() + ": !!! Initializing EGL extension address table");
         }
@@ -235,6 +234,7 @@ public abstract class EGLContext extends GLContextImpl {
           eglExtProcAddressTable = new EGLExtProcAddressTable();
         }          
         resetProcAddressTable(getEGLExtProcAddressTable());
+        super.updateGLProcAddressTable();
     }
   
     public synchronized String getPlatformExtensionsString() {
diff --git a/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXCGLContext.java b/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXCGLContext.java
index f60dd1645..181efc8bb 100644
--- a/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXCGLContext.java
+++ b/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXCGLContext.java
@@ -320,7 +320,6 @@ public abstract class MacOSXCGLContext extends GLContextImpl
   }
 
   protected void updateGLProcAddressTable() {
-    super.updateGLProcAddressTable();
     if (DEBUG) {
       System.err.println("!!! Initializing CGL extension address table");
     }
@@ -330,6 +329,7 @@ public abstract class MacOSXCGLContext extends GLContextImpl
       cglExtProcAddressTable = new CGLExtProcAddressTable();
     }          
     resetProcAddressTable(getCGLExtProcAddressTable());
+    super.updateGLProcAddressTable();
   }
 	
   public String getPlatformExtensionsString()
diff --git a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsWGLContext.java b/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsWGLContext.java
index 578279586..6d810ed39 100644
--- a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsWGLContext.java
+++ b/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsWGLContext.java
@@ -313,7 +313,6 @@ public class WindowsWGLContext extends GLContextImpl {
   }
 
   protected void updateGLProcAddressTable() {
-    super.updateGLProcAddressTable();
     if (DEBUG) {
       System.err.println(getThreadName() + ": !!! Initializing WGL extension address table for " + this);
     }
@@ -323,6 +322,7 @@ public class WindowsWGLContext extends GLContextImpl {
       wglExtProcAddressTable = new WGLExtProcAddressTable();
     }          
     resetProcAddressTable(getWGLExtProcAddressTable());
+    super.updateGLProcAddressTable();
   }
   
   public String getPlatformExtensionsString() {
diff --git a/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11GLXContext.java b/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11GLXContext.java
index 718d55aa0..da1548d0d 100644
--- a/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11GLXContext.java
+++ b/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11GLXContext.java
@@ -349,7 +349,6 @@ public abstract class X11GLXContext extends GLContextImpl {
   }
 
   protected void updateGLProcAddressTable() {
-    super.updateGLProcAddressTable();
     if (DEBUG) {
       System.err.println(getThreadName() + ": !!! Initializing GLX extension address table");
     }
@@ -359,6 +358,7 @@ public abstract class X11GLXContext extends GLContextImpl {
       glXExtProcAddressTable = new GLXExtProcAddressTable();
     }          
     resetProcAddressTable(getGLXExtProcAddressTable());
+    super.updateGLProcAddressTable();
   }
 
   public synchronized String getPlatformExtensionsString() {
-- 
cgit v1.2.3