summaryrefslogtreecommitdiffstats
path: root/opengl/tests/fillrate/fillrate.cpp
diff options
context:
space:
mode:
authorChih-Hung Hsieh <chh@google.com>2014-12-11 22:48:17 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-12-11 22:48:18 +0000
commitbceb29c83ea54d38b38e40d66402e56364cff56b (patch)
treec4beca58aa974f2241891ac0ef776a70038ad0f2 /opengl/tests/fillrate/fillrate.cpp
parenta59d7a6a66a2b8dcb2d00dbd6371fa89ae45ab04 (diff)
parent3bded9177b579d96d72397d73b8f85bba47ec438 (diff)
downloadframeworks_native-bceb29c83ea54d38b38e40d66402e56364cff56b.zip
frameworks_native-bceb29c83ea54d38b38e40d66402e56364cff56b.tar.gz
frameworks_native-bceb29c83ea54d38b38e40d66402e56364cff56b.tar.bz2
Merge "Fix clang -Wc++11-narrowing warnings."
Diffstat (limited to 'opengl/tests/fillrate/fillrate.cpp')
-rw-r--r--opengl/tests/fillrate/fillrate.cpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/opengl/tests/fillrate/fillrate.cpp b/opengl/tests/fillrate/fillrate.cpp
index 1d9b026..2db63d7 100644
--- a/opengl/tests/fillrate/fillrate.cpp
+++ b/opengl/tests/fillrate/fillrate.cpp
@@ -91,11 +91,13 @@ int main(int argc, char** argv)
}
}
+ const GLfloat fh = h;
+ const GLfloat fw = w;
const GLfloat vertices[4][2] = {
- { 0, 0 },
- { 0, h },
- { w, h },
- { w, 0 }
+ { 0, 0 },
+ { 0, fh },
+ { fw, fh },
+ { fw, 0 }
};
const GLfloat texCoords[4][2] = {