diff options
author | Sven Gothel <[email protected]> | 2014-01-26 02:14:26 +0100 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2014-01-26 02:14:26 +0100 |
commit | aac4c5fc4ab7c77eff3b71f518100dd182ec2c33 (patch) | |
tree | 3883e6e9a97146a0cbf503ff67f7b58870fe22dd /src | |
parent | ac84afd26ad3b34851a423fb90e6c819b9dc9495 (diff) |
Cleanup Build: GlueGen config files, stub_includes; Add JoclVersion, Android JoclVersionActivity
Cleanup Build:
- Move gluegen config files into make/config (cleanup)
- Move stub_includes into respective folder make/stub_includes
and keep resources 'clean'
JoclVersion:
- Analoge to JoglVersion, replaces JOCLVersion (deprecated for now)
- Added text based CL info dump.
JoclVersionActivity:
- Analog to JoclVersionActivity
- Added full launch .. tested on Android (but no OpenCL avail.)
Diffstat (limited to 'src')
-rw-r--r-- | src/com/jogamp/opencl/CLPlatform.java | 5 | ||||
-rw-r--r-- | src/com/jogamp/opencl/JoclVersion.java | 254 | ||||
-rw-r--r-- | src/com/jogamp/opencl/util/JOCLVersion.java | 32 | ||||
-rw-r--r-- | src/jogamp/opencl/os/android/JoclBaseActivity.java | 183 | ||||
-rw-r--r-- | src/jogamp/opencl/os/android/JoclVersionActivity.java | 73 | ||||
-rw-r--r-- | src/jogamp/opencl/os/android/JoclVersionActivityLauncher.java | 21 | ||||
-rw-r--r-- | src/jogamp/opencl/os/android/MD.java | 32 |
7 files changed, 574 insertions, 26 deletions
diff --git a/src/com/jogamp/opencl/CLPlatform.java b/src/com/jogamp/opencl/CLPlatform.java index 99b2e16d..4015dc26 100644 --- a/src/com/jogamp/opencl/CLPlatform.java +++ b/src/com/jogamp/opencl/CLPlatform.java @@ -49,7 +49,6 @@ import com.jogamp.opencl.util.CLUtil; import com.jogamp.opencl.llb.impl.CLImpl; import com.jogamp.opencl.spi.CLAccessorFactory; import com.jogamp.opencl.util.Filter; -import com.jogamp.opencl.util.JOCLVersion; import java.nio.IntBuffer; import java.util.ArrayList; @@ -168,10 +167,10 @@ public class CLPlatform { } cl = new CLImpl(); }catch(UnsatisfiedLinkError ex) { - System.err.println(JOCLVersion.getAllVersions()); + System.err.println(JoclVersion.getInstance().getAllVersions(null).toString()); throw ex; }catch(Exception ex) { - System.err.println(JOCLVersion.getAllVersions()); + System.err.println(JoclVersion.getInstance().getAllVersions(null).toString()); throw new JogampRuntimeException("JOCL initialization error.", ex); } diff --git a/src/com/jogamp/opencl/JoclVersion.java b/src/com/jogamp/opencl/JoclVersion.java new file mode 100644 index 00000000..206f6356 --- /dev/null +++ b/src/com/jogamp/opencl/JoclVersion.java @@ -0,0 +1,254 @@ +/** + * Copyright 2014 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.opencl; + +import static com.jogamp.common.util.VersionUtil.getPlatformInfo; + +import com.jogamp.common.GlueGenVersion; +import com.jogamp.common.os.Platform; +import com.jogamp.common.util.VersionUtil; +import com.jogamp.common.util.JogampVersion; + +import java.io.PrintWriter; +import java.io.StringWriter; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.jar.Manifest; + +public class JoclVersion extends JogampVersion { + + protected static volatile JoclVersion jogampCommonVersionInfo; + + protected JoclVersion(String packageName, Manifest mf) { + super(packageName, mf); + } + + public static JoclVersion getInstance() { + if(null == jogampCommonVersionInfo) { // volatile: ok + synchronized(JoclVersion.class) { + if( null == jogampCommonVersionInfo ) { + final String packageName = "com.jogamp.opencl"; + final Manifest mf = VersionUtil.getManifest(JoclVersion.class.getClassLoader(), packageName); + jogampCommonVersionInfo = new JoclVersion(packageName, mf); + } + } + } + return jogampCommonVersionInfo; + } + + public StringBuilder getAllVersions(StringBuilder sb) { + if(null==sb) { + sb = new StringBuilder(); + } + + try{ + getPlatformInfo(sb); + sb.append(Platform.getNewline()); + GlueGenVersion.getInstance().toString(sb); + sb.append(Platform.getNewline()); + toString(sb); + sb.append(Platform.getNewline()); + } catch (Exception e) { + sb.append(e.getMessage()); + e.printStackTrace(); + } + + return sb; + } + + private volatile int maxKeyStrlen = -1; + + public StringBuilder getOpenCLTextInfo(StringBuilder sb) { + if(null==sb) { + sb = new StringBuilder(); + } + + final CLPlatform[] platforms; + try { + platforms = CLPlatform.listCLPlatforms(); + } catch (Throwable t) { + final Throwable cause; + { + Throwable pre = null; + Throwable next = t; + while( null != next ) { + pre = next; + next = next.getCause(); + } + cause = pre; + } + System.err.println("CLPlatform.listCLPlatforms() failed, exception: "+cause.getMessage()); + t.printStackTrace(); + sb.append("CLPlatform.listCLPlatforms() failed, exception: "+cause.getMessage()); + StringWriter stackTrace = new StringWriter(); + cause.printStackTrace(new PrintWriter(stackTrace)); + sb.append(stackTrace.toString()); + return sb; + } + + // platforms + final List<Map<String, String>> platProps = new ArrayList<Map<String, String>>(); + if( 0 > maxKeyStrlen ) { + synchronized(this) { + if( 0 > maxKeyStrlen ) { + for (CLPlatform p : platforms) { + platProps.add(p.getProperties()); + final CLDevice[] devices = p.listCLDevices(); + for (CLDevice d : devices) { + final Map<String,String> props = d.getProperties(); + final Set<Map.Entry<String, String>> entries = props.entrySet(); + for(Map.Entry<String, String> e : entries) { + maxKeyStrlen = Math.max(maxKeyStrlen, e.getKey().length()); + } + } + } + } + } + } + sb.append(String.format("PP:DD:EE - Platform (PP), Device (DD), Entry (EE)%n")); + int pI = 0; + for (CLPlatform p : platforms) { + pI++; + platProps.add(p.getProperties()); + CLDevice[] devices = p.listCLDevices(); + int dI = 0; + for (CLDevice d : devices) { + dI++; + final Map<String,String> props = d.getProperties(); + final Set<Map.Entry<String, String>> entries = props.entrySet(); + int eI = 0; + for(Map.Entry<String, String> e : entries) { + eI++; + sb.append(String.format("%02d:%02d:%02d %"+maxKeyStrlen+"s: %s%n", pI, dI, eI, e.getKey(), e.getValue())); + } + } + } + return sb; + } + + public StringBuilder getOpenCLHtmlInfo(StringBuilder sb) { + if(null==sb) { + sb = new StringBuilder(); + } + + final CLPlatform[] platforms; + try { + platforms = CLPlatform.listCLPlatforms(); + } catch (Throwable t) { + final Throwable cause; + { + Throwable pre = null; + Throwable next = t; + while( null != next ) { + pre = next; + next = next.getCause(); + } + cause = pre; + } + System.err.println("CLPlatform.listCLPlatforms() failed, exception: "+cause.getMessage()); + t.printStackTrace(); + sb.append("<pre>CLPlatform.listCLPlatforms() failed, exception: "+cause.getMessage()); + StringWriter stackTrace = new StringWriter(); + cause.printStackTrace(new PrintWriter(stackTrace)); + sb.append(stackTrace.toString()).append("</pre>"); + return sb; + } + sb.append("<table border=\"1\">"); + + // platforms + List<Map<String, String>> platProps = new ArrayList<Map<String, String>>(); + List<Integer> spans = new ArrayList<Integer>(); + for (CLPlatform p : platforms) { + platProps.add(p.getProperties()); + spans.add(p.listCLDevices().length); + } + fillHtmlTable(platProps, spans, sb); + + // devices + ArrayList<Map<String, String>> devProps = new ArrayList<Map<String, String>>(); + for (CLPlatform p : platforms) { + CLDevice[] devices = p.listCLDevices(); + for (CLDevice d : devices) { + devProps.add(d.getProperties()); + } + } + fillHtmlTable(devProps, sb); + sb.append("</table>"); + + return sb; + } + + private static void fillHtmlTable(List<Map<String, String>> properties, StringBuilder sb) { + ArrayList<Integer> spans = new ArrayList<Integer>(properties.size()); + for (int i = 0; i < properties.size(); i++) { + spans.add(1); + } + fillHtmlTable(properties, spans, sb); + } + + private static void fillHtmlTable(List<Map<String, String>> properties, List<Integer> spans, StringBuilder sb) { + boolean header = true; + for (String key : properties.get(0).keySet()) { + sb.append("<tr>"); + htmlCell(sb, key); + int i = 0; + for (Map<String, String> map : properties) { + htmlCell(sb, spans.get(i), map.get(key), header); + i++; + } + sb.append("</tr>"); + header = false; + } + } + + private static void htmlCell(StringBuilder sb, String value) { + sb.append("<td>").append(value).append("</td>"); + } + + private static void htmlCell(StringBuilder sb, int span, String value, boolean header) { + if(header) { + sb.append("<th colspan=\"").append(span).append("\">").append(value).append("</th>"); + }else{ + sb.append("<td colspan=\"").append(span).append("\">").append(value).append("</td>"); + } + } + + public static void main(String args[]) { + System.err.println(VersionUtil.getPlatformInfo()); + System.err.println(GlueGenVersion.getInstance()); + // System.err.println(NativeWindowVersion.getInstance()); + final JoclVersion v = JoclVersion.getInstance(); + System.err.println(v.toString()); + System.err.println(v.getOpenCLTextInfo(null).toString()); + // System.err.println(v.getOpenCLHtmlInfo(null).toString()); + } +} + diff --git a/src/com/jogamp/opencl/util/JOCLVersion.java b/src/com/jogamp/opencl/util/JOCLVersion.java index 48dd2a9e..7ffa3eb6 100644 --- a/src/com/jogamp/opencl/util/JOCLVersion.java +++ b/src/com/jogamp/opencl/util/JOCLVersion.java @@ -3,14 +3,14 @@ * * 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 @@ -20,7 +20,7 @@ * 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. @@ -36,6 +36,7 @@ import com.jogamp.common.os.Platform; import com.jogamp.common.util.JogampVersion; import com.jogamp.common.util.VersionUtil; import com.jogamp.opencl.llb.CL; + import java.security.PrivilegedAction; import java.util.jar.Manifest; @@ -45,6 +46,7 @@ import static com.jogamp.common.util.VersionUtil.*; /** * Utility for querying module versions and environment properties. * @author Michael Bien + * @deprecated Use {@link com.jogamp.opencl.JoclVersion} */ public class JOCLVersion extends JogampVersion { @@ -75,14 +77,10 @@ public class JOCLVersion extends JogampVersion { final StringBuilder sb = new StringBuilder(); try{ - sb.append(getPlatformInfo(null)); + getPlatformInfo(sb); + sb.append(Platform.getNewline()); + GlueGenVersion.getInstance().toString(sb); sb.append(Platform.getNewline()); - }catch(Exception e) { - sb.append(e.getMessage()); - e.printStackTrace(); - } - - try{ createInstance().toString(sb); sb.append(Platform.getNewline()); }catch(Exception e) { @@ -90,18 +88,6 @@ public class JOCLVersion extends JogampVersion { e.printStackTrace(); } - try{ - doPrivileged(new PrivilegedAction<Object>() { - @Override public Object run() { - sb.append(GlueGenVersion.getInstance().toString()); - return null; - } - }); - }catch(Exception e) { - sb.append(e.getMessage()); - e.printStackTrace(); - } - return sb.toString(); } diff --git a/src/jogamp/opencl/os/android/JoclBaseActivity.java b/src/jogamp/opencl/os/android/JoclBaseActivity.java new file mode 100644 index 00000000..207f5192 --- /dev/null +++ b/src/jogamp/opencl/os/android/JoclBaseActivity.java @@ -0,0 +1,183 @@ +/** + * Copyright 2014 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 jogamp.opencl.os.android; + +import android.app.Activity; +import android.content.Context; +import android.os.Bundle; +import android.util.Log; +import android.view.WindowManager; + +public class JoclBaseActivity extends Activity { + boolean isDelegatedActivity; + Activity rootActivity; + boolean setThemeCalled = false; + + public JoclBaseActivity() { + super(); + isDelegatedActivity = false; + rootActivity = this; + } + + public void setRootActivity(Activity rootActivity) { + this.rootActivity = rootActivity; + this.isDelegatedActivity = this != rootActivity; + } + + public final boolean isDelegatedActivity() { + return isDelegatedActivity; + } + + public final Activity getActivity() { + return rootActivity; + } + + /** + * Convenient method to set the Android window's flags to fullscreen or size-layout depending on the given NEWT window. + * <p> + * Must be called before creating the view and adding any content, i.e. setContentView() ! + * </p> + * @param androidWindow + * @param newtWindow + */ + public void setFullscreenFeature(android.view.Window androidWindow, boolean fullscreen) { + if(null == androidWindow) { + throw new IllegalArgumentException("Android or Window null"); + } + + if( fullscreen ) { + androidWindow.requestFeature(android.view.Window.FEATURE_NO_TITLE); + androidWindow.addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN); + androidWindow.clearFlags(WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN); + } else { + androidWindow.addFlags(WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN); + androidWindow.clearFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN); + } + } + + /** + * Convenient method to set this context's theme to transparency. + * <p> + * Must be called before creating the view and adding any content, i.e. setContentView() ! + * </p> + * <p> + * Is normally issued by {@link #setContentView(android.view.Window, Window)} + * if the requested NEWT Capabilities ask for transparency. + * </p> + * <p> + * Can be called only once. + * </p> + */ + public void setTransparencyTheme() { + if(!setThemeCalled) { + setThemeCalled = true; + final Context ctx = getActivity().getApplicationContext(); + final String frn = ctx.getPackageName()+":style/Theme.Transparent"; + final int resID = ctx.getResources().getIdentifier("Theme.Transparent", "style", ctx.getPackageName()); + if(0 == resID) { + Log.d(MD.TAG, "SetTransparencyTheme: Resource n/a: "+frn); + } else { + Log.d(MD.TAG, "SetTransparencyTheme: Setting style: "+frn+": 0x"+Integer.toHexString(resID)); + ctx.setTheme(resID); + } + } + } + + @Override + public android.view.Window getWindow() { + if( isDelegatedActivity() ) { + return getActivity().getWindow(); + } else { + return super.getWindow(); + } + } + + @Override + public void onCreate(Bundle savedInstanceState) { + Log.d(MD.TAG, "onCreate.0"); + if(!isDelegatedActivity()) { + super.onCreate(savedInstanceState); + } + jogamp.common.os.android.StaticContext.init(rootActivity.getApplicationContext()); + Log.d(MD.TAG, "onCreate.X"); + } + + @Override + public void onStart() { + Log.d(MD.TAG, "onStart.0"); + if(!isDelegatedActivity()) { + super.onStart(); + } + Log.d(MD.TAG, "onStart.X"); + } + + @Override + public void onRestart() { + Log.d(MD.TAG, "onRestart.0"); + if(!isDelegatedActivity()) { + super.onRestart(); + } + Log.d(MD.TAG, "onRestart.X"); + } + + @Override + public void onResume() { + Log.d(MD.TAG, "onResume.0"); + if(!isDelegatedActivity()) { + super.onResume(); + } + Log.d(MD.TAG, "onResume.X"); + } + + @Override + public void onPause() { + Log.d(MD.TAG, "onPause.0"); + if( !isDelegatedActivity() ) { + super.onPause(); + } + Log.d(MD.TAG, "onPause.X"); + } + + @Override + public void onStop() { + Log.d(MD.TAG, "onStop.0"); + if( !isDelegatedActivity() ) { + super.onStop(); + } + Log.d(MD.TAG, "onStop.X"); + } + + @Override + public void onDestroy() { + Log.d(MD.TAG, "onDestroy.0"); + if(!isDelegatedActivity()) { + super.onDestroy(); + } + Log.d(MD.TAG, "onDestroy.X"); + } +} diff --git a/src/jogamp/opencl/os/android/JoclVersionActivity.java b/src/jogamp/opencl/os/android/JoclVersionActivity.java new file mode 100644 index 00000000..3f7a5fb0 --- /dev/null +++ b/src/jogamp/opencl/os/android/JoclVersionActivity.java @@ -0,0 +1,73 @@ +/** + * Copyright 2014 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 jogamp.opencl.os.android; + +import com.jogamp.common.GlueGenVersion; +import com.jogamp.common.os.Platform; +import com.jogamp.common.util.VersionUtil; +import com.jogamp.opencl.JoclVersion; + +import android.os.Bundle; +import android.util.Log; +import android.view.Window; +import android.view.WindowManager; +import android.widget.ScrollView; +import android.widget.TextView; + +public class JoclVersionActivity extends JoclBaseActivity { + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + setFullscreenFeature(getWindow(), true); + + final Window androidWindow = getWindow(); + androidWindow.requestFeature(android.view.Window.FEATURE_NO_TITLE); + androidWindow.addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN); + androidWindow.clearFlags(WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN); + + final android.view.ViewGroup viewGroup = new android.widget.FrameLayout(getActivity().getApplicationContext()); + getWindow().setContentView(viewGroup); + + final TextView tv = new TextView(getActivity()); + final ScrollView scroller = new ScrollView(getActivity()); + scroller.addView(tv); + setContentView(scroller); + + final JoclVersion joclVersion = JoclVersion.getInstance(); + final String info1 = "JOCL Version Info"+Platform.NEWLINE+ + VersionUtil.getPlatformInfo()+Platform.NEWLINE+ + GlueGenVersion.getInstance()+Platform.NEWLINE+ + joclVersion.toString()+Platform.NEWLINE+ + joclVersion.getOpenCLTextInfo(null).toString()+Platform.NEWLINE; + tv.setText(info1); + + Log.d(MD.TAG, "onCreate - X"); + } +} diff --git a/src/jogamp/opencl/os/android/JoclVersionActivityLauncher.java b/src/jogamp/opencl/os/android/JoclVersionActivityLauncher.java new file mode 100644 index 00000000..4080250d --- /dev/null +++ b/src/jogamp/opencl/os/android/JoclVersionActivityLauncher.java @@ -0,0 +1,21 @@ +package jogamp.opencl.os.android; + +import android.app.Activity; +import android.content.Intent; +import android.net.Uri; +import android.os.Bundle; +import android.util.Log; + +public class JoclVersionActivityLauncher extends Activity { + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + final Uri uri = Uri.parse("launch://jogamp.org/jogamp.opencl.os.android.JoclVersionActivity?sys=com.jogamp.common&sys=javax.media.opengl&sys=com.jogamp.opencl&pkg=com.jogamp.opencl.test&jogamp.debug=all&jocl.debug=all"); + final Intent intent = new Intent("org.jogamp.launcher.action.LAUNCH_ACTIVITY_NORMAL", uri); + Log.d(getClass().getSimpleName(), "Launching Activity: "+intent); + startActivity (intent); + + finish(); // done + } +} diff --git a/src/jogamp/opencl/os/android/MD.java b/src/jogamp/opencl/os/android/MD.java new file mode 100644 index 00000000..8adb40e9 --- /dev/null +++ b/src/jogamp/opencl/os/android/MD.java @@ -0,0 +1,32 @@ +/** + * Copyright 2014 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 jogamp.opencl.os.android; + +public class MD { + public static final String TAG = "JogAmp.JOCL"; +} |