summaryrefslogtreecommitdiffstats
path: root/opengl/tests/linetex/linetex.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/linetex/linetex.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/linetex/linetex.cpp')
-rw-r--r--opengl/tests/linetex/linetex.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/opengl/tests/linetex/linetex.cpp b/opengl/tests/linetex/linetex.cpp
index 7921f80..5ad695b 100644
--- a/opengl/tests/linetex/linetex.cpp
+++ b/opengl/tests/linetex/linetex.cpp
@@ -80,9 +80,11 @@ int main(int argc, char** argv)
// default pack-alignment is 4
const uint16_t t16[64] = { 0xFFFF, 0, 0xF800, 0, 0x07E0, 0, 0x001F, 0 };
+ const GLfloat fh = h;
+ const GLfloat fw2 = w/2;
const GLfloat vertices[4][2] = {
- { w/2, 0 },
- { w/2, h }
+ { fw2, 0 },
+ { fw2, fh }
};
const GLfloat texCoords[4][2] = {