diff options
| author | Mathias Agopian <mathias@google.com> | 2009-05-14 22:44:23 -0700 |
|---|---|---|
| committer | Mathias Agopian <mathias@google.com> | 2009-05-14 22:44:23 -0700 |
| commit | d717598616910b5454b56429dec3bfad2757bd52 (patch) | |
| tree | c2271b0f7e475c4ac1cf520bcecd6f35e002d99a /opengl/libs/EGL | |
| parent | 5958661507b39cd59e68e9bc2b54399af92847c4 (diff) | |
| parent | 757a434f81895ddcad2481a5912ff1eb0de8a0d6 (diff) | |
| download | frameworks_native-d717598616910b5454b56429dec3bfad2757bd52.zip frameworks_native-d717598616910b5454b56429dec3bfad2757bd52.tar.gz frameworks_native-d717598616910b5454b56429dec3bfad2757bd52.tar.bz2 | |
Merge commit 'goog/master' into merge_master
Conflicts:
opengl/libagl/Android.mk
opengl/libs/Android.mk
opengl/libs/egl_impl.h
Diffstat (limited to 'opengl/libs/EGL')
| -rw-r--r-- | opengl/libs/EGL/egl.cpp | 4 | ||||
| -rw-r--r-- | opengl/libs/EGL/gpu.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/opengl/libs/EGL/egl.cpp b/opengl/libs/EGL/egl.cpp index 6c80538..7cdf494 100644 --- a/opengl/libs/EGL/egl.cpp +++ b/opengl/libs/EGL/egl.cpp @@ -178,8 +178,8 @@ static pthread_key_t gEGLThreadLocalStorageKey = -1; // ---------------------------------------------------------------------------- -gl_hooks_t gHooks[IMPL_NUM_IMPLEMENTATIONS]; -pthread_key_t gGLWrapperKey = -1; +EGLAPI gl_hooks_t gHooks[IMPL_NUM_IMPLEMENTATIONS]; +EGLAPI pthread_key_t gGLWrapperKey = -1; // ---------------------------------------------------------------------------- diff --git a/opengl/libs/EGL/gpu.cpp b/opengl/libs/EGL/gpu.cpp index 3f9fd63..f9dc5f1 100644 --- a/opengl/libs/EGL/gpu.cpp +++ b/opengl/libs/EGL/gpu.cpp @@ -53,7 +53,7 @@ namespace android { static Mutex gRegionsLock; static request_gpu_t gRegions; static sp<ISurfaceComposer> gSurfaceManager; -ISurfaceComposer* GLES_localSurfaceManager = 0; +GL_API ISurfaceComposer* GLES_localSurfaceManager = 0; extern egl_connection_t gEGLImpl[2]; |