From 718fb9f12e31d92e8a81b08f0f2d818dd3654b9c Mon Sep 17 00:00:00 2001
From: Jason Sams <jsams@google.com>
Date: Thu, 29 Nov 2012 19:02:18 -0800
Subject: Fix sample code issues

Correct min SDK.
Correct file extension on mandelbrot

Change-Id: I508c22c382f1a930b27d8c5f4414cac3a990a332
---
 .../ImageProcessing/AndroidManifest.xml            |  2 +-
 .../src/com/android/rs/image/mandelbrot.fs         | 56 ----------------------
 .../src/com/android/rs/image/mandelbrot.rs         | 56 ++++++++++++++++++++++
 3 files changed, 57 insertions(+), 57 deletions(-)
 delete mode 100644 tests/RenderScriptTests/ImageProcessing/src/com/android/rs/image/mandelbrot.fs
 create mode 100644 tests/RenderScriptTests/ImageProcessing/src/com/android/rs/image/mandelbrot.rs

(limited to 'tests/RenderScriptTests/ImageProcessing')

diff --git a/tests/RenderScriptTests/ImageProcessing/AndroidManifest.xml b/tests/RenderScriptTests/ImageProcessing/AndroidManifest.xml
index 2232b982d65c..d51fa39fd828 100644
--- a/tests/RenderScriptTests/ImageProcessing/AndroidManifest.xml
+++ b/tests/RenderScriptTests/ImageProcessing/AndroidManifest.xml
@@ -3,7 +3,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.android.rs.image">
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-sdk android:minSdkVersion="11" />
+    <uses-sdk android:minSdkVersion="17" />
     <application android:label="Image Processing"
                  android:hardwareAccelerated="true">
         <uses-library android:name="android.test.runner" />
diff --git a/tests/RenderScriptTests/ImageProcessing/src/com/android/rs/image/mandelbrot.fs b/tests/RenderScriptTests/ImageProcessing/src/com/android/rs/image/mandelbrot.fs
deleted file mode 100644
index ac2061b23f1b..000000000000
--- a/tests/RenderScriptTests/ImageProcessing/src/com/android/rs/image/mandelbrot.fs
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright (C) 2011 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#pragma version(1)
-#pragma rs java_package_name(com.android.rs.image)
-
-uint32_t gMaxIteration = 500;
-uint32_t gDimX = 1024;
-uint32_t gDimY = 1024;
-
-float lowerBoundX = -2.f;
-float lowerBoundY = -2.f;
-float scaleFactor = 4.f;
-
-uchar4 __attribute__((kernel)) root(uint32_t x, uint32_t y) {
-  float2 p;
-  p.x = lowerBoundX + ((float)x / gDimX) * scaleFactor;
-  p.y = lowerBoundY + ((float)y / gDimY) * scaleFactor;
-
-  float2 t = 0;
-  float2 t2 = t * t;
-  int iter = 0;
-  while((t2.x + t2.y < 4.f) && (iter < gMaxIteration)) {
-    float xtemp = t2.x - t2.y + p.x;
-    t.y = 2 * t.x * t.y + p.y;
-    t.x = xtemp;
-    iter++;
-    t2 = t * t;
-  }
-
-  if(iter >= gMaxIteration) {
-    // write a non-transparent black pixel
-    return (uchar4){0, 0, 0, 0xff};
-  } else {
-    float mi3 = gMaxIteration / 3.f;
-    if (iter <= (gMaxIteration / 3))
-      return (uchar4){0xff * (iter / mi3), 0, 0, 0xff};
-    else if (iter <= (((gMaxIteration / 3) * 2)))
-      return (uchar4){0xff - (0xff * ((iter - mi3) / mi3)),
-                      (0xff * ((iter - mi3) / mi3)), 0, 0xff};
-    else
-      return (uchar4){0, 0xff - (0xff * ((iter - (mi3 * 2)) / mi3)),
-                      (0xff * ((iter - (mi3 * 2)) / mi3)), 0xff};
-  }
-}
diff --git a/tests/RenderScriptTests/ImageProcessing/src/com/android/rs/image/mandelbrot.rs b/tests/RenderScriptTests/ImageProcessing/src/com/android/rs/image/mandelbrot.rs
new file mode 100644
index 000000000000..ac2061b23f1b
--- /dev/null
+++ b/tests/RenderScriptTests/ImageProcessing/src/com/android/rs/image/mandelbrot.rs
@@ -0,0 +1,56 @@
+// Copyright (C) 2011 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma version(1)
+#pragma rs java_package_name(com.android.rs.image)
+
+uint32_t gMaxIteration = 500;
+uint32_t gDimX = 1024;
+uint32_t gDimY = 1024;
+
+float lowerBoundX = -2.f;
+float lowerBoundY = -2.f;
+float scaleFactor = 4.f;
+
+uchar4 __attribute__((kernel)) root(uint32_t x, uint32_t y) {
+  float2 p;
+  p.x = lowerBoundX + ((float)x / gDimX) * scaleFactor;
+  p.y = lowerBoundY + ((float)y / gDimY) * scaleFactor;
+
+  float2 t = 0;
+  float2 t2 = t * t;
+  int iter = 0;
+  while((t2.x + t2.y < 4.f) && (iter < gMaxIteration)) {
+    float xtemp = t2.x - t2.y + p.x;
+    t.y = 2 * t.x * t.y + p.y;
+    t.x = xtemp;
+    iter++;
+    t2 = t * t;
+  }
+
+  if(iter >= gMaxIteration) {
+    // write a non-transparent black pixel
+    return (uchar4){0, 0, 0, 0xff};
+  } else {
+    float mi3 = gMaxIteration / 3.f;
+    if (iter <= (gMaxIteration / 3))
+      return (uchar4){0xff * (iter / mi3), 0, 0, 0xff};
+    else if (iter <= (((gMaxIteration / 3) * 2)))
+      return (uchar4){0xff - (0xff * ((iter - mi3) / mi3)),
+                      (0xff * ((iter - mi3) / mi3)), 0, 0xff};
+    else
+      return (uchar4){0, 0xff - (0xff * ((iter - (mi3 * 2)) / mi3)),
+                      (0xff * ((iter - (mi3 * 2)) / mi3)), 0xff};
+  }
+}
-- 
cgit v1.2.3-59-g8ed1b