From 8e1f5fc43ba84d5e6373f0c29089ac32b7ce95dd Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Fri, 24 Jul 2015 22:51:10 +0200 Subject: Bug 1180: Refine TestMapBufferRead01NEWT, add TestMapBufferRead02NEWT: Add assertion checks and latter test uses FloatBuffer --- .../junit/jogl/acore/TestMapBufferRead01NEWT.java | 74 ++++---- .../junit/jogl/acore/TestMapBufferRead02NEWT.java | 191 +++++++++++++++++++++ 2 files changed, 235 insertions(+), 30 deletions(-) create mode 100644 src/test/com/jogamp/opengl/test/junit/jogl/acore/TestMapBufferRead02NEWT.java (limited to 'src/test/com/jogamp') diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestMapBufferRead01NEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestMapBufferRead01NEWT.java index 1a9260219..21b653c69 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestMapBufferRead01NEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestMapBufferRead01NEWT.java @@ -31,13 +31,15 @@ import com.jogamp.common.nio.Buffers; import com.jogamp.opengl.test.junit.util.NEWTGLContext; import com.jogamp.opengl.test.junit.util.UITestCase; +import static org.junit.Assert.assertEquals; + import java.io.IOException; import java.nio.ByteBuffer; import java.nio.ByteOrder; +import java.nio.FloatBuffer; import com.jogamp.opengl.GL; import com.jogamp.opengl.GL2ES3; -import com.jogamp.opengl.GL2GL3; import com.jogamp.opengl.GLBufferStorage; import com.jogamp.opengl.GLCapabilities; import com.jogamp.opengl.GLProfile; @@ -50,6 +52,9 @@ import org.junit.runners.MethodSorters; /** * Verifies content of buffer storage's content * as well as general buffer- and buffer-storage tracking. + *

+ * Implementation uses ByteBuffer and Buffers or NIO API. + *

* * @author Luz, et.al. */ @@ -63,9 +68,7 @@ public class TestMapBufferRead01NEWT extends UITestCase { System.err.println("Test requires GL2/GL3 profile."); return; } - final ByteBuffer verticiesBB = ByteBuffer.allocate(4*9); - verticiesBB.order(ByteOrder.nativeOrder()); - testWriteRead01(verticiesBB, false /* useRange */); + testWriteRead01(createVerticesBB(false), false /* useRange */); } @Test public void testWriteRead01bMap() throws InterruptedException { @@ -73,8 +76,7 @@ public class TestMapBufferRead01NEWT extends UITestCase { System.err.println("Test requires GL2/GL3 profile."); return; } - final ByteBuffer verticiesBB = Buffers.newDirectByteBuffer(4*9); - testWriteRead01(verticiesBB, false /* useRange */); + testWriteRead01(createVerticesBB(true), false /* useRange */); } @Test @@ -83,9 +85,7 @@ public class TestMapBufferRead01NEWT extends UITestCase { System.err.println("Test requires GL3 or GLES3 profile."); return; } - final ByteBuffer verticiesBB = ByteBuffer.allocate(4*9); - verticiesBB.order(ByteOrder.nativeOrder()); - testWriteRead01(verticiesBB, true/* useRange */); + testWriteRead01(createVerticesBB(false), true/* useRange */); } @Test public void testWriteRead02bMapRange() throws InterruptedException { @@ -93,11 +93,43 @@ public class TestMapBufferRead01NEWT extends UITestCase { System.err.println("Test requires GL3 or GLES3 profile."); return; } - final ByteBuffer verticiesBB = Buffers.newDirectByteBuffer(4*9); - testWriteRead01(verticiesBB, true /* useRange */); + testWriteRead01(createVerticesBB(true), true /* useRange */); + } + + static final float[] vertexData = new float[] { -0.3f, -0.2f, -0.1f, 0.1f, 0.2f, 0.3f, 0.4f, 0.5f, 0.6f }; + + static ByteBuffer createVerticesBB(final boolean useBuffersAPI) { + final ByteBuffer res; + if( useBuffersAPI ) { + res = Buffers.newDirectByteBuffer(Buffers.SIZEOF_FLOAT*vertexData.length); + final FloatBuffer resF = res.asFloatBuffer(); + resF.put(vertexData, 0, vertexData.length).rewind(); + } else { + res = ByteBuffer.allocate(Buffers.SIZEOF_FLOAT*vertexData.length); + res.order(ByteOrder.nativeOrder()); + for(int i=0; i "+bb); System.err.println("gpu-03 GL_ARRAY_BUFFER -> bufferName "+bufferName+" -> "+bufferStorage); diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestMapBufferRead02NEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestMapBufferRead02NEWT.java new file mode 100644 index 000000000..49b158bd1 --- /dev/null +++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestMapBufferRead02NEWT.java @@ -0,0 +1,191 @@ +/** + * 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.jogl.acore; + +import com.jogamp.common.nio.Buffers; +import com.jogamp.opengl.test.junit.util.NEWTGLContext; +import com.jogamp.opengl.test.junit.util.UITestCase; + +import static org.junit.Assert.assertEquals; + +import java.io.IOException; +import java.nio.ByteBuffer; +import java.nio.ByteOrder; +import java.nio.FloatBuffer; + +import com.jogamp.opengl.GL; +import com.jogamp.opengl.GL2ES3; +import com.jogamp.opengl.GLBufferStorage; +import com.jogamp.opengl.GLCapabilities; +import com.jogamp.opengl.GLProfile; + +import org.junit.Assert; +import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; + +/** + * Verifies content of buffer storage's content + * as well as general buffer- and buffer-storage tracking. + *

+ * Implementation uses FloatBuffer and Buffers or NIO API. + *

+ * + * @author Luz, et.al. + */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) +public class TestMapBufferRead02NEWT extends UITestCase { + static final boolean DEBUG = false; + + @Test + public void testWriteRead01aMap() throws InterruptedException { + if(!GLProfile.isAvailable(GLProfile.GL2GL3)) { + System.err.println("Test requires GL2/GL3 profile."); + return; + } + testWriteRead01(createVerticesFB(false), false /* useRange */); + } + @Test + public void testWriteRead01bMap() throws InterruptedException { + if(!GLProfile.isAvailable(GLProfile.GL2GL3)) { + System.err.println("Test requires GL2/GL3 profile."); + return; + } + testWriteRead01(createVerticesFB(true), false /* useRange */); + } + + @Test + public void testWriteRead02aMapRange() throws InterruptedException { + if(!GLProfile.isAvailable(GLProfile.GL3) && !!GLProfile.isAvailable(GLProfile.GLES3)) { + System.err.println("Test requires GL3 or GLES3 profile."); + return; + } + testWriteRead01(createVerticesFB(false), true/* useRange */); + } + @Test + public void testWriteRead02bMapRange() throws InterruptedException { + if(!GLProfile.isAvailable(GLProfile.GL3) && !!GLProfile.isAvailable(GLProfile.GLES3)) { + System.err.println("Test requires GL3 or GLES3 profile."); + return; + } + testWriteRead01(createVerticesFB(true), true /* useRange */); + } + + static final float[] vertexData = new float[] { -0.3f, -0.2f, -0.1f, 0.1f, 0.2f, 0.3f, 0.4f, 0.5f, 0.6f }; + + static FloatBuffer createVerticesFB(final boolean useBuffersAPI) { + final FloatBuffer res; + if( useBuffersAPI ) { + res = Buffers.newDirectFloatBuffer(vertexData); + } else { + res = FloatBuffer.allocate(vertexData.length); + for(int i=0; i bufferName "+bufferName+" -> "+bufferStorage); + Assert.assertEquals("Buffer storage's bytes-buffer not null before map", null, bufferStorage.getMappedBuffer()); + + final int floatOffset, byteOffset, mapByteLength; + final ByteBuffer bb; + if( useRange ) { + floatOffset = 3; + byteOffset = Buffers.SIZEOF_FLOAT*floatOffset; + mapByteLength = Buffers.SIZEOF_FLOAT*verticiesFB.remaining()-byteOffset; + bb = gl.glMapBufferRange(GL.GL_ARRAY_BUFFER, byteOffset, mapByteLength, GL.GL_MAP_READ_BIT); + } else { + floatOffset = 0; + byteOffset = 0; + mapByteLength = Buffers.SIZEOF_FLOAT*verticiesFB.remaining(); + bb = gl.glMapBuffer(GL.GL_ARRAY_BUFFER, GL2ES3.GL_READ_ONLY); + } + System.err.println("gpu-02 mapped GL_ARRAY_BUFFER, floatOffset "+floatOffset+", byteOffset "+byteOffset+", mapByteLength "+mapByteLength+" -> "+bb); + System.err.println("gpu-03 GL_ARRAY_BUFFER -> bufferName "+bufferName+" -> "+bufferStorage); + Assert.assertNotNull(bb); + Assert.assertEquals("BufferStorage size less byteOffset not equals buffer storage size", bufferStorage.getSize()-byteOffset, bb.capacity()); + Assert.assertEquals("BufferStorage's bytes-buffer not equal with mapped bytes-buffer", bufferStorage.getMappedBuffer(), bb); + Assert.assertEquals("Buffer storage size not equals mapByteLength", mapByteLength, bb.remaining()); + + if(DEBUG) { + System.err.println("floatOffset "+floatOffset+", byteOffset "+byteOffset); + for(int i=0; i < bb.remaining(); i+=4) { + System.err.println("gpu "+i+": "+bb.getFloat(i)); + } + } + for(int i=0; i < bb.remaining(); i+=4) { + Assert.assertEquals(verticiesFB.get( (byteOffset+i) / Buffers.SIZEOF_FLOAT ), bb.getFloat(i), 0.0001f); + } + gl.glUnmapBuffer(GL.GL_ARRAY_BUFFER); + Assert.assertEquals("Buffer storage's bytes-buffer not null after unmap", null, bufferStorage.getMappedBuffer()); + } finally { + NEWTGLContext.destroyWindow(winctx); + } + } + public static void main(final String args[]) throws IOException { + final String tstname = TestMapBufferRead02NEWT.class.getName(); + org.junit.runner.JUnitCore.main(tstname); + } +} -- cgit v1.2.3