diff options
| author | Sven Gothel <[email protected]> | 2009-05-29 01:43:26 +0000 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2009-05-29 01:43:26 +0000 |
| commit | a83b17fd86ceb949efa2b9c8f2773513eff11c61 (patch) | |
| tree | 0daeb219e34b161dfd8d124a08ffa3e864e13f1d /src/java | |
| parent | 06fd97a1343718c6949b0408108f4c3124420299 (diff) | |
Adding GL3 stubs, and removing renamed function redundancies
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/../svn-server-sync/gluegen/branches/JOGL_2_SANDBOX@135 a78bb65f-1512-4460-ba86-f6dc96a7bf27
Diffstat (limited to 'src/java')
| -rw-r--r-- | src/java/com/sun/gluegen/cgram/types/FunctionSymbol.java | 5 | ||||
| -rw-r--r-- | src/java/com/sun/gluegen/opengl/BuildComposablePipeline.java | 2 | ||||
| -rw-r--r-- | src/java/com/sun/gluegen/opengl/GLEmitter.java | 4 |
3 files changed, 10 insertions, 1 deletions
diff --git a/src/java/com/sun/gluegen/cgram/types/FunctionSymbol.java b/src/java/com/sun/gluegen/cgram/types/FunctionSymbol.java index bc54538..65e172f 100644 --- a/src/java/com/sun/gluegen/cgram/types/FunctionSymbol.java +++ b/src/java/com/sun/gluegen/cgram/types/FunctionSymbol.java @@ -110,6 +110,11 @@ public class FunctionSymbol { } FunctionSymbol other = (FunctionSymbol) arg; + + if(getName()==null && other.getName()!=null) { + return false; + } + return ( (getName() == other.getName() || getName().equals(other.getName())) && type.equals(other.type)); diff --git a/src/java/com/sun/gluegen/opengl/BuildComposablePipeline.java b/src/java/com/sun/gluegen/opengl/BuildComposablePipeline.java index dcfa682..b39e8a1 100644 --- a/src/java/com/sun/gluegen/opengl/BuildComposablePipeline.java +++ b/src/java/com/sun/gluegen/opengl/BuildComposablePipeline.java @@ -613,6 +613,7 @@ public class BuildComposablePipeline */ protected void emitGLIsMethods(PrintWriter output) { emitGLIsMethod(output, "GL"); + emitGLIsMethod(output, "GL3"); emitGLIsMethod(output, "GL2"); emitGLIsMethod(output, "GLES1"); emitGLIsMethod(output, "GLES2"); @@ -641,6 +642,7 @@ public class BuildComposablePipeline */ protected void emitGLGetMethods(PrintWriter output) { emitGLGetMethod(output, "GL"); + emitGLGetMethod(output, "GL3"); emitGLGetMethod(output, "GL2"); emitGLGetMethod(output, "GLES1"); emitGLGetMethod(output, "GLES2"); diff --git a/src/java/com/sun/gluegen/opengl/GLEmitter.java b/src/java/com/sun/gluegen/opengl/GLEmitter.java index d49f9f1..fff9d7e 100644 --- a/src/java/com/sun/gluegen/opengl/GLEmitter.java +++ b/src/java/com/sun/gluegen/opengl/GLEmitter.java @@ -100,7 +100,9 @@ public class GLEmitter extends ProcAddressEmitter } if (isGLFunction || isGLEnumeration) { String renamed = GLExtensionNames.normalize(decl, isGLFunction); - config.addJavaSymbolRename(decl, renamed); + if(!renamed.equals(decl)) { + config.addJavaSymbolRename(decl, renamed); + } } } } |