diff options
| author | Sven Gothel <[email protected]> | 2013-09-07 16:50:39 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2013-09-07 16:50:39 +0200 |
| commit | 42500210d8a8626ee6c3c1b169eaa9e5fbf85a21 (patch) | |
| tree | 147bc80a9c6095cd6022fed5198a971d5e491342 /src/jogl/classes/com/jogamp/opengl/util | |
| parent | 4b5e77961d1c660f3537f4041fc1a3ce47ef105c (diff) | |
Complete commit 54dcdf1f53c9fc1f7124cf77bbf5aa952d42053a, exposing GL2ES3 in GLProfile (just a query, no new profile)
Diffstat (limited to 'src/jogl/classes/com/jogamp/opengl/util')
| -rw-r--r-- | src/jogl/classes/com/jogamp/opengl/util/awt/AWTGLReadBufferUtil.java | 11 | ||||
| -rw-r--r-- | src/jogl/classes/com/jogamp/opengl/util/texture/TextureIO.java | 6 |
2 files changed, 5 insertions, 12 deletions
diff --git a/src/jogl/classes/com/jogamp/opengl/util/awt/AWTGLReadBufferUtil.java b/src/jogl/classes/com/jogamp/opengl/util/awt/AWTGLReadBufferUtil.java index 092e2abf0..e85f04092 100644 --- a/src/jogl/classes/com/jogamp/opengl/util/awt/AWTGLReadBufferUtil.java +++ b/src/jogl/classes/com/jogamp/opengl/util/awt/AWTGLReadBufferUtil.java @@ -46,20 +46,13 @@ public class AWTGLReadBufferUtil extends GLReadBufferUtil { * @param alpha */ public AWTGLReadBufferUtil(GLProfile glp, boolean alpha) { - super(new AWTGLPixelBuffer.AWTGLPixelBufferProvider( glp.isGL2GL3() || glp.isGL3ES3() /* allowRowStride */ ), alpha, false); + super(new AWTGLPixelBuffer.AWTGLPixelBufferProvider( glp.isGL2ES3() /* allowRowStride */ ), alpha, false); } public AWTGLPixelBuffer getAWTGLPixelBuffer() { return (AWTGLPixelBuffer)this.getPixelBuffer(); } public BufferedImage readPixelsToBufferedImage(GL gl, boolean awtOrientation) { - if( readPixels(gl, awtOrientation) ) { - final BufferedImage image = getAWTGLPixelBuffer().image; - if( getTextureData().getMustFlipVertically() ) { - ImageUtil.flipImageVertically(image); - } - return image; - } - return null; + return readPixelsToBufferedImage(gl, 0, 0, 0, 0, awtOrientation); } public BufferedImage readPixelsToBufferedImage(GL gl, int inX, int inY, int inWidth, int inHeight, boolean awtOrientation) { if( readPixels(gl, inX, inY, inWidth, inHeight, awtOrientation) ) { diff --git a/src/jogl/classes/com/jogamp/opengl/util/texture/TextureIO.java b/src/jogl/classes/com/jogamp/opengl/util/texture/TextureIO.java index df8ac5934..3748cd336 100644 --- a/src/jogl/classes/com/jogamp/opengl/util/texture/TextureIO.java +++ b/src/jogl/classes/com/jogamp/opengl/util/texture/TextureIO.java @@ -1125,7 +1125,7 @@ public class TextureIO { pixelFormat = image.getGLFormat(); } if (internalFormat == 0) { - if(glp.isGL2GL3()) { + if(glp.isGL2ES3()) { internalFormat = (image.getBytesPerPixel()==4)?GL.GL_RGBA8:GL.GL_RGB8; } else { internalFormat = (image.getBytesPerPixel()==4)?GL.GL_RGBA:GL.GL_RGB; @@ -1162,7 +1162,7 @@ public class TextureIO { pixelFormat = image.getGLFormat(); } if (internalFormat == 0) { - if(glp.isGL2GL3()) { + if(glp.isGL2ES3()) { internalFormat = (image.getBytesPerPixel()==4)?GL.GL_RGBA8:GL.GL_RGB8; } else { internalFormat = (image.getBytesPerPixel()==4)?GL.GL_RGBA:GL.GL_RGB; @@ -1199,7 +1199,7 @@ public class TextureIO { pixelFormat = image.getGLFormat(); } if (internalFormat == 0) { - if(glp.isGL2GL3()) { + if(glp.isGL2ES3()) { internalFormat = (image.getBytesPerPixel()==4)?GL.GL_RGBA8:GL.GL_RGB8; } else { internalFormat = (image.getBytesPerPixel()==4)?GL.GL_RGBA:GL.GL_RGB; |