Fix MIPS assembly variable names to not conflict with GL API parameter names
Change-Id: I8e93fb55018de53a596cb176d48dbfdf1fd396e4
diff --git a/opengl/libs/EGL/getProcAddress.cpp b/opengl/libs/EGL/getProcAddress.cpp
index d23da7a..1909232 100644
--- a/opengl/libs/EGL/getProcAddress.cpp
+++ b/opengl/libs/EGL/getProcAddress.cpp
@@ -64,9 +64,9 @@
#define API_ENTRY(_api) __attribute__((noinline)) _api
#define CALL_GL_EXTENSION_API(_api, ...) \
- register unsigned int t0 asm("t0"); \
- register unsigned int fn asm("t1"); \
- register unsigned int tls asm("v1"); \
+ register unsigned int _t0 asm("t0"); \
+ register unsigned int _fn asm("t1"); \
+ register unsigned int _tls asm("v1"); \
asm volatile( \
".set push\n\t" \
".set noreorder\n\t" \
@@ -81,9 +81,9 @@
"j %[fn]\n\t" \
" nop\n\t" \
".set pop\n\t" \
- : [fn] "=c"(fn), \
- [tls] "=&r"(tls), \
- [t0] "=&r"(t0) \
+ : [fn] "=c"(_fn), \
+ [tls] "=&r"(_tls), \
+ [t0] "=&r"(_t0) \
: [OPENGL_API] "I"(TLS_SLOT_OPENGL_API*4), \
[API] "I"(__builtin_offsetof(gl_hooks_t, \
ext.extensions[_api])) \
diff --git a/opengl/libs/GLES2/gl2.cpp b/opengl/libs/GLES2/gl2.cpp
index 2a44fb1..dd454bd 100644
--- a/opengl/libs/GLES2/gl2.cpp
+++ b/opengl/libs/GLES2/gl2.cpp
@@ -67,10 +67,10 @@
#define API_ENTRY(_api) __attribute__((noinline)) _api
#define CALL_GL_API(_api, ...) \
- register unsigned int t0 asm("t0"); \
- register unsigned int fn asm("t1"); \
- register unsigned int tls asm("v1"); \
- register unsigned int v0 asm("v0"); \
+ register unsigned int _t0 asm("t0"); \
+ register unsigned int _fn asm("t1"); \
+ register unsigned int _tls asm("v1"); \
+ register unsigned int _v0 asm("v0"); \
asm volatile( \
".set push\n\t" \
".set noreorder\n\t" \
@@ -85,10 +85,10 @@
"j %[fn]\n\t" \
" move %[v0], $0\n\t" \
".set pop\n\t" \
- : [fn] "=c"(fn), \
- [tls] "=&r"(tls), \
- [t0] "=&r"(t0), \
- [v0] "=&r"(v0) \
+ : [fn] "=c"(_fn), \
+ [tls] "=&r"(_tls), \
+ [t0] "=&r"(_t0), \
+ [v0] "=&r"(_v0) \
: [OPENGL_API] "I"(TLS_SLOT_OPENGL_API*4), \
[API] "I"(__builtin_offsetof(gl_hooks_t, gl._api)) \
: \
diff --git a/opengl/libs/GLES_CM/gl.cpp b/opengl/libs/GLES_CM/gl.cpp
index bd08942..8ac8ff9 100644
--- a/opengl/libs/GLES_CM/gl.cpp
+++ b/opengl/libs/GLES_CM/gl.cpp
@@ -122,10 +122,10 @@
#define API_ENTRY(_api) __attribute__((noinline)) _api
#define CALL_GL_API(_api, ...) \
- register unsigned int t0 asm("t0"); \
- register unsigned int fn asm("t1"); \
- register unsigned int tls asm("v1"); \
- register unsigned int v0 asm("v0"); \
+ register unsigned int _t0 asm("t0"); \
+ register unsigned int _fn asm("t1"); \
+ register unsigned int _tls asm("v1"); \
+ register unsigned int _v0 asm("v0"); \
asm volatile( \
".set push\n\t" \
".set noreorder\n\t" \
@@ -140,10 +140,10 @@
"j %[fn]\n\t" \
" move %[v0], $0\n\t" \
".set pop\n\t" \
- : [fn] "=c"(fn), \
- [tls] "=&r"(tls), \
- [t0] "=&r"(t0), \
- [v0] "=&r"(v0) \
+ : [fn] "=c"(_fn), \
+ [tls] "=&r"(_tls), \
+ [t0] "=&r"(_t0), \
+ [v0] "=&r"(_v0) \
: [OPENGL_API] "I"(TLS_SLOT_OPENGL_API*4), \
[API] "I"(__builtin_offsetof(gl_hooks_t, gl._api)) \
: \