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

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

Merge "Fix RS graphics samples/tests."

parents 2dbf683b b994ed33

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

+1 −1
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ static void drawOffscreenResult(int posX, int posY) { 
                         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

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ void init() { 
    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

+1 −1
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ void drawDescription() { 
    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

+1 −1
Original line number Diff line number Diff line
@@ -776,7 +776,7 @@ static void drawOffscreenResult(int posX, int posY, int width, int height) { 
                         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

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ void init() { 


int textPos = 0;



int root(int launchID) {

int root(void) {



    rsgClearColor(0.0f, 0.0f, 0.0f, 0.0f);

    rsgClearDepth(1.0f);