summaryrefslogtreecommitdiffstats
path: root/opengl
diff options
context:
space:
mode:
authorElliott Hughes2015-08-12 18:21:58 -0500
committerAndroid Git Automerger2015-08-12 18:21:58 -0500
commitc6ada3b169827f581cd61749c6056c4209ebb650 (patch)
tree508acc37b5d241c99acdf9c30e8b98937018ae28 /opengl
parent18343a2fd11583b884d1566a232a75b004fb3813 (diff)
parent6a846dd51885df861f4e1e30fcca86b9dd2f4092 (diff)
downloadframeworks-native-c6ada3b169827f581cd61749c6056c4209ebb650.tar.gz
frameworks-native-c6ada3b169827f581cd61749c6056c4209ebb650.tar.xz
frameworks-native-c6ada3b169827f581cd61749c6056c4209ebb650.zip
am 6a846dd5: am 5f5a0e0f: Merge "Lose HAVE_ANDROID_OS from frameworks/native."
* commit '6a846dd51885df861f4e1e30fcca86b9dd2f4092': Lose HAVE_ANDROID_OS from frameworks/native.
Diffstat (limited to 'opengl')
-rw-r--r--opengl/libagl/context.h4
-rw-r--r--opengl/libagl/egl.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/opengl/libagl/context.h b/opengl/libagl/context.h
index c599a55aa..d23f43568 100644
--- a/opengl/libagl/context.h
+++ b/opengl/libagl/context.h
@@ -21,7 +21,7 @@
21#include <stddef.h> 21#include <stddef.h>
22#include <sys/types.h> 22#include <sys/types.h>
23#include <pthread.h> 23#include <pthread.h>
24#ifdef HAVE_ANDROID_OS 24#ifdef __ANDROID__
25#include <bionic_tls.h> 25#include <bionic_tls.h>
26#endif 26#endif
27 27
@@ -579,7 +579,7 @@ private:
579// state 579// state
580// ---------------------------------------------------------------------------- 580// ----------------------------------------------------------------------------
581 581
582#ifdef HAVE_ANDROID_OS 582#ifdef __ANDROID__
583 // We have a dedicated TLS slot in bionic 583 // We have a dedicated TLS slot in bionic
584 inline void setGlThreadSpecific(ogles_context_t *value) { 584 inline void setGlThreadSpecific(ogles_context_t *value) {
585 __get_tls()[TLS_SLOT_OPENGL] = value; 585 __get_tls()[TLS_SLOT_OPENGL] = value;
diff --git a/opengl/libagl/egl.cpp b/opengl/libagl/egl.cpp
index 593d0c2d0..980a3895e 100644
--- a/opengl/libagl/egl.cpp
+++ b/opengl/libagl/egl.cpp
@@ -64,7 +64,7 @@ const unsigned int NUM_DISPLAYS = 1;
64static pthread_mutex_t gInitMutex = PTHREAD_MUTEX_INITIALIZER; 64static pthread_mutex_t gInitMutex = PTHREAD_MUTEX_INITIALIZER;
65static pthread_mutex_t gErrorKeyMutex = PTHREAD_MUTEX_INITIALIZER; 65static pthread_mutex_t gErrorKeyMutex = PTHREAD_MUTEX_INITIALIZER;
66static pthread_key_t gEGLErrorKey = -1; 66static pthread_key_t gEGLErrorKey = -1;
67#ifndef HAVE_ANDROID_OS 67#ifndef __ANDROID__
68namespace gl { 68namespace gl {
69pthread_key_t gGLKey = -1; 69pthread_key_t gGLKey = -1;
70}; // namespace gl 70}; // namespace gl
@@ -1403,7 +1403,7 @@ using namespace android;
1403 1403
1404EGLDisplay eglGetDisplay(NativeDisplayType display) 1404EGLDisplay eglGetDisplay(NativeDisplayType display)
1405{ 1405{
1406#ifndef HAVE_ANDROID_OS 1406#ifndef __ANDROID__
1407 // this just needs to be done once 1407 // this just needs to be done once
1408 if (gGLKey == -1) { 1408 if (gGLKey == -1) {
1409 pthread_mutex_lock(&gInitMutex); 1409 pthread_mutex_lock(&gInitMutex);