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

Commit 7589b41a authored by Jean-Luc Brouillet's avatar Jean-Luc Brouillet Committed by Android Git Automerger
Browse files

am d7672763: Merge "Clean RenderScript warnings" 

* commit 'd7672763':
  Clean RenderScript warnings
parents 1f25f1d7 d7672763

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

+0 −3
Original line number Diff line number Diff line
@@ -116,7 +116,6 @@ static void renderAllMeshes() { 
    rs_allocation allMeshes = rsGetAllocation(gMeshes);

    int size = rsAllocationGetDimX(allMeshes);

    gLookAt = 0.0f;

    float minX, minY, minZ, maxX, maxY, maxZ;

    for (int i = 0; i < size; i++) {

        MeshInfo_t *info = (MeshInfo_t*)rsGetElementAt(allMeshes, i);

        rsgDrawMesh(info->mMesh);
@@ -124,7 +123,6 @@ static void renderAllMeshes() { 
}



static void drawDescription() {

    uint width = rsgGetWidth();

    uint height = rsgGetHeight();

    int left = 0, right = 0, top = 0, bottom = 0;
@@ -196,7 +194,6 @@ int root(void) { 


    uint32_t w = rsAllocationGetDimX(gOffscreen);

    uint32_t h = rsAllocationGetDimY(gOffscreen);

    uint32_t numElements = w*h;



    rsgAllocationSyncAll(gOffscreen, RS_ALLOCATION_USAGE_GRAPHICS_RENDER_TARGET);

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

+0 −2
Original line number Diff line number Diff line
@@ -115,7 +115,6 @@ static void renderAllMeshes() { 
    rs_allocation allMeshes = rsGetAllocation(gMeshes);

    int size = rsAllocationGetDimX(allMeshes);

    gLookAt = 0.0f;

    float minX, minY, minZ, maxX, maxY, maxZ;

    for (int i = 0; i < size; i++) {

        MeshInfo_t *info = (MeshInfo_t*)rsGetElementAt(allMeshes, i);

        rsgDrawMesh(info->mMesh);
@@ -123,7 +122,6 @@ static void renderAllMeshes() { 
}



static void drawDescription() {

    uint width = rsgGetWidth();

    uint height = rsgGetHeight();

    int left = 0, right = 0, top = 0, bottom = 0;

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

+1 −3
Original line number Diff line number Diff line
@@ -123,7 +123,6 @@ static void renderAllMeshes() { 
    rs_allocation allMeshes = rsGetAllocation(gMeshes);

    int size = rsAllocationGetDimX(allMeshes);

    gLookAt = 0.0f;

    float minX, minY, minZ, maxX, maxY, maxZ;

    for (int i = 0; i < size; i++) {

        MeshInfo_t *info = (MeshInfo_t*)rsGetElementAt(allMeshes, i);

        rsgDrawMesh(info->mMesh);
@@ -131,7 +130,6 @@ static void renderAllMeshes() { 
}



void drawDescription() {

    uint width = rsgGetWidth();

    uint height = rsgGetHeight();

    int left = 0, right = 0, top = 0, bottom = 0;

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

+1 −3
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ static void runSubTest(int index) { 
    TestData testData;

    fillSurfaceParams(&testData);



    rs_allocation null_alloc;

    rs_allocation null_alloc = {0};

    rsForEach(gTestScripts[index].testScript,

              gTestScripts[index].testData,

              null_alloc,
@@ -125,7 +125,6 @@ static bool checkInit() { 


static int benchMode = 0;

static bool benchmarkSingleTest = false;

static int benchSubMode = 0;

static int runningLoops = 0;

static bool sendMsgFlag = false;
@@ -209,7 +208,6 @@ static void benchmark() { 
    drawOffscreenResult(0, 0, quadW, quadH);



    int left = 0, right = 0, top = 0, bottom = 0;

    uint width = rsgGetWidth();

    uint height = rsgGetHeight();

    rsgFontColor(0.9f, 0.9f, 0.95f, 1.0f);

    rsgBindFont(gFontSerif);

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

+0 −1
Original line number Diff line number Diff line
@@ -52,7 +52,6 @@ static void displayFontSamples(int fillNum) { 
    fonts[3] = gFontSerif;

    fonts[4] = gFontSans;



    uint width = gRenderSurfaceW;

    uint height = gRenderSurfaceH;

    int left = 0, right = 0, top = 0, bottom = 0;

    rsgMeasureText(sampleText, &left, &right, &top, &bottom);