diff options
| author | Jesse Hall <jessehall@google.com> | 2015-03-15 02:41:04 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-03-15 02:41:05 +0000 |
| commit | b6b81d6acd6949a731308666ac211864f824ab50 (patch) | |
| tree | c917d8fecf1de92bc254fba3ab073758c0e7c953 /opengl | |
| parent | 1fc747d20c1a390e1de3d482d2eafde6dc7e6236 (diff) | |
| parent | ecacc3f164f2bf2c8c4ff5a20496511249d2cd4b (diff) | |
| download | frameworks_native-b6b81d6acd6949a731308666ac211864f824ab50.zip frameworks_native-b6b81d6acd6949a731308666ac211864f824ab50.tar.gz frameworks_native-b6b81d6acd6949a731308666ac211864f824ab50.tar.bz2 | |
Merge "[MIPS] Fix mips32r1 build"
Diffstat (limited to 'opengl')
| -rw-r--r-- | opengl/libs/EGL/getProcAddress.cpp | 1 | ||||
| -rw-r--r-- | opengl/libs/GLES2/gl2.cpp | 1 | ||||
| -rw-r--r-- | opengl/libs/GLES_CM/gl.cpp | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/opengl/libs/EGL/getProcAddress.cpp b/opengl/libs/EGL/getProcAddress.cpp index 2b2b227..660af33 100644 --- a/opengl/libs/EGL/getProcAddress.cpp +++ b/opengl/libs/EGL/getProcAddress.cpp @@ -163,6 +163,7 @@ namespace android { asm volatile( \ ".set push\n\t" \ ".set noreorder\n\t" \ + ".set mips32r2\n\t" \ "rdhwr %[tls], $29\n\t" \ "lw %[t0], %[OPENGL_API](%[tls])\n\t" \ "beqz %[t0], 1f\n\t" \ diff --git a/opengl/libs/GLES2/gl2.cpp b/opengl/libs/GLES2/gl2.cpp index 40555d7..d5dc012 100644 --- a/opengl/libs/GLES2/gl2.cpp +++ b/opengl/libs/GLES2/gl2.cpp @@ -163,6 +163,7 @@ using namespace android; asm volatile( \ ".set push\n\t" \ ".set noreorder\n\t" \ + ".set mips32r2\n\t" \ "rdhwr %[tls], $29\n\t" \ "lw %[t0], %[OPENGL_API](%[tls])\n\t" \ "beqz %[t0], 1f\n\t" \ diff --git a/opengl/libs/GLES_CM/gl.cpp b/opengl/libs/GLES_CM/gl.cpp index 0b30956..b1b31f8 100644 --- a/opengl/libs/GLES_CM/gl.cpp +++ b/opengl/libs/GLES_CM/gl.cpp @@ -219,6 +219,7 @@ GL_API void GL_APIENTRY glWeightPointerOESBounds(GLint size, GLenum type, asm volatile( \ ".set push\n\t" \ ".set noreorder\n\t" \ + ".set mips32r2\n\t" \ "rdhwr %[tls], $29\n\t" \ "lw %[t0], %[OPENGL_API](%[tls])\n\t" \ "beqz %[t0], 1f\n\t" \ |