Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a5b1ac67 authored Mar 15, 2015 by Jesse Hall Committed by Android Git Automerger Mar 15, 2015

am 5e44f932: am b6b81d6a: Merge "[MIPS] Fix mips32r1 build"

* commit '5e44f932':
  [MIPS] Fix mips32r1 build

parents decf42e3 5e44f932

opengl/libs/EGL/getProcAddress.cpp

+1 −0

Original line number	Diff line number	Diff line
		@@ -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" \

opengl/libs/GLES2/gl2.cpp

+1 −0

Original line number	Diff line number	Diff line
		@@ -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" \

opengl/libs/GLES_CM/gl.cpp

+1 −0

Original line number	Diff line number	Diff line
		@@ -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" \