diff options
author | Sven Gothel <[email protected]> | 2012-02-22 03:29:09 +0100 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2012-02-22 03:29:09 +0100 |
commit | a5e0661540b7dc6c10112ab8c0d3bc41a7b03080 (patch) | |
tree | 49ee0e7388554477e768545e17cf45ab2892989b /src/jogl/classes/jogamp | |
parent | 3bf2d88a4af2d207c141f93d4aaa0e88ac4057a5 (diff) |
Minor GL/GLContext additions / cleanups (GL_BGRA, isNPOTTextureAvailable())
- Subsume GL_EXT_texture_format_BGRA8888 -> GL,
Added GLContext.isTextureFormatBGRA8888Available()
- Movied generic isNPOTTextureAvailable() from GL -> GLContext, used by GL (desktop),
added simplified impl. in GLES1/GLES2 (false/true)
Diffstat (limited to 'src/jogl/classes/jogamp')
-rw-r--r-- | src/jogl/classes/jogamp/opengl/glu/mipmap/Mipmap.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/jogl/classes/jogamp/opengl/glu/mipmap/Mipmap.java b/src/jogl/classes/jogamp/opengl/glu/mipmap/Mipmap.java index f38b62e37..b74d0a6b8 100644 --- a/src/jogl/classes/jogamp/opengl/glu/mipmap/Mipmap.java +++ b/src/jogl/classes/jogamp/opengl/glu/mipmap/Mipmap.java @@ -149,7 +149,7 @@ public class Mipmap { case( GL2GL3.GL_LUMINANCE ): case( GL2GL3.GL_LUMINANCE_ALPHA ): case( GL2GL3.GL_BGR ): - case( GL2GL3.GL_BGRA ): + case( GL.GL_BGRA ): return( true ); default: return( false ); @@ -227,7 +227,7 @@ public class Mipmap { type == GL2GL3.GL_UNSIGNED_INT_8_8_8_8_REV || type == GL2GL3.GL_UNSIGNED_INT_10_10_10_2 || type == GL2GL3.GL_UNSIGNED_INT_2_10_10_10_REV ) && - (format != GL2GL3.GL_RGBA && format != GL2GL3.GL_BGRA) ) { + (format != GL.GL_RGBA && format != GL.GL_BGRA) ) { return( false ); } return( true ); @@ -411,8 +411,8 @@ public class Mipmap { return( 3 ); case( GL2GL3.GL_LUMINANCE_ALPHA ): return( 2 ); - case( GL2GL3.GL_RGBA ): - case( GL2GL3.GL_BGRA ): + case( GL.GL_RGBA ): + case( GL.GL_BGRA ): return( 4 ); default: return( 1 ); |