Merge "small cleanup. gEGLImpl should have been static" into kraken
This commit is contained in:
committed by
Android (Google) Code Review
commit
cf2bd28510
@@ -239,7 +239,7 @@ struct tls_t
|
|||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
|
|
||||||
egl_connection_t gEGLImpl[IMPL_NUM_IMPLEMENTATIONS];
|
static egl_connection_t gEGLImpl[IMPL_NUM_IMPLEMENTATIONS];
|
||||||
static egl_display_t gDisplay[NUM_DISPLAYS];
|
static egl_display_t gDisplay[NUM_DISPLAYS];
|
||||||
static pthread_mutex_t gThreadLocalStorageKeyMutex = PTHREAD_MUTEX_INITIALIZER;
|
static pthread_mutex_t gThreadLocalStorageKeyMutex = PTHREAD_MUTEX_INITIALIZER;
|
||||||
static pthread_key_t gEGLThreadLocalStorageKey = -1;
|
static pthread_key_t gEGLThreadLocalStorageKey = -1;
|
||||||
|
|||||||
@@ -31,6 +31,7 @@ namespace android {
|
|||||||
|
|
||||||
struct egl_connection_t
|
struct egl_connection_t
|
||||||
{
|
{
|
||||||
|
inline egl_connection_t() : dso(0) { }
|
||||||
void * dso;
|
void * dso;
|
||||||
gl_hooks_t * hooks[2];
|
gl_hooks_t * hooks[2];
|
||||||
EGLint major;
|
EGLint major;
|
||||||
|
|||||||
Reference in New Issue
Block a user