Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4c0c81a3 authored by Stephen Hines's avatar Stephen Hines Committed by Android (Google) Code Review
Browse files

Merge "Remove pragma for RS export variables."

parents c4e43d80 5a6d7ac2

libs/rs/java/Fountain/src/com/android/fountain/fountain.rs

+0 −1
Original line number Diff line number Diff line
@@ -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() {

libs/rs/java/ImageProcessing/src/com/android/rs/image/threshold.rs

+0 −1
Original line number Diff line number Diff line
@@ -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;

libs/rs/java/ModelViewer/src/com/android/modelviewer/scenegraph.rs

+0 −5
Original line number Diff line number Diff line
@@ -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;

}

libs/rs/java/ModelViewer/src/com/android/modelviewer/simplemodel.rs

+0 −5
Original line number Diff line number Diff line
@@ -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;

}

libs/rs/java/ModelViewer/src/com/android/modelviewer/transform.rs

+0 −2
Original line number Diff line number Diff line
@@ -20,8 +20,6 @@ 


rs_script transformScript;



#pragma rs export_var(transformScript)



typedef struct {

    int changed;

    rs_matrix4x4 *mat;