diff options
author | Wade Walker <[email protected]> | 2011-01-25 09:45:09 -0600 |
---|---|---|
committer | Wade Walker <[email protected]> | 2011-01-25 09:53:36 -0600 |
commit | dae2f33848a60003096681ae18e719aee9936112 (patch) | |
tree | b3c53776c9004c532f36492cba4b20fb60b8674c /src | |
parent | 64a500413de7b3d1ddcece1256d1f28601d6ec0d (diff) |
Fix bug 463 where gluScaleImage consumes all memory
Changes the Type_Widget.java constructor to allocate a normal
buffer instead of a direct buffer. Apparently JVMs can't
allocate small direct buffers efficiently, and since Type_Widget
is called inside tight loops millions of times, we can't afford
to do it this way. This commit restores it to how it was in JOGL 1.
Diffstat (limited to 'src')
-rw-r--r-- | src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Type_Widget.java | 4 | ||||
-rw-r--r-- | src/test/com/jogamp/opengl/test/junit/glu/TestBug463ScaleImageMemoryAWT.java | 114 |
2 files changed, 117 insertions, 1 deletions
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Type_Widget.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Type_Widget.java index b329840ef..0aeca8f1c 100644 --- a/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Type_Widget.java +++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Type_Widget.java @@ -56,7 +56,9 @@ public class Type_Widget { /** Creates a new instance of Type_Widget */ public Type_Widget() { - buffer = ByteBuffer.allocateDirect( 4 ); + // can't make this direct, because JVM doesn't allocate small direct buffers efficiently + // see https://jogamp.org/bugzilla/show_bug.cgi?id=463 for details + buffer = ByteBuffer.allocate( 4 ); } public void setUB0( byte b ) { diff --git a/src/test/com/jogamp/opengl/test/junit/glu/TestBug463ScaleImageMemoryAWT.java b/src/test/com/jogamp/opengl/test/junit/glu/TestBug463ScaleImageMemoryAWT.java new file mode 100644 index 000000000..b523269bb --- /dev/null +++ b/src/test/com/jogamp/opengl/test/junit/glu/TestBug463ScaleImageMemoryAWT.java @@ -0,0 +1,114 @@ +/** + * Copyright 2011 JogAmp Community. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are + * permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * The views and conclusions contained in the software and documentation are those of the + * authors and should not be interpreted as representing official policies, either expressed + * or implied, of JogAmp Community. + */ + +package com.jogamp.opengl.test.junit.glu; + +import java.awt.Frame; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; +import java.nio.ByteBuffer; + +import javax.media.opengl.GL; +import javax.media.opengl.GLAutoDrawable; +import javax.media.opengl.GLCapabilities; +import javax.media.opengl.GLEventListener; +import javax.media.opengl.GLProfile; +import javax.media.opengl.awt.GLCanvas; +import javax.media.opengl.glu.gl2.GLUgl2; + +import org.junit.Test; + +/** + * Tests for bug 463, where gluScaleImage uses up all system memory. This was due to creating millions of + * 4-byte direct buffer objects inside the tight loops of Image.fill_image() and Image.empty_image(). Since + * the JVM apparently can only allocate direct buffer in 4MB chunks, each 4-byte buffer cost us a million times + * the memory it should have. Changing the constructor of Type_Widget.java back to non-direct buffer (like it + * was in JOGL 1) solves the problem. + * @author Wade Walker + */ +public class TestBug463ScaleImageMemoryAWT implements GLEventListener { + + @Override + public void init(GLAutoDrawable drawable) { + } + + @Override + public void display(GLAutoDrawable drawable) { + int widthin = 559; + int heightin = 425; + + int widthout = 1024; + int heightout = 512; + + int textureInLength = widthin * heightin * 4; + int textureOutLength = widthout * heightout * 4; + + byte[] datain = new byte[textureInLength]; + byte[] dataout = new byte[textureOutLength]; + + ByteBuffer bufferIn = ByteBuffer.wrap(datain); + ByteBuffer bufferOut = ByteBuffer.wrap(dataout); + GLUgl2 glu = new GLUgl2(); + // in the failing case, the system would run out of memory in here + glu.gluScaleImage( GL.GL_RGBA, + widthin, heightin, GL.GL_UNSIGNED_BYTE, bufferIn, + widthout, heightout, GL.GL_UNSIGNED_BYTE, bufferOut ); + } + + @Override + public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height) { + } + + + @Override + public void dispose(GLAutoDrawable drawable) { + } + + @Test + public void test01() { + Frame frame = new Frame("Test"); + GLProfile glprofile = GLProfile.getDefault(); + GLCapabilities glCapabilities = new GLCapabilities(glprofile); + final GLCanvas canvas = new GLCanvas(glCapabilities); + frame.setSize(256, 256); + frame.add(canvas); + frame.setVisible( true ); + canvas.addGLEventListener( this ); + + frame.addWindowListener(new WindowAdapter() { + public void windowClosing( WindowEvent e ) { + System.exit(0); + } + }); + canvas.display(); + } + + public static void main(String args[]) { + org.junit.runner.JUnitCore.main(TestBug463ScaleImageMemoryAWT.class.getName()); + } +} |