Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove pragma for RS export variables.

Browse Source 
Change-Id: Icfd958e8212843f4f1a6b64dd43ce63e09d00d7c
This commit is contained in:
Stephen Hines
2010-10-08 12:25:04 -07:00
parent ca33268ef8
commit 5a6d7ac2bd
12 changed files with 12 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libs/rs/java/Fountain/src/com/android/fountain/fountain.rs
View File

@@ -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() {

1
libs/rs/java/ImageProcessing/src/com/android/rs/image/threshold.rs
View File

@@ -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;

5
libs/rs/java/ModelViewer/src/com/android/modelviewer/scenegraph.rs
View File

@@ -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;
}

5
libs/rs/java/ModelViewer/src/com/android/modelviewer/simplemodel.rs
View File

@@ -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;
}

2
libs/rs/java/ModelViewer/src/com/android/modelviewer/transform.rs
View File

@@ -20,8 +20,6 @@
rs_script transformScript;
#pragma rs export_var(transformScript)
typedef struct {
int changed;
rs_matrix4x4 *mat;

2
libs/rs/java/Samples/src/com/android/samples/rslist.rs
View File

@@ -28,8 +28,6 @@ typedef struct ListAllocs_s {
ListAllocs *gList;
#pragma rs export_var(gDY, gItalic, gList)
void init() {
gDY = 0.0f;
}

12
libs/rs/java/Samples/src/com/android/samples/rsrenderstates.rs
View File

@@ -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() {

1
libs/rs/java/tests/src/com/android/rs/test/fp_mad.rs
View File

@@ -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];

24
libs/rs/java/tests/src/com/android/rs/test/primitives.rs
View File

@@ -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
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
static uchar ucharTest = 8;
static ushort ushortTest = 16;
static uint uintTest = 32;
static int64_t int64_tTest = -17179869184l; // - 1 << 34
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;

2
libs/rs/java/tests/src/com/android/rs/test/rslist.rs
View File

@@ -29,8 +29,6 @@ typedef struct ListAllocs_s {
ListAllocs *gList;
#pragma rs export_var(gDY, gFont, gList)
void init() {
gDY = 0.0f;
}

2
libs/rs/java/tests/src/com/android/rs/test/shared.rsh
View File

@@ -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;

3
libs/rs/java/tests/src/com/android/rs/test/test_root.rs
View File

@@ -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;