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

Commit 94ea3b28 authored by Nick Desaulniers's avatar Nick Desaulniers Committed by android-build-merger
Browse files

Merge "[frameworks][native][opengl] fix -Wimplicit-int-float-conversion" am:... 

Merge "[frameworks][native][opengl] fix -Wimplicit-int-float-conversion" am: 62f8e351 am: 4fd60fc0
am: 1503b663

Change-Id: I7ac9b55e21210c2e8abf9037d23b50ec4295d253
parents d0f9e725 1503b663

opengl/tests/gl_perf/fill_common.cpp

+4 −4
Original line number Diff line number Diff line
@@ -191,10 +191,10 @@ static void setupVA() { 
static void randUniform(int pgm, const char *var) {

    GLint loc = glGetUniformLocation(pgm, var);

    if (loc >= 0) {

        float x = ((float)rand()) / RAND_MAX;

        float y = ((float)rand()) / RAND_MAX;

        float z = ((float)rand()) / RAND_MAX;

        float w = ((float)rand()) / RAND_MAX;

        float x = ((float)rand()) / (float)RAND_MAX;

        float y = ((float)rand()) / (float)RAND_MAX;

        float z = ((float)rand()) / (float)RAND_MAX;

        float w = ((float)rand()) / (float)RAND_MAX;

        glUniform4f(loc, x, y, z, w);

    }

}