Fix MIPS assembly variable names to not conflict with GL API parameter names (441f6946) · Commits · e / os / android_frameworks_native-old

opengl/libs/EGL/getProcAddress.cpp

+6 −6

Original line number	Original line	Diff line number	Diff line
	@@ -64,9 +64,9 @@ namespace android {
	#define API_ENTRY(_api) __attribute__((noinline)) _api		#define API_ENTRY(_api) __attribute__((noinline)) _api

	#define CALL_GL_EXTENSION_API(_api, ...) \		#define CALL_GL_EXTENSION_API(_api, ...) \
	register unsigned int t0 asm("t0"); \		register unsigned int _t0 asm("t0"); \
	register unsigned int fn asm("t1"); \		register unsigned int _fn asm("t1"); \
	register unsigned int tls asm("v1"); \		register unsigned int _tls asm("v1"); \
	asm volatile( \		asm volatile( \
	".set push\n\t" \		".set push\n\t" \
	".set noreorder\n\t" \		".set noreorder\n\t" \
	@@ -81,9 +81,9 @@ namespace android {
	"j %[fn]\n\t" \		"j %[fn]\n\t" \
	" nop\n\t" \		" nop\n\t" \
	".set pop\n\t" \		".set pop\n\t" \
	: [fn] "=c"(fn), \		: [fn] "=c"(_fn), \
	[tls] "=&r"(tls), \		[tls] "=&r"(_tls), \
	[t0] "=&r"(t0) \		[t0] "=&r"(_t0) \
	: [OPENGL_API] "I"(TLS_SLOT_OPENGL_API*4), \		: [OPENGL_API] "I"(TLS_SLOT_OPENGL_API*4), \
	[API] "I"(__builtin_offsetof(gl_hooks_t, \		[API] "I"(__builtin_offsetof(gl_hooks_t, \
	ext.extensions[_api])) \		ext.extensions[_api])) \

+8 −8

Original line number	Original line	Diff line number	Diff line
	@@ -67,10 +67,10 @@ using namespace android;
	#define API_ENTRY(_api) __attribute__((noinline)) _api		#define API_ENTRY(_api) __attribute__((noinline)) _api

	#define CALL_GL_API(_api, ...) \		#define CALL_GL_API(_api, ...) \
	register unsigned int t0 asm("t0"); \		register unsigned int _t0 asm("t0"); \
	register unsigned int fn asm("t1"); \		register unsigned int _fn asm("t1"); \
	register unsigned int tls asm("v1"); \		register unsigned int _tls asm("v1"); \
	register unsigned int v0 asm("v0"); \		register unsigned int _v0 asm("v0"); \
	asm volatile( \		asm volatile( \
	".set push\n\t" \		".set push\n\t" \
	".set noreorder\n\t" \		".set noreorder\n\t" \
	@@ -85,10 +85,10 @@ using namespace android;
	"j %[fn]\n\t" \		"j %[fn]\n\t" \
	" move %[v0], $0\n\t" \		" move %[v0], $0\n\t" \
	".set pop\n\t" \		".set pop\n\t" \
	: [fn] "=c"(fn), \		: [fn] "=c"(_fn), \
	[tls] "=&r"(tls), \		[tls] "=&r"(_tls), \
	[t0] "=&r"(t0), \		[t0] "=&r"(_t0), \
	[v0] "=&r"(v0) \		[v0] "=&r"(_v0) \
	: [OPENGL_API] "I"(TLS_SLOT_OPENGL_API*4), \		: [OPENGL_API] "I"(TLS_SLOT_OPENGL_API*4), \
	[API] "I"(__builtin_offsetof(gl_hooks_t, gl._api)) \		[API] "I"(__builtin_offsetof(gl_hooks_t, gl._api)) \
	: \		: \

+8 −8

Original line number	Original line	Diff line number	Diff line
	@@ -122,10 +122,10 @@ GL_API void GL_APIENTRY glWeightPointerOESBounds(GLint size, GLenum type,
	#define API_ENTRY(_api) __attribute__((noinline)) _api		#define API_ENTRY(_api) __attribute__((noinline)) _api

	#define CALL_GL_API(_api, ...) \		#define CALL_GL_API(_api, ...) \
	register unsigned int t0 asm("t0"); \		register unsigned int _t0 asm("t0"); \
	register unsigned int fn asm("t1"); \		register unsigned int _fn asm("t1"); \
	register unsigned int tls asm("v1"); \		register unsigned int _tls asm("v1"); \
	register unsigned int v0 asm("v0"); \		register unsigned int _v0 asm("v0"); \
	asm volatile( \		asm volatile( \
	".set push\n\t" \		".set push\n\t" \
	".set noreorder\n\t" \		".set noreorder\n\t" \
	@@ -140,10 +140,10 @@ GL_API void GL_APIENTRY glWeightPointerOESBounds(GLint size, GLenum type,
	"j %[fn]\n\t" \		"j %[fn]\n\t" \
	" move %[v0], $0\n\t" \		" move %[v0], $0\n\t" \
	".set pop\n\t" \		".set pop\n\t" \
	: [fn] "=c"(fn), \		: [fn] "=c"(_fn), \
	[tls] "=&r"(tls), \		[tls] "=&r"(_tls), \
	[t0] "=&r"(t0), \		[t0] "=&r"(_t0), \
	[v0] "=&r"(v0) \		[v0] "=&r"(_v0) \
	: [OPENGL_API] "I"(TLS_SLOT_OPENGL_API*4), \		: [OPENGL_API] "I"(TLS_SLOT_OPENGL_API*4), \
	[API] "I"(__builtin_offsetof(gl_hooks_t, gl._api)) \		[API] "I"(__builtin_offsetof(gl_hooks_t, gl._api)) \
	: \		: \