summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Nick Desaulniers <ndesaulniers@google.com> 2019-10-10 11:30:17 -0700
committer android-build-merger <android-build-merger@google.com> 2019-10-10 11:30:17 -0700
commit1503b663bbfff9110c7bc6c7a165f57ddcea02dc (patch)
tree3a3910560625d7315858f875ccf93f49fecb41b4
parentfb8c3d5cfcb0836be2f4708b0ebfb74425bbcc6b (diff)
parent4fd60fc0a0fa05aeb2d2d45d5a13642b2f98e978 (diff)
Merge "[frameworks][native][opengl] fix -Wimplicit-int-float-conversion" am: 62f8e3510d
am: 4fd60fc0a0 Change-Id: I174a1db33fc0ca0fe88e5c2a127ade048b88124f
-rw-r--r--opengl/tests/gl_perf/fill_common.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/opengl/tests/gl_perf/fill_common.cpp b/opengl/tests/gl_perf/fill_common.cpp
index fefedc0939..613f1c6aa1 100644
--- a/opengl/tests/gl_perf/fill_common.cpp
+++ b/opengl/tests/gl_perf/fill_common.cpp
@@ -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);
}
}