diff options
| author | Brian Carlstrom <bdc@google.com> | 2015-01-13 06:27:45 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-13 06:27:45 +0000 |
| commit | a198e1c14d23efd0d3acbe05fab31bf92748f329 (patch) | |
| tree | f499d298ce1bf8e55743dcf1fb2edeb1f94f7cc7 /opengl/libagl/fp.cpp | |
| parent | 9c22ac77e41b8bbddbb64959acabce3f3a07345d (diff) | |
| parent | 6f9c6541b77b18a6922d1f50326faa9ec6ed6d2a (diff) | |
| download | frameworks_native-a198e1c14d23efd0d3acbe05fab31bf92748f329.zip frameworks_native-a198e1c14d23efd0d3acbe05fab31bf92748f329.tar.gz frameworks_native-a198e1c14d23efd0d3acbe05fab31bf92748f329.tar.bz2 | |
am 6f9c6541: Merge "[MIPS] Build libGLES for mips64, mips32r6"
* commit '6f9c6541b77b18a6922d1f50326faa9ec6ed6d2a':
[MIPS] Build libGLES for mips64, mips32r6
Diffstat (limited to 'opengl/libagl/fp.cpp')
| -rw-r--r-- | opengl/libagl/fp.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/opengl/libagl/fp.cpp b/opengl/libagl/fp.cpp index aea4449..a7a4f7b 100644 --- a/opengl/libagl/fp.cpp +++ b/opengl/libagl/fp.cpp @@ -19,7 +19,7 @@ // ---------------------------------------------------------------------------- -#if !defined(__arm__) && !defined(__mips__) +#if !(defined(__arm__) || (defined(__mips__) && !defined(__LP64__) && __mips_isa_rev < 6)) GGLfixed gglFloatToFixed(float v) { return GGLfixed(floorf(v * 65536.0f + 0.5f)); } |