ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[MIPS] Fix mips32r1 build

Browse Source 
Fix regression from 6701fbe5f0 .
The rdhwr instruction is unsupported by mips32r1 cpus, but is
supported via kernel emulation on those cpus.

Change-Id: Ieb3343fff0f0da54003044f451c90e1c761208eb
This commit is contained in:
Duane Sand 2015-02-02 16:54:15 -08:00
parent a46ff66457
commit ecacc3f164
3 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
opengl/libs/EGL/getProcAddress.cpp
View File

@ -163,6 +163,7 @@ namespace android {
asm volatile( \ asm volatile( \
".set push\n\t" \ ".set push\n\t" \
".set noreorder\n\t" \ ".set noreorder\n\t" \
".set mips32r2\n\t" \
"rdhwr %[tls], $29\n\t" \ "rdhwr %[tls], $29\n\t" \
"lw %[t0], %[OPENGL_API](%[tls])\n\t" \ "lw %[t0], %[OPENGL_API](%[tls])\n\t" \
"beqz %[t0], 1f\n\t" \ "beqz %[t0], 1f\n\t" \

1
opengl/libs/GLES2/gl2.cpp
View File

@ -163,6 +163,7 @@ using namespace android;
asm volatile( \ asm volatile( \
".set push\n\t" \ ".set push\n\t" \
".set noreorder\n\t" \ ".set noreorder\n\t" \
".set mips32r2\n\t" \
"rdhwr %[tls], $29\n\t" \ "rdhwr %[tls], $29\n\t" \
"lw %[t0], %[OPENGL_API](%[tls])\n\t" \ "lw %[t0], %[OPENGL_API](%[tls])\n\t" \
"beqz %[t0], 1f\n\t" \ "beqz %[t0], 1f\n\t" \

1
opengl/libs/GLES_CM/gl.cpp
View File

@ -219,6 +219,7 @@ GL_API void GL_APIENTRY glWeightPointerOESBounds(GLint size, GLenum type,
asm volatile( \ asm volatile( \
".set push\n\t" \ ".set push\n\t" \
".set noreorder\n\t" \ ".set noreorder\n\t" \
".set mips32r2\n\t" \
"rdhwr %[tls], $29\n\t" \ "rdhwr %[tls], $29\n\t" \
"lw %[t0], %[OPENGL_API](%[tls])\n\t" \ "lw %[t0], %[OPENGL_API](%[tls])\n\t" \
"beqz %[t0], 1f\n\t" \ "beqz %[t0], 1f\n\t" \