From 4fb6e9530619768d071d127a3f1c217b38711607 Mon Sep 17 00:00:00 2001
From: Gary Frost <frost.gary@gmail.com>
Date: Wed, 24 Oct 2012 19:00:12 +0000
Subject: [PATCH]
---
examples/nbody/nbody.bat | 1 +
samples/convolution/conv.bat | 1 +
samples/life/life.bat | 1 +
samples/mandel/mandel.bat | 4 +--
.../com/amd/aparapi/sample/mandel/Main.java | 29 ++++++++++++-------
5 files changed, 23 insertions(+), 13 deletions(-)
diff --git a/examples/nbody/nbody.bat b/examples/nbody/nbody.bat
index b698fba0..967350bc 100644
--- a/examples/nbody/nbody.bat
+++ b/examples/nbody/nbody.bat
@@ -4,6 +4,7 @@ java ^
-Djava.library.path=..\..\com.amd.aparapi.jni\dist;jogamp ^
-Dcom.amd.aparapi.executionMode=%1 ^
-Dcom.amd.aparapi.enableProfiling=false ^
+ -Dcom.amd.aparapi.enableShowGeneratedOpenCL=true ^
-Dbodies=%2 ^
-Dheight=600 ^
-Dwidth=600 ^
diff --git a/samples/convolution/conv.bat b/samples/convolution/conv.bat
index 6c949bed..3d11f2de 100644
--- a/samples/convolution/conv.bat
+++ b/samples/convolution/conv.bat
@@ -1,6 +1,7 @@
java ^
-Djava.library.path=../../com.amd.aparapi.jni/dist ^
-Dcom.amd.aparapi.executionMode=%1 ^
+ -Dcom.amd.aparapi.enableShowGeneratedOpenCL=true ^
-classpath ../../com.amd.aparapi/dist/aparapi.jar;convolution.jar ^
com.amd.aparapi.sample.convolution.Convolution %2
diff --git a/samples/life/life.bat b/samples/life/life.bat
index 61f894b3..f5ae763f 100644
--- a/samples/life/life.bat
+++ b/samples/life/life.bat
@@ -4,6 +4,7 @@ java ^
-Dcom.amd.aparapi.executionMode=%1 ^
-Dcom.amd.aparapi.enableProfiling=false ^
-Dcom.amd.aparapi.enableVerboseJNI=false ^
+ -Dcom.amd.aparapi.enableShowGeneratedOpenCL=true ^
-classpath ../../com.amd.aparapi/dist/aparapi.jar;life.jar ^
com.amd.aparapi.sample.life.Main
diff --git a/samples/mandel/mandel.bat b/samples/mandel/mandel.bat
index 42d0f383..22609363 100644
--- a/samples/mandel/mandel.bat
+++ b/samples/mandel/mandel.bat
@@ -1,10 +1,10 @@
java ^
-Djava.library.path=../../com.amd.aparapi.jni/dist ^
-Dcom.amd.aparapi.executionMode=%1 ^
- -Dcom.amd.aparapi.logLevel=SEVERE^
+ -Dcom.amd.aparapi.logLevel=OFF^
-Dcom.amd.aparapi.enableVerboseJNI=false ^
-Dcom.amd.aparapi.enableProfiling=false ^
- -Dcom.amd.aparapi.enableShowGeneratedOpenCL=false ^
+ -Dcom.amd.aparapi.enableShowGeneratedOpenCL=true ^
-Dcom.amd.aparapi.enableVerboseJNIOpenCLResourceTracking=false ^
-Dcom.amd.aparapi.dumpFlags=true ^
-Dcom.amd.aparapi.enableInstructionDecodeViewer=false ^
diff --git a/samples/mandel/src/com/amd/aparapi/sample/mandel/Main.java b/samples/mandel/src/com/amd/aparapi/sample/mandel/Main.java
index 91665b00..a84cbce5 100644
--- a/samples/mandel/src/com/amd/aparapi/sample/mandel/Main.java
+++ b/samples/mandel/src/com/amd/aparapi/sample/mandel/Main.java
@@ -123,18 +123,9 @@ public class Main{
}
- @Override public void run() {
-
- /** Determine which RGB value we are going to process (0..RGB.length). */
- int gid = getGlobalId();
-
- /** Translate the gid into an x an y value. */
- float x = (((gid % width * scale) - ((scale / 2) * width)) / width) + offsetx;
-
- float y = (((gid / width * scale) - ((scale / 2) * height)) / height) + offsety;
-
- int count = 0;
+ public int getCount(float x, float y, int maxIterations){
+ int count =0 ;
float zx = x;
float zy = y;
float new_zx = 0f;
@@ -146,6 +137,22 @@ public class Main{
zx = new_zx;
count++;
}
+ return(count);
+ }
+
+ @Override public void run() {
+
+ /** Determine which RGB value we are going to process (0..RGB.length). */
+ int gid = getGlobalId();
+
+ /** Translate the gid into an x an y value. */
+ float x = (((gid % width * scale) - ((scale / 2) * width)) / width) + offsetx;
+
+ float y = (((gid / width * scale) - ((scale / 2) * height)) / height) + offsety;
+
+ int count = getCount(x,y,maxIterations);
+
+
// Pull the value out of the palette for this iteration count.
rgb[gid] = pallette[count];
--
GitLab