From 74c254d42bb2389dc9bf257898053700c8c72568 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Sun, 16 Dec 2012 07:18:36 +0100
Subject: Fix/Complete commit b8a8fc24a3afb0cb06a31504bdea1a98b8f00ef4 - Adding
 missing GLU code

---
 make/config/jogl/glu-CustomJavaCode-base.java | 14 +++++++++++---
 make/config/jogl/glu-common.cfg               |  1 +
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/make/config/jogl/glu-CustomJavaCode-base.java b/make/config/jogl/glu-CustomJavaCode-base.java
index 49722b469..21d6277e9 100644
--- a/make/config/jogl/glu-CustomJavaCode-base.java
+++ b/make/config/jogl/glu-CustomJavaCode-base.java
@@ -1250,16 +1250,24 @@ public final void gluDisk(GLUquadric quad, double inner, double outer, int slice
 
 /** Option (throws GLException if not available in profile). <br> Interface to C language function: <br> <code> GLUquadric *  gluNewQuadric(void); </code>    */
 public final GLUquadric gluNewQuadric() {
-  return gluNewQuadric(false);
+  return gluNewQuadric(false, null, 0);
 }
 
-public final GLUquadric gluNewQuadric(boolean useGLSL) {
+public final GLUquadric gluNewQuadric(boolean useGLSL, ShaderState st) {
+    return gluNewQuadric(useGLSL, st, 0);
+}
+
+public final GLUquadric gluNewQuadric(boolean useGLSL, int shaderProgram) {
+    return gluNewQuadric(useGLSL, null, shaderProgram);
+}
+
+private final GLUquadric gluNewQuadric(boolean useGLSL, ShaderState st, int shaderProgram) {
   GL gl = getCurrentGL();
   if(useGLSL && !gl.isGL2ES2()) {
     throw new GLException("GLUquadric GLSL implementation not supported for profile: "+gl);
   }
   validateGLUquadricImpl();
-  return new GLUquadricImpl(gl, useGLSL);
+  return new GLUquadricImpl(gl, useGLSL, st, shaderProgram);
 }
 
 /** Option (throws GLException if not available in profile). <br> Interface to C language function: <br> <code> void gluPartialDisk(GLUquadric *  quad, GLdouble inner, GLdouble outer, GLint slices, GLint loops, GLdouble start, GLdouble sweep); </code>    */
diff --git a/make/config/jogl/glu-common.cfg b/make/config/jogl/glu-common.cfg
index 9271ec3c6..85d556b77 100644
--- a/make/config/jogl/glu-common.cfg
+++ b/make/config/jogl/glu-common.cfg
@@ -11,6 +11,7 @@ TagNativeBinding true
 #
 Import javax.media.opengl.*
 Import javax.media.opengl.glu.*
+import com.jogamp.opengl.util.glsl.ShaderState
 Import jogamp.opengl.*
 Import jogamp.opengl.glu.*
 Import jogamp.opengl.glu.tessellator.GLUtessellatorImpl
-- 
cgit v1.2.3