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/javax/media/opengl/awt/GLJPanel.java | |
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/javax/media/opengl/awt/GLJPanel.java')
-rw-r--r-- | src/jogl/classes/javax/media/opengl/awt/GLJPanel.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/jogl/classes/javax/media/opengl/awt/GLJPanel.java b/src/jogl/classes/javax/media/opengl/awt/GLJPanel.java index 4ccd3c97c..cd9136e76 100644 --- a/src/jogl/classes/javax/media/opengl/awt/GLJPanel.java +++ b/src/jogl/classes/javax/media/opengl/awt/GLJPanel.java @@ -864,13 +864,13 @@ public void reshape(int x, int y, int width, int height) { switch (awtFormat) { case BufferedImage.TYPE_3BYTE_BGR: glFormat = GL2.GL_BGR; - glType = GL2.GL_UNSIGNED_BYTE; + glType = GL.GL_UNSIGNED_BYTE; readBackBytes = ByteBuffer.allocate(readBackWidthInPixels * readBackHeightInPixels * 3); break; case BufferedImage.TYPE_INT_RGB: case BufferedImage.TYPE_INT_ARGB: - glFormat = GL2.GL_BGRA; + glFormat = GL.GL_BGRA; glType = getGLPixelType(); readBackInts = IntBuffer.allocate(readBackWidthInPixels * readBackHeightInPixels); break; |