diff options
| author | Chih-Hung Hsieh <chh@google.com> | 2014-12-11 23:02:01 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-11 23:02:01 +0000 |
| commit | 2965dab9091382803430a0607118e20e93d2bd1d (patch) | |
| tree | 171368ac803c8ec49dea700767f57f7c00f0e5c1 /opengl/tests/fillrate/fillrate.cpp | |
| parent | d9799072de47ecd3e6d4cdb2bfd3db75f4d94bd5 (diff) | |
| parent | bceb29c83ea54d38b38e40d66402e56364cff56b (diff) | |
| download | frameworks_native-2965dab9091382803430a0607118e20e93d2bd1d.zip frameworks_native-2965dab9091382803430a0607118e20e93d2bd1d.tar.gz frameworks_native-2965dab9091382803430a0607118e20e93d2bd1d.tar.bz2 | |
am bceb29c8: Merge "Fix clang -Wc++11-narrowing warnings."
* commit 'bceb29c83ea54d38b38e40d66402e56364cff56b':
Fix clang -Wc++11-narrowing warnings.
Diffstat (limited to 'opengl/tests/fillrate/fillrate.cpp')
| -rw-r--r-- | opengl/tests/fillrate/fillrate.cpp | 10 |
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] = { |