commit 94ea3b28bbc34443915bc23f90c326d7f81d174f
author Nick Desaulniers <ndesaulniers@google.com> Thu Oct 10 11:37:18 2019 -0700
committer android-build-merger <android-build-merger@google.com> Thu Oct 10 11:37:18 2019 -0700
tree 8b4ab3b0d72d868367c93568b704caf6f14528a7
parent d0f9e7251e770d5440fc4de9542d0a386a8a5ba5
parent 1503b663bbfff9110c7bc6c7a165f57ddcea02dc

Merge "[frameworks][native][opengl] fix -Wimplicit-int-float-conversion" am: 62f8e3510d am: 4fd60fc0a0
am: 1503b663bb

Change-Id: I7ac9b55e21210c2e8abf9037d23b50ec4295d253

opengl/tests/gl_perf/fill_common.cpp

diff --git a/opengl/tests/gl_perf/fill_common.cpp b/opengl/tests/gl_perf/fill_common.cpp
index fefedc0..613f1c6 100644
--- a/opengl/tests/gl_perf/fill_common.cpp
+++ b/opengl/tests/gl_perf/fill_common.cpp
@@ -191,10 +191,10 @@
 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);
     }
 }