Remove pragma for RS export variables.

Change-Id: Icfd958e8212843f4f1a6b64dd43ce63e09d00d7c

12 files changed, 13 insertions, 49 deletions

diff --git a/libs/rs/java/Fountain/src/com/android/fountain/fountain.rs b/libs/rs/java/Fountain/src/com/android/fountain/fountain.rs
index 812cb7a..5445744 100644
--- a/libs/rs/java/Fountain/src/com/android/fountain/fountain.rs
+++ b/libs/rs/java/Fountain/src/com/android/fountain/fountain.rs
@@ -17,7 +17,6 @@ typedef struct __attribute__((packed, aligned(4))) Point {
 } Point_t;
 Point_t *point;
 
-#pragma rs export_var(point, partMesh)
 #pragma rs export_func(addParticles)
 
 int root() {
diff --git a/libs/rs/java/ImageProcessing/src/com/android/rs/image/threshold.rs b/libs/rs/java/ImageProcessing/src/com/android/rs/image/threshold.rs
index f5fecba..4f46810 100644
--- a/libs/rs/java/ImageProcessing/src/com/android/rs/image/threshold.rs
+++ b/libs/rs/java/ImageProcessing/src/com/android/rs/image/threshold.rs
@@ -11,7 +11,6 @@ uchar4 * OutPixel;
 float4 * ScratchPixel1;
 float4 * ScratchPixel2;
 
-#pragma rs export_var(height, width, radius, InPixel, OutPixel, ScratchPixel1, ScratchPixel2, vBlurScript, hBlurScript)
 #pragma rs export_func(filter);
 
 rs_script vBlurScript;
diff --git a/libs/rs/java/ModelViewer/src/com/android/modelviewer/scenegraph.rs b/libs/rs/java/ModelViewer/src/com/android/modelviewer/scenegraph.rs
index ce6bb1e..66315aa 100644
--- a/libs/rs/java/ModelViewer/src/com/android/modelviewer/scenegraph.rs
+++ b/libs/rs/java/ModelViewer/src/com/android/modelviewer/scenegraph.rs
@@ -42,11 +42,6 @@ int gRobot2Index;
 
 SgTransform *gRootNode;
 
-#pragma rs export_var(gPVBackground, gPFBackground, gTGrid, gTestMesh, gPFSBackground, gRotate, gItalic, gTextAlloc, gTransformRS, gGroup, gRobot1, gRobot1Index, gRobot2, gRobot2Index, gRootNode)
-
-float gDT;
-int64_t gLastTime;
-
 void init() {
     gRotate = 0.0f;
 }
diff --git a/libs/rs/java/ModelViewer/src/com/android/modelviewer/simplemodel.rs b/libs/rs/java/ModelViewer/src/com/android/modelviewer/simplemodel.rs
index 43be266..419de62 100644
--- a/libs/rs/java/ModelViewer/src/com/android/modelviewer/simplemodel.rs
+++ b/libs/rs/java/ModelViewer/src/com/android/modelviewer/simplemodel.rs
@@ -31,11 +31,6 @@ float gRotate;
 rs_font gItalic;
 rs_allocation gTextAlloc;
 
-#pragma rs export_var(gPVBackground, gPFBackground, gTGrid, gTestMesh, gPFSBackground, gRotate, gItalic, gTextAlloc)
-
-float gDT;
-int64_t gLastTime;
-
 void init() {
     gRotate = 0.0f;
 }
diff --git a/libs/rs/java/ModelViewer/src/com/android/modelviewer/transform.rs b/libs/rs/java/ModelViewer/src/com/android/modelviewer/transform.rs
index 2ef29cf..a7f5ee8 100644
--- a/libs/rs/java/ModelViewer/src/com/android/modelviewer/transform.rs
+++ b/libs/rs/java/ModelViewer/src/com/android/modelviewer/transform.rs
@@ -20,8 +20,6 @@
 
 rs_script transformScript;
 
-#pragma rs export_var(transformScript)
-
 typedef struct {
     int changed;
     rs_matrix4x4 *mat;
diff --git a/libs/rs/java/Samples/src/com/android/samples/rslist.rs b/libs/rs/java/Samples/src/com/android/samples/rslist.rs
index 3c3f463..f760ad0 100644
--- a/libs/rs/java/Samples/src/com/android/samples/rslist.rs
+++ b/libs/rs/java/Samples/src/com/android/samples/rslist.rs
@@ -28,8 +28,6 @@ typedef struct ListAllocs_s {
 
 ListAllocs *gList;
 
-#pragma rs export_var(gDY, gItalic, gList)
-
 void init() {
     gDY = 0.0f;
 }
diff --git a/libs/rs/java/Samples/src/com/android/samples/rsrenderstates.rs b/libs/rs/java/Samples/src/com/android/samples/rsrenderstates.rs
index 77384ef..8be35f8 100644
--- a/libs/rs/java/Samples/src/com/android/samples/rsrenderstates.rs
+++ b/libs/rs/java/Samples/src/com/android/samples/rsrenderstates.rs
@@ -67,18 +67,6 @@ rs_program_vertex gProgVertexCustom;
 rs_program_fragment gProgFragmentCustom;
 rs_program_fragment gProgFragmentMultitex;
 
-#pragma rs export_var(gProgVertex, gProgFragmentColor, gProgFragmentTexture)
-#pragma rs export_var(gProgStoreBlendNoneDepth, gProgStoreBlendNone, gProgStoreBlendAlpha, gProgStoreBlendAdd)
-#pragma rs export_var(gTexOpaque, gTexTorus, gTexTransparent, gTexChecker)
-#pragma rs export_var(gMbyNMesh, gTorusMesh)
-#pragma rs export_var(gFontSans, gFontSerif, gFontSerifBold, gFontSerifItalic, gFontSerifBoldItalic, gFontMono, gTextAlloc)
-#pragma rs export_var(gLinearClamp, gLinearWrap, gMipLinearWrap, gMipLinearAniso8, gMipLinearAniso15, gNearestClamp)
-#pragma rs export_var(gCullBack, gCullFront, gCullNone)
-#pragma rs export_var(gVSConstants, gFSConstants, gVSInputs, gProgVertexCustom, gProgFragmentCustom, gProgFragmentMultitex)
-
-//What we are showing
-#pragma rs export_var(gDisplayMode)
-
 float gDt = 0;
 
 void init() {
diff --git a/libs/rs/java/tests/src/com/android/rs/test/fp_mad.rs b/libs/rs/java/tests/src/com/android/rs/test/fp_mad.rs
index dfd77e6..066fab8 100644
--- a/libs/rs/java/tests/src/com/android/rs/test/fp_mad.rs
+++ b/libs/rs/java/tests/src/com/android/rs/test/fp_mad.rs
@@ -2,7 +2,6 @@
 
 const int TEST_COUNT = 1;
 
-#pragma rs export_var(g_results)
 #pragma rs export_func(fp_mad_test)
 
 static float data_f1[1025];
diff --git a/libs/rs/java/tests/src/com/android/rs/test/primitives.rs b/libs/rs/java/tests/src/com/android/rs/test/primitives.rs
index 012af9c..ac0dc12 100644
--- a/libs/rs/java/tests/src/com/android/rs/test/primitives.rs
+++ b/libs/rs/java/tests/src/com/android/rs/test/primitives.rs
@@ -2,21 +2,19 @@
 
 #pragma rs export_func(primitives_test)
 
-#pragma rs export_var(floatTest, doubleTest, charTest, shortTest, intTest, longTest, longlongTest)
-
 // Testing primitive types
-static float floatTest = 1.99f;
-static double doubleTest = 2.05;
-static char charTest = -8;
-static short shortTest = -16;
-static int intTest = -32;
-static long longTest = 17179869184l; // 1 << 34
-static long long longlongTest = 68719476736l; // 1 << 36
-
-static uchar ucharTest = 8;
-static ushort ushortTest = 16;
-static uint uintTest = 32;
-static int64_t int64_tTest = -17179869184l; // - 1 << 34
+float floatTest = 1.99f;
+double doubleTest = 2.05;
+char charTest = -8;
+short shortTest = -16;
+int intTest = -32;
+long longTest = 17179869184l; // 1 << 34
+long long longlongTest = 68719476736l; // 1 << 36
+
+uchar ucharTest = 8;
+ushort ushortTest = 16;
+uint uintTest = 32;
+int64_t int64_tTest = -17179869184l; // - 1 << 34
 
 static bool test_primitive_types(uint32_t index) {
     bool failed = false;
diff --git a/libs/rs/java/tests/src/com/android/rs/test/rslist.rs b/libs/rs/java/tests/src/com/android/rs/test/rslist.rs
index a5f0f6b..b2d06fe 100644
--- a/libs/rs/java/tests/src/com/android/rs/test/rslist.rs
+++ b/libs/rs/java/tests/src/com/android/rs/test/rslist.rs
@@ -29,8 +29,6 @@ typedef struct ListAllocs_s {
 
 ListAllocs *gList;
 
-#pragma rs export_var(gDY, gFont, gList)
-
 void init() {
     gDY = 0.0f;
 }
diff --git a/libs/rs/java/tests/src/com/android/rs/test/shared.rsh b/libs/rs/java/tests/src/com/android/rs/test/shared.rsh
index 820fffd..21be9af 100644
--- a/libs/rs/java/tests/src/com/android/rs/test/shared.rsh
+++ b/libs/rs/java/tests/src/com/android/rs/test/shared.rsh
@@ -8,7 +8,7 @@ typedef struct TestResult_s {
     float score;
     int64_t time;
 } TestResult;
-TestResult *g_results;
+//TestResult *g_results;
 
 static int64_t g_time;
 
diff --git a/libs/rs/java/tests/src/com/android/rs/test/test_root.rs b/libs/rs/java/tests/src/com/android/rs/test/test_root.rs
index 72b391d..6dc83ba 100644
--- a/libs/rs/java/tests/src/com/android/rs/test/test_root.rs
+++ b/libs/rs/java/tests/src/com/android/rs/test/test_root.rs
@@ -15,9 +15,6 @@ typedef struct TestResult {
 } TestResult_t;
 TestResult_t *results;
 
-#pragma rs export_var(results)
-//#pragma rs export_func(addParticles)
-
 int root() {
 
     return 0;