diff options
| author | Jesse Hall <jessehall@google.com> | 2013-03-30 23:22:19 -0700 |
|---|---|---|
| committer | Jesse Hall <jessehall@google.com> | 2013-03-30 23:22:19 -0700 |
| commit | 441f69463ec595ad42fdaad1bbfbb0f7a932437c (patch) | |
| tree | a7812c0e7c2aa6be449c147d91e80ab00cd324b3 /opengl/libs/GLES2 | |
| parent | 86e392e9b3b92e3a58d2fb65eef1552108941a76 (diff) | |
| download | frameworks_native-441f69463ec595ad42fdaad1bbfbb0f7a932437c.zip frameworks_native-441f69463ec595ad42fdaad1bbfbb0f7a932437c.tar.gz frameworks_native-441f69463ec595ad42fdaad1bbfbb0f7a932437c.tar.bz2 | |
Fix MIPS assembly variable names to not conflict with GL API parameter names
Change-Id: I8e93fb55018de53a596cb176d48dbfdf1fd396e4
Diffstat (limited to 'opengl/libs/GLES2')
| -rw-r--r-- | opengl/libs/GLES2/gl2.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
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 @@ using namespace android; #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 @@ using namespace android; "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)) \ : \ |