commit 009b5a70f84f4037fe567e79f1182fe5b0ac733a
author Stephen Hines <srhines@google.com> Thu Apr 28 11:54:29 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Apr 28 11:54:29 2011 -0700
tree 909c86d9a9de2b6e8ae6bbdc16d9d95b41b26b95
parent 2dbf683b61cd2e6389fed2c028a18928234e315f
parent b994ed33c52b0010e59d1aad240577e11c85d593

Merge "Fix RS graphics samples/tests."

tests/RenderScriptTests/FBOTest/src/com/android/fbotest/fbotest.rs

diff --git a/tests/RenderScriptTests/FBOTest/src/com/android/fbotest/fbotest.rs b/tests/RenderScriptTests/FBOTest/src/com/android/fbotest/fbotest.rs
index 31dd3e9..d44fd2b 100644
--- a/tests/RenderScriptTests/FBOTest/src/com/android/fbotest/fbotest.rs
+++ b/tests/RenderScriptTests/FBOTest/src/com/android/fbotest/fbotest.rs
@@ -184,7 +184,7 @@
                          startX + width, startY, 0, 1, 1);
 }
 
-int root(int launchID) {
+int root(void) {
 
     rsgClearColor(1.0f, 1.0f, 1.0f, 1.0f);
     rsgClearDepth(1.0f);

tests/RenderScriptTests/ModelViewer/src/com/android/modelviewer/scenegraph.rs

diff --git a/tests/RenderScriptTests/ModelViewer/src/com/android/modelviewer/scenegraph.rs b/tests/RenderScriptTests/ModelViewer/src/com/android/modelviewer/scenegraph.rs
index 3679068..f046952 100644
--- a/tests/RenderScriptTests/ModelViewer/src/com/android/modelviewer/scenegraph.rs
+++ b/tests/RenderScriptTests/ModelViewer/src/com/android/modelviewer/scenegraph.rs
@@ -46,7 +46,7 @@
     gRotate = 0.0f;
 }
 
-int root(int launchID) {
+int root(void) {
 
     gGroup->transforms[1].w += 0.5f;
     gGroup->isDirty = 1;

tests/RenderScriptTests/ModelViewer/src/com/android/modelviewer/simplemodel.rs

diff --git a/tests/RenderScriptTests/ModelViewer/src/com/android/modelviewer/simplemodel.rs b/tests/RenderScriptTests/ModelViewer/src/com/android/modelviewer/simplemodel.rs
index 4c38745..809f02c 100644
--- a/tests/RenderScriptTests/ModelViewer/src/com/android/modelviewer/simplemodel.rs
+++ b/tests/RenderScriptTests/ModelViewer/src/com/android/modelviewer/simplemodel.rs
@@ -130,7 +130,7 @@
     rsgDrawText(gTextAlloc, 2 -left, height - 2 + bottom);
 }
 
-int root(int launchID) {
+int root(void) {
 
     rsgClearColor(1.0f, 1.0f, 1.0f, 1.0f);
     rsgClearDepth(1.0f);

tests/RenderScriptTests/PerfTest/src/com/android/perftest/rsbench.rs

diff --git a/tests/RenderScriptTests/PerfTest/src/com/android/perftest/rsbench.rs b/tests/RenderScriptTests/PerfTest/src/com/android/perftest/rsbench.rs
index a663d35..3fc59fc 100644
--- a/tests/RenderScriptTests/PerfTest/src/com/android/perftest/rsbench.rs
+++ b/tests/RenderScriptTests/PerfTest/src/com/android/perftest/rsbench.rs
@@ -776,7 +776,7 @@
                          startX + width, startY, 0, 1, 1);
 }
 
-int root(int launchID) {
+int root(void) {
 
     gRenderSurfaceW = rsgGetWidth();
     gRenderSurfaceH = rsgGetHeight();

tests/RenderScriptTests/tests/src/com/android/rs/test/rslist.rs

diff --git a/tests/RenderScriptTests/tests/src/com/android/rs/test/rslist.rs b/tests/RenderScriptTests/tests/src/com/android/rs/test/rslist.rs
index 67c2b86..aeae13f 100644
--- a/tests/RenderScriptTests/tests/src/com/android/rs/test/rslist.rs
+++ b/tests/RenderScriptTests/tests/src/com/android/rs/test/rslist.rs
@@ -35,7 +35,7 @@
 
 int textPos = 0;
 
-int root(int launchID) {
+int root(void) {
 
     rsgClearColor(0.0f, 0.0f, 0.0f, 0.0f);
     rsgClearDepth(1.0f);