From b83ed843310f74655493ceefb2ee0e5420d1fe28 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Thu, 4 May 2023 17:25:25 +0200 Subject: Add ALVersion, i.e. retrieve vendor, renderer, version and vendor-version. Test against OpenAL-Soft data >= 1.23.0 --- src/java/com/jogamp/openal/ALVersion.java | 152 ++++++++++++++++++++++++++++ src/java/com/jogamp/openal/JoalVersion.java | 79 +++++++++++++-- 2 files changed, 220 insertions(+), 11 deletions(-) create mode 100644 src/java/com/jogamp/openal/ALVersion.java (limited to 'src/java/com') diff --git a/src/java/com/jogamp/openal/ALVersion.java b/src/java/com/jogamp/openal/ALVersion.java new file mode 100644 index 0000000..b0eaf2e --- /dev/null +++ b/src/java/com/jogamp/openal/ALVersion.java @@ -0,0 +1,152 @@ +/** + * Copyright 2023 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.openal; + +import com.jogamp.common.os.Platform; +import com.jogamp.common.util.VersionNumber; +import com.jogamp.common.util.VersionNumberString; + +public class ALVersion { + private final String vendor; + private final String renderer; + private final VersionNumberString version; + private final VersionNumberString vendorVersion; + + /** + * Returns the optional vendor version at the end of the + * AL_VERSION string if exists, otherwise the {@link VersionNumberString#zeroVersion zero version} instance. + * 
+     *   1.1.0 (1.1 ALSOFT 1.23.1)
+     *
+ */ + private static final VersionNumberString getVendorVersion(final VersionNumberString version) { + // Skip the 1st AL version + String str = version.getVersionString().substring(version.endOfStringMatch()).trim(); + while ( str.length() > 0 ) { + final VersionNumberString vv = new VersionNumberString(str, VersionNumber.getDefaultVersionNumberPattern()); + final int eosm = vv.endOfStringMatch(); + if( 0 < eosm ) { + if( vv.hasMajor() && vv.hasMinor() ) { // Requires at least a defined major and minor version component! + return vv; + } + str = str.substring( eosm ).trim(); + } else { + break; // no match + } + } + return VersionNumberString.zeroVersion; + } + + /** + * ALVersion Ctor + *

+ * The given {@link AL} is being used and assumed having a current {@link ALCcontext}, + * w/o any resources being allocated. + *

+ * @param al {@link AL} instance with a current {@link ALCcontext}. + */ + public ALVersion(final AL al) { + vendor = al.alGetString(ALConstants.AL_VENDOR); + renderer = al.alGetString(ALConstants.AL_RENDERER); + version = new VersionNumberString(al.alGetString(ALConstants.AL_VERSION)); + vendorVersion = getVendorVersion(version); + } + + /** + * ALVersion Ctor + *

+ * The given {@link ALC} is being used and {@Link ALCdevice} and {@link ALCcontext} are allocated, + * made current and finally being released. + *

+ * @param alc static {@link ALC} instance + */ + public ALVersion(final ALC alc) { + final ALCdevice device = alc.alcOpenDevice(null); + final ALCcontext context = alc.alcCreateContext(device, null); + alc.alcMakeContextCurrent(context); + final AL al = ALFactory.getAL(); // valid after makeContextCurrent(..) + vendor = al.alGetString(ALConstants.AL_VENDOR); + renderer = al.alGetString(ALConstants.AL_RENDERER); + version = new VersionNumberString(al.alGetString(ALConstants.AL_VERSION)); + vendorVersion = getVendorVersion(version); + alc.alcMakeContextCurrent(null); + alc.alcDestroyContext(context); + alc.alcCloseDevice(device); + } + + /** + * Return the AL context implementation vendor. + */ + public String getVendor() { return vendor; } + + /** + * Return the AL context implementation renderer. + */ + public String getRenderer() { return renderer; } + + /** + * Return the AL context implementation version. + */ + public VersionNumberString getVersion() { return version; } + + /** + * Returns the optional vendor version at the end of the + * AL_VERSION string if exists, otherwise the {@link VersionNumberString#zeroVersion zero version} instance. + * 
+     *   1.1.0 (1.1 ALSOFT 1.23.1)
+     *
+ */ + public VersionNumberString getVendorVersion() { return vendorVersion; } + + @Override + public String toString() { + return toString(false, null).toString(); + } + + public StringBuilder toString(final boolean withNewline, StringBuilder sb) { + if( null == sb ) { + sb = new StringBuilder(); + } + if( withNewline ) { + sb.append("AL_VENDOR ").append(getVendor()); + sb.append(Platform.getNewline()); + sb.append("AL_RENDERER ").append(getRenderer()); + sb.append(Platform.getNewline()); + sb.append("AL_VERSION ").append(getVersion()); + sb.append(Platform.getNewline()); + sb.append("AL_VENDOR_VERS ").append(getVendorVersion()); + sb.append(Platform.getNewline()); + } else { + sb.append("vendor ").append(getVendor()); + sb.append(", renderer ").append(getRenderer()); + sb.append(", version ").append(getVersion()); + sb.append(", vendorVersion ").append(getVendorVersion()); + } + return sb; + } +} diff --git a/src/java/com/jogamp/openal/JoalVersion.java b/src/java/com/jogamp/openal/JoalVersion.java index 0d756cc..2892082 100644 --- a/src/java/com/jogamp/openal/JoalVersion.java +++ b/src/java/com/jogamp/openal/JoalVersion.java @@ -1,5 +1,5 @@ /** - * Copyright 2013 JogAmp Community. All rights reserved. + * Copyright 2013-2023 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: @@ -56,24 +56,79 @@ public class JoalVersion extends JogampVersion { return jogampCommonVersionInfo; } - public StringBuilder toString(StringBuilder sb) { + public StringBuilder getBriefOSALBuildInfo(StringBuilder sb) { + if(null==sb) { + sb = new StringBuilder(); + } + sb.append("OS: ").append(Platform.getOSName()).append(", version ").append(Platform.getOSVersion()).append(", arch ").append(Platform.getArchName()); + sb.append(Platform.getNewline()); + sb.append("JOAL GIT sha1 ").append(getImplementationCommit()); + sb.append(Platform.getNewline()); + return sb; + } + + /** + * Return {@link JogampVersion} package information and AL informal strings. + *

+ * The given {@link ALC} is being used and {@Link ALCdevice} and {@link ALCcontext} are allocated, + * made current and finally being released. + *

+ * @param alc static {@link ALC} instance + * @param sb optional StringBuffer to be reused + */ + public StringBuilder toString(final ALC alc, StringBuilder sb) { sb = super.toString(sb).append(Platform.getNewline()); - // getGLInfo(gl, sb); + getALStrings(alc, sb); return sb; } - public String toString() { - return toString(null).toString(); + /** + * Return {@link JogampVersion} package information and AL informal strings. + *

+ * The given {@link ALC} is being used and {@Link ALCdevice} and {@link ALCcontext} are allocated, + * made current and finally being released. + *

+ * @param alc static {@link ALC} instance + */ + public String toString(final ALC alc) { + return toString(alc, null).toString(); } - public StringBuilder getBriefOSALBuildInfo(StringBuilder sb) { - if(null==sb) { + /** + * Return AL informal strings. + *

+ * The given {@link ALC} is being used and {@Link ALCdevice} and {@link ALCcontext} are allocated, + * made current and finally being released. + *

+ * @param alc static {@link ALC} instance + */ + public StringBuilder getALStrings(final ALC alc, StringBuilder sb) { + if( null == sb ) { sb = new StringBuilder(); } - sb.append("OS: ").append(Platform.getOSName()).append(", version ").append(Platform.getOSVersion()).append(", arch ").append(Platform.getArchName()); - sb.append(Platform.getNewline()); - sb.append("JOAL GIT sha1 ").append(getImplementationCommit()); + final ALCdevice device = alc.alcOpenDevice(null); + final ALCcontext context = alc.alcCreateContext(device, null); + alc.alcMakeContextCurrent(context); + final AL al = ALFactory.getAL(); // valid after makeContextCurrent(..) + final ALVersion alv = new ALVersion(al); + + alv.toString(true, sb); + sb.append("AL_EXTENSIONS ").append(al.alGetString(ALConstants.AL_EXTENSIONS)); sb.append(Platform.getNewline()); + { + final int[] iversion = { 0, 0 }; + alc.alcGetIntegerv(device, ALCConstants.ALC_MAJOR_VERSION, 1, iversion, 0); + alc.alcGetIntegerv(device, ALCConstants.ALC_MINOR_VERSION, 1, iversion, 1); + sb.append("ALC_VERSION ").append(iversion[0]).append(".").append(iversion[1]); + sb.append(Platform.getNewline()); + sb.append("ALC_DEF_OUTPUT ").append(alc.alcGetString(device, ALCConstants.ALC_DEFAULT_DEVICE_SPECIFIER)); + sb.append(Platform.getNewline()); + sb.append("ALC_DEF_CAPTURE ").append(alc.alcGetString(device, ALCConstants.ALC_CAPTURE_DEFAULT_DEVICE_SPECIFIER)); + sb.append(Platform.getNewline()); + } + alc.alcMakeContextCurrent(null); + alc.alcDestroyContext(context); + alc.alcCloseDevice(device); return sb; } @@ -81,7 +136,9 @@ public class JoalVersion extends JogampVersion { System.err.println(VersionUtil.getPlatformInfo()); System.err.println(GlueGenVersion.getInstance()); // System.err.println(NativeWindowVersion.getInstance()); - System.err.println(JoalVersion.getInstance()); + // System.err.println(JoalVersion.getInstance()); + System.err.println(JoalVersion.getInstance().toString(ALFactory.getALC())); + } } -- cgit v1.2.3