diff options
author | Sven Gothel <[email protected]> | 2009-08-01 05:37:29 -0700 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2009-08-01 05:37:29 -0700 |
commit | 4e0a5af0b359b98b26ea3e961d023c658650be6c (patch) | |
tree | ef7ca95b4c74dc5aedf7fcf11b6e4c3b07a6b95f /src/jogl/classes/javax/media/opengl/awt | |
parent | a9439fa3ecd366c419815959daedc030f4b8b4e1 (diff) |
GL3 Related:
- Fix glGetStringi's return type to String
- Fix ExtensionAvailabilityCache:
GL3's glGetStringi for GL_EXTENSIONS
Ensure to add GL_VERSION_2_0 in case version >= 3.0
Ensure to not exceed version 3.0 for non GL3.1 context.
In case of GL 3.1, do not include GL_VERSIONS below 3.0,
since this is a forward compatible context.
- Add Prologue to glGetString, where the ExtensionCache is being
used for GL_EXTENSIONS - if already initialized.
This feature adds backward compatibility for GL3 context on GL_EXTENSION.
+++
General:
Add GLPipelineFactory, a convenient pipeline factory for Debug/Trace and custom ones ..
Change 'void setGL(GL)' to 'GL setGL(GL)', and let it return the successful set GL,
or null.
Diffstat (limited to 'src/jogl/classes/javax/media/opengl/awt')
-rw-r--r-- | src/jogl/classes/javax/media/opengl/awt/GLCanvas.java | 4 | ||||
-rw-r--r-- | src/jogl/classes/javax/media/opengl/awt/GLJPanel.java | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/jogl/classes/javax/media/opengl/awt/GLCanvas.java b/src/jogl/classes/javax/media/opengl/awt/GLCanvas.java index 4282e9985..038d6d280 100644 --- a/src/jogl/classes/javax/media/opengl/awt/GLCanvas.java +++ b/src/jogl/classes/javax/media/opengl/awt/GLCanvas.java @@ -486,11 +486,13 @@ public class GLCanvas extends Canvas implements AWTGLAutoDrawable { return (context == null) ? null : context.getGL(); } - public void setGL(GL gl) { + public GL setGL(GL gl) { GLContext context = getContext(); if (context != null) { context.setGL(gl); + return gl; } + return null; } diff --git a/src/jogl/classes/javax/media/opengl/awt/GLJPanel.java b/src/jogl/classes/javax/media/opengl/awt/GLJPanel.java index 7b942b358..fe55b2dbd 100644 --- a/src/jogl/classes/javax/media/opengl/awt/GLJPanel.java +++ b/src/jogl/classes/javax/media/opengl/awt/GLJPanel.java @@ -404,11 +404,13 @@ public class GLJPanel extends JPanel implements AWTGLAutoDrawable { return (context == null) ? null : context.getGL(); } - public void setGL(GL gl) { + public GL setGL(GL gl) { GLContext context = getContext(); if (context != null) { context.setGL(gl); + return gl; } + return null; } public void setAutoSwapBufferMode(boolean onOrOff) { |