From 0e998e8416b38b084b517c299061856b7ff963d7 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Wed, 5 Aug 2009 11:55:14 -0700
Subject: Update GlueGen to 7dc9c5601d5689dcbc003ca51cfe826942ea3e6b (latest) -
 Fixes for OpenGL 3.2 - More strict define/function checking - Better
 documentation in source code: extension relation - GL extension marker
 exclusion is done by GlueGen now - Adapted gluegen cfg files

Added OpenGL 3.2 extensions for GL3

Revalidation of all OpenGL 2.0/3.0/3.1 and 3.2 extensions

GL2GL3 based on OpenGL 2.0/3.0 headers

EGL shares common egl-common.cfg file

Removed experimental java system property 'jogl.GLContext.3_2',
try a 3.2 context in case of GL3.

X11GLXContext:
    - Always try to make a created context current,
      to verify it's usability. This is different than under WGL.

    - Temporary removed usage: GLX.GLX_CONTEXT_PROFILE_MASK_ARB
      NV driver bug.
---
 make/build-jogl.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'make/build-jogl.xml')

diff --git a/make/build-jogl.xml b/make/build-jogl.xml
index e5bb1ab38..846779fed 100644
--- a/make/build-jogl.xml
+++ b/make/build-jogl.xml
@@ -640,14 +640,14 @@
     <target name="java.generate.gl2_gl3_if">
         <echo message="Generating GL2_GL3 interface" />
         <antcall target="java.generate.copy2temp" inheritRefs="true" />
-        <gluegen src="${stub.includes.opengl}/gl2.c" 
+        <gluegen src="${stub.includes.opengl}/gl3.c" 
                  outputRootDir="${build}"
-                 config="${config}/gl-gl2-set.cfg"
+                 config="${config}/gl-gl3-set.cfg"
                  includeRefid="stub.includes.fileset.all.gl2"
                  emitter="com.sun.gluegen.opengl.GLEmitter">
             <classpath refid="gluegen.classpath" />
         </gluegen>
-        <gluegen src="${stub.includes.opengl}/gl3.c" 
+        <gluegen src="${stub.includes.opengl}/gl2.c" 
                  outputRootDir="${build}"
                  config="${config}/gl-if-gl2_gl3.cfg"
                  includeRefid="stub.includes.fileset.all.gl2"
-- 
cgit v1.2.3