diff options
| author | JOGAMP DEV TEAM <[email protected]> | 2010-04-22 21:12:36 -0400 |
|---|---|---|
| committer | JOGAMP DEV TEAM <[email protected]> | 2010-04-22 21:12:36 -0400 |
| commit | 1d889ddc4728d1534e310b44fad74a2932d22d39 (patch) | |
| tree | 4ad0c3eeb3ef728522ac9459eb12c667301a0c32 /make/config/jogl/gl-common.cfg | |
| parent | 8790075f074013aa3c71b96993838cf1117275f1 (diff) | |
| parent | a588326d206ff32e5ff5db97560851cb9b826022 (diff) | |
Merge branch 'master' of github.com:sgothel/jogl
Diffstat (limited to 'make/config/jogl/gl-common.cfg')
| -rw-r--r-- | make/config/jogl/gl-common.cfg | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/make/config/jogl/gl-common.cfg b/make/config/jogl/gl-common.cfg index d9d66323a..8d726c4bf 100644 --- a/make/config/jogl/gl-common.cfg +++ b/make/config/jogl/gl-common.cfg @@ -8,11 +8,10 @@ RuntimeExceptionType GLException UnsupportedExceptionType GLException # Imports needed by all glue code -Import java.nio.* Import java.util.* Import javax.media.opengl.* Import javax.media.opengl.fixedfunc.* -Import com.sun.opengl.impl.* +Import com.jogamp.opengl.impl.* ##################################################################### # Mostly desktop OpenGL stuff below @@ -389,8 +388,12 @@ ArgumentIsString glTransformFeedbackVaryings 2 # Use cached GL_EXTENSION if possible, # which also allows GL3 compatibility. # -JavaPrologue glGetString if(GL.GL_EXTENSIONS==name && _context.isExtensionCacheInitialized()) { -JavaPrologue glGetString return _context.getGLExtensions(); +JavaPrologue glGetString if(_context.isExtensionCacheInitialized()) { +JavaPrologue glGetString if(GL.GL_EXTENSIONS==name) { +JavaPrologue glGetString return _context.getGLExtensions(); +JavaPrologue glGetString } /* else if(GL.GL_VERSION==name) { +JavaPrologue glGetString return _context.getGLVersion(); +JavaPrologue glGetString } */ JavaPrologue glGetString } # |