diff options
author | Sven Gothel <[email protected]> | 2010-11-07 02:34:19 +0100 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2010-11-07 02:34:19 +0100 |
commit | 55a60c28ca8f501aca0fff8c69b11564518f3a66 (patch) | |
tree | 47d753e313da1de7573eaf23cca4336b70fe195c /src | |
parent | 113319a8de0998fbd8d7357d4e0273f802f9453a (diff) |
Gluegen parts in src/gluegen (clean)
- Adding gluegen-gl.jar for GlueGen GL compile time parts.
- Removed dead build-gluegen.xml
- Adding com/jogamp/gluegen/runtime/opengl/* to jogl core
- Moved gluegen gl part to jogl/classes
Diffstat (limited to 'src')
-rw-r--r-- | src/jogl/classes/com/jogamp/gluegen/opengl/BuildComposablePipeline.java (renamed from src/gluegen/classes/com/jogamp/gluegen/opengl/BuildComposablePipeline.java) | 0 | ||||
-rw-r--r-- | src/jogl/classes/com/jogamp/gluegen/opengl/BuildStaticGLInfo.java (renamed from src/gluegen/classes/com/jogamp/gluegen/opengl/BuildStaticGLInfo.java) | 0 | ||||
-rwxr-xr-x | src/jogl/classes/com/jogamp/gluegen/opengl/GLConfiguration.java (renamed from src/gluegen/classes/com/jogamp/gluegen/opengl/GLConfiguration.java) | 0 | ||||
-rw-r--r-- | src/jogl/classes/com/jogamp/gluegen/opengl/GLEmitter.java (renamed from src/gluegen/classes/com/jogamp/gluegen/opengl/GLEmitter.java) | 0 | ||||
-rwxr-xr-x | src/jogl/classes/com/jogamp/gluegen/opengl/GLJavaMethodBindingEmitter.java (renamed from src/gluegen/classes/com/jogamp/gluegen/opengl/GLJavaMethodBindingEmitter.java) | 0 | ||||
-rw-r--r-- | src/jogl/classes/com/jogamp/gluegen/opengl/ant/StaticGLGenTask.java (renamed from src/gluegen/classes/com/jogamp/gluegen/opengl/ant/StaticGLGenTask.java) | 0 | ||||
-rwxr-xr-x | src/jogl/classes/com/jogamp/gluegen/opengl/nativesig/NativeSignatureEmitter.java (renamed from src/gluegen/classes/com/jogamp/gluegen/opengl/nativesig/NativeSignatureEmitter.java) | 0 | ||||
-rwxr-xr-x | src/jogl/classes/com/jogamp/gluegen/opengl/nativesig/NativeSignatureJavaMethodBindingEmitter.java (renamed from src/gluegen/classes/com/jogamp/gluegen/opengl/nativesig/NativeSignatureJavaMethodBindingEmitter.java) | 14 | ||||
-rw-r--r-- | src/jogl/classes/com/jogamp/gluegen/runtime/opengl/GLExtensionNames.java (renamed from src/gluegen/classes/com/jogamp/gluegen/runtime/opengl/GLExtensionNames.java) | 0 | ||||
-rw-r--r-- | src/jogl/classes/com/jogamp/gluegen/runtime/opengl/GLProcAddressResolver.java (renamed from src/gluegen/classes/com/jogamp/gluegen/runtime/opengl/GLProcAddressResolver.java) | 0 |
10 files changed, 5 insertions, 9 deletions
diff --git a/src/gluegen/classes/com/jogamp/gluegen/opengl/BuildComposablePipeline.java b/src/jogl/classes/com/jogamp/gluegen/opengl/BuildComposablePipeline.java index 1bc5df959..1bc5df959 100644 --- a/src/gluegen/classes/com/jogamp/gluegen/opengl/BuildComposablePipeline.java +++ b/src/jogl/classes/com/jogamp/gluegen/opengl/BuildComposablePipeline.java diff --git a/src/gluegen/classes/com/jogamp/gluegen/opengl/BuildStaticGLInfo.java b/src/jogl/classes/com/jogamp/gluegen/opengl/BuildStaticGLInfo.java index 9946c9df1..9946c9df1 100644 --- a/src/gluegen/classes/com/jogamp/gluegen/opengl/BuildStaticGLInfo.java +++ b/src/jogl/classes/com/jogamp/gluegen/opengl/BuildStaticGLInfo.java diff --git a/src/gluegen/classes/com/jogamp/gluegen/opengl/GLConfiguration.java b/src/jogl/classes/com/jogamp/gluegen/opengl/GLConfiguration.java index 010ca1069..010ca1069 100755 --- a/src/gluegen/classes/com/jogamp/gluegen/opengl/GLConfiguration.java +++ b/src/jogl/classes/com/jogamp/gluegen/opengl/GLConfiguration.java diff --git a/src/gluegen/classes/com/jogamp/gluegen/opengl/GLEmitter.java b/src/jogl/classes/com/jogamp/gluegen/opengl/GLEmitter.java index ad9e47011..ad9e47011 100644 --- a/src/gluegen/classes/com/jogamp/gluegen/opengl/GLEmitter.java +++ b/src/jogl/classes/com/jogamp/gluegen/opengl/GLEmitter.java diff --git a/src/gluegen/classes/com/jogamp/gluegen/opengl/GLJavaMethodBindingEmitter.java b/src/jogl/classes/com/jogamp/gluegen/opengl/GLJavaMethodBindingEmitter.java index be9b7b442..be9b7b442 100755 --- a/src/gluegen/classes/com/jogamp/gluegen/opengl/GLJavaMethodBindingEmitter.java +++ b/src/jogl/classes/com/jogamp/gluegen/opengl/GLJavaMethodBindingEmitter.java diff --git a/src/gluegen/classes/com/jogamp/gluegen/opengl/ant/StaticGLGenTask.java b/src/jogl/classes/com/jogamp/gluegen/opengl/ant/StaticGLGenTask.java index e7a7e1d1c..e7a7e1d1c 100644 --- a/src/gluegen/classes/com/jogamp/gluegen/opengl/ant/StaticGLGenTask.java +++ b/src/jogl/classes/com/jogamp/gluegen/opengl/ant/StaticGLGenTask.java diff --git a/src/gluegen/classes/com/jogamp/gluegen/opengl/nativesig/NativeSignatureEmitter.java b/src/jogl/classes/com/jogamp/gluegen/opengl/nativesig/NativeSignatureEmitter.java index 6f9f9b3bf..6f9f9b3bf 100755 --- a/src/gluegen/classes/com/jogamp/gluegen/opengl/nativesig/NativeSignatureEmitter.java +++ b/src/jogl/classes/com/jogamp/gluegen/opengl/nativesig/NativeSignatureEmitter.java diff --git a/src/gluegen/classes/com/jogamp/gluegen/opengl/nativesig/NativeSignatureJavaMethodBindingEmitter.java b/src/jogl/classes/com/jogamp/gluegen/opengl/nativesig/NativeSignatureJavaMethodBindingEmitter.java index 069ec5b54..a39145739 100755 --- a/src/gluegen/classes/com/jogamp/gluegen/opengl/nativesig/NativeSignatureJavaMethodBindingEmitter.java +++ b/src/jogl/classes/com/jogamp/gluegen/opengl/nativesig/NativeSignatureJavaMethodBindingEmitter.java @@ -42,10 +42,6 @@ package com.jogamp.gluegen.opengl.nativesig; import java.io.*; -import com.jogamp.gluegen.MethodBinding; -import com.jogamp.gluegen.JavaMethodBindingEmitter; -import com.jogamp.gluegen.JavaType; - import com.jogamp.gluegen.*; import com.jogamp.gluegen.cgram.types.*; import com.jogamp.gluegen.opengl.*; @@ -57,8 +53,8 @@ public class NativeSignatureJavaMethodBindingEmitter extends GLJavaMethodBinding super(methodToWrap); } - public NativeSignatureJavaMethodBindingEmitter(ProcAddressJavaMethodBindingEmitter methodToWrap) { - super(methodToWrap, false); + public NativeSignatureJavaMethodBindingEmitter(ProcAddressJavaMethodBindingEmitter methodToWrap, GLEmitter emitter, boolean bufferObjectVariant) { + super(methodToWrap, emitter, bufferObjectVariant); } public NativeSignatureJavaMethodBindingEmitter(JavaMethodBindingEmitter methodToWrap, NativeSignatureEmitter emitter) { @@ -297,14 +293,14 @@ public class NativeSignatureJavaMethodBindingEmitter extends GLJavaMethodBinding // Only one call being made in this body, going to indirect // buffer / array entry point - emitCall(binding, writer, false); + emitCall(binding, writer); if (returnType.isString() || returnType.isNIOByteBuffer()) { writer.print(")"); } writer.print(";"); writer.println(); } else { - emitCall(binding, writer, true); + emitCall(binding, writer); if (returnType.isString() || returnType.isNIOByteBuffer()) { writer.print(")"); } @@ -325,7 +321,7 @@ public class NativeSignatureJavaMethodBindingEmitter extends GLJavaMethodBinding writer.print("return "); } } - emitCall(binding, writer, false); + emitCall(binding, writer); writer.print(";"); writer.println(); writer.println(" }"); diff --git a/src/gluegen/classes/com/jogamp/gluegen/runtime/opengl/GLExtensionNames.java b/src/jogl/classes/com/jogamp/gluegen/runtime/opengl/GLExtensionNames.java index 914036312..914036312 100644 --- a/src/gluegen/classes/com/jogamp/gluegen/runtime/opengl/GLExtensionNames.java +++ b/src/jogl/classes/com/jogamp/gluegen/runtime/opengl/GLExtensionNames.java diff --git a/src/gluegen/classes/com/jogamp/gluegen/runtime/opengl/GLProcAddressResolver.java b/src/jogl/classes/com/jogamp/gluegen/runtime/opengl/GLProcAddressResolver.java index fe9efebc7..fe9efebc7 100644 --- a/src/gluegen/classes/com/jogamp/gluegen/runtime/opengl/GLProcAddressResolver.java +++ b/src/jogl/classes/com/jogamp/gluegen/runtime/opengl/GLProcAddressResolver.java |