diff options
author | Sven Gothel <[email protected]> | 2013-05-31 06:34:13 +0200 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2013-05-31 06:34:13 +0200 |
commit | 81afec4e963ac4372dc2b604d6f91237b81ee6f2 (patch) | |
tree | 5dd821981648fe32c5f94d33b5b48aa94b01de86 /src/test/com/jogamp/opengl | |
parent | f650e6b37407aaa3ef6c16e7daf6423103b94ddf (diff) |
GLVersionNumber: Fix vendor version parser; Adapt to GlueGen commit 959d6d83ec26152343d538287c02eeebf0dcf238
Adapt to GlueGen commit 959d6d83ec26152343d538287c02eeebf0dcf238:
- Use only RegExp and cache default (no wrapped whitespace tokenizer)
- String match: Store end-of-match and flag defined components.
- Remove manual parsing, utilize VersionNumber
- No need to look further for 'updated' GL version, (probably the vendor version),
since we utilize the ARB version number as set at creation.
Fix vendor version parser:
- Cut off GL version part of versionString (fixes case where GL version was interpreted as vendor version)
- Loop through remaining string until a valid version number w/ major.minor has been found
Diffstat (limited to 'src/test/com/jogamp/opengl')
-rw-r--r-- | src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLVersionParsing00NEWT.java | 170 |
1 files changed, 170 insertions, 0 deletions
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLVersionParsing00NEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLVersionParsing00NEWT.java new file mode 100644 index 000000000..394772135 --- /dev/null +++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLVersionParsing00NEWT.java @@ -0,0 +1,170 @@ +/** + * Copyright 2013 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 java.io.IOException; + +import org.junit.Assert; +import org.junit.Test; + +import jogamp.opengl.GLVersionNumber; + +import com.jogamp.common.util.VersionNumberString; +import com.jogamp.opengl.test.junit.util.UITestCase; + +public class TestGLVersionParsing00NEWT extends UITestCase { + + public static final String[] glVersionStrings00 = new String[] { + "GL_VERSION_2_1 DummyTool 1.2.3", // 0 + "2.1 Mesa 7.0.3-rc2", + "4.2.12171 Compatibility Profile Context 9.01.8", + "4.2.12198 Compatibility Profile Context 12.102.3.0", + "2.1 Mesa 7.0.3-rc2 post odd", + "4.2.12171 Compatibility Profile Context 9.01.8 post odd", + "4.2.12198 Compatibility Profile Context 12.102.3.0 post odd", + "OpenGL ES 2.0 Mesa 9.1.1", // 7 + "OpenGL ES 2.0 14.10.1", + "OpenGL ES GLSL ES 2.0 14.10.1", // 9 + "OpenGL ES 2.0 3Com L3 11.33.44" // 10 + }; + public static final String[] glVersionStrings01 = new String[] { + "GL_VERSION_2_1 Dummy Tool 1.2", // 0 + "2.1 Mesa 7.12", + "2.1 Mesa 7.12-devel", + "2.1 Mesa 7.12-devel (git-d6c318e)", + "2.1 Mesa 7.12-devel la1 la2 li3", + "4.3.0 NVIDIA 310.32", + "OpenGL ES 2.0 Mesa 9.1", // 6 + "OpenGL ES 2.0 14.10", + "OpenGL ES GLSL ES 2.0 14.10", // 8 + "OpenGL ES 2.0 3Com L3 11.33" // 9 + }; + public static final String[] glVersionStrings02 = new String[] { + "GL_VERSION_2_1", // 0 + "OpenGL ES 2.0", // 1 + "OpenGL ES GLSL ES 2.0" // 2 + }; + + public static final VersionNumberString[] glVersionNumbers = new VersionNumberString[] { + new VersionNumberString(2, 1, 0, glVersionStrings00[0]), + new VersionNumberString(2, 1, 0, glVersionStrings00[1]), + new VersionNumberString(4, 2, 0, glVersionStrings00[2]), + new VersionNumberString(4, 2, 0, glVersionStrings00[3]), + new VersionNumberString(2, 1, 0, glVersionStrings00[4]), + new VersionNumberString(4, 2, 0, glVersionStrings00[5]), + new VersionNumberString(4, 2, 0, glVersionStrings00[6]), + new VersionNumberString(2, 0, 0, glVersionStrings00[7]), + new VersionNumberString(2, 0, 0, glVersionStrings00[8]), + new VersionNumberString(2, 0, 0, glVersionStrings00[9]), + new VersionNumberString(2, 0, 0, glVersionStrings00[10]), + + new VersionNumberString(2, 1, 0, glVersionStrings01[0]), + new VersionNumberString(2, 1, 0, glVersionStrings01[1]), + new VersionNumberString(2, 1, 0, glVersionStrings01[2]), + new VersionNumberString(2, 1, 0, glVersionStrings01[3]), + new VersionNumberString(2, 1, 0, glVersionStrings01[4]), + new VersionNumberString(4, 3, 0, glVersionStrings01[5]), + new VersionNumberString(2, 0, 0, glVersionStrings01[6]), + new VersionNumberString(2, 0, 0, glVersionStrings01[7]), + new VersionNumberString(2, 0, 0, glVersionStrings01[8]), + new VersionNumberString(2, 0, 0, glVersionStrings01[9]), + + new VersionNumberString(2, 1, 0, glVersionStrings02[0]), + new VersionNumberString(2, 0, 0, glVersionStrings02[1]), + new VersionNumberString(2, 0, 0, glVersionStrings02[1]) + }; + public static final VersionNumberString[] glVendorVersionNumbersWithSub = new VersionNumberString[] { + new VersionNumberString(1, 2, 3, glVersionStrings00[0]), + new VersionNumberString(7, 0, 3, glVersionStrings00[1]), + new VersionNumberString(9, 1, 8, glVersionStrings00[2]), + new VersionNumberString(12, 102, 3, glVersionStrings00[3]), + new VersionNumberString(7, 0, 3, glVersionStrings00[4]), + new VersionNumberString(9, 1, 8, glVersionStrings00[5]), + new VersionNumberString(12, 102, 3, glVersionStrings00[6]), + new VersionNumberString(9, 1, 1, glVersionStrings00[7]), + new VersionNumberString(14, 10, 1, glVersionStrings00[8]), + new VersionNumberString(14, 10, 1, glVersionStrings00[9]), + new VersionNumberString(11, 33, 44, glVersionStrings00[10]) + }; + public static final VersionNumberString[] glVendorVersionNumbersNoSub = new VersionNumberString[] { + new VersionNumberString(1, 2, 0, glVersionStrings01[0]), + new VersionNumberString(7, 12, 0, glVersionStrings01[1]), + new VersionNumberString(7, 12, 0, glVersionStrings01[2]), + new VersionNumberString(7, 12, 0, glVersionStrings01[3]), + new VersionNumberString(7, 12, 0, glVersionStrings01[4]), + new VersionNumberString(310, 32, 0, glVersionStrings01[5]), + new VersionNumberString(9, 1, 0, glVersionStrings01[6]), + new VersionNumberString(14, 10, 0, glVersionStrings01[7]), + new VersionNumberString(14, 10, 0, glVersionStrings01[8]), + new VersionNumberString(11, 33, 0, glVersionStrings01[9]) + }; + public static final VersionNumberString[] glVendorVersionNumbersNone = new VersionNumberString[] { + new VersionNumberString(0, 0, 0, glVersionStrings02[0]), + new VersionNumberString(0, 0, 0, glVersionStrings02[1]), + new VersionNumberString(0, 0, 0, glVersionStrings02[2]) + }; + + @Test + public void test01GLVersion() throws InterruptedException { + for(int i=0; i<glVersionNumbers.length; i++) { + final VersionNumberString exp = glVersionNumbers[i]; + final VersionNumberString has = GLVersionNumber.create(exp.getVersionString()); + System.err.println("Test["+i+"]: "+exp+" -> "+has+", define ["+has.hasMajor()+":"+has.hasMinor()+":"+has.hasSub()+"]"); + Assert.assertTrue(has.hasMajor()); + Assert.assertTrue(has.hasMinor()); + Assert.assertTrue(!has.hasSub()); + Assert.assertEquals(exp, has); + } + } + + private void testGLVendorVersionImpl(VersionNumberString[] versionNumberString, boolean withMajor, boolean withMinor, boolean withSub) throws InterruptedException { + for(int i=0; i<versionNumberString.length; i++) { + final VersionNumberString exp = versionNumberString[i]; + final VersionNumberString has = GLVersionNumber.createVendorVersion(exp.getVersionString()); + System.err.println("Test["+withMajor+":"+withMinor+":"+withSub+"]["+i+"]: "+exp+" -> "+has+", define ["+has.hasMajor()+":"+has.hasMinor()+":"+has.hasSub()+"]"); + Assert.assertEquals(withMajor, has.hasMajor()); + Assert.assertEquals(withMinor, has.hasMinor()); + Assert.assertEquals(withSub, has.hasSub()); + Assert.assertEquals(exp, has); + } + } + + @Test + public void test02GLVendorVersion() throws InterruptedException { + testGLVendorVersionImpl(glVendorVersionNumbersWithSub, true, true, true); + testGLVendorVersionImpl(glVendorVersionNumbersNoSub, true, true, false); + testGLVendorVersionImpl(glVendorVersionNumbersNone, false, false, false); + } + + public static void main(String args[]) throws IOException { + String tstname = TestGLVersionParsing00NEWT.class.getName(); + org.junit.runner.JUnitCore.main(tstname); + } + +}
\ No newline at end of file |