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 | 11abc8a36d639775b05a0471c9ea45d83fa19e56 (patch) | |
| tree | edf234f013ef3c88507f81dea65b8187cc672564 /opengl/libs/egl_impl.h | |
| parent | 6ec72e3fa9cdf9e896f3042fb1b1b4f3f6cea541 (diff) | |
| parent | e52a5a5fca18348728dfc5609b42b88e9cc7ef98 (diff) | |
| download | frameworks_base-11abc8a36d639775b05a0471c9ea45d83fa19e56.zip frameworks_base-11abc8a36d639775b05a0471c9ea45d83fa19e56.tar.gz frameworks_base-11abc8a36d639775b05a0471c9ea45d83fa19e56.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_impl.h')
| -rw-r--r-- | opengl/libs/egl_impl.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/opengl/libs/egl_impl.h b/opengl/libs/egl_impl.h index 4e0c7bf..80455d0 100644 --- a/opengl/libs/egl_impl.h +++ b/opengl/libs/egl_impl.h @@ -21,6 +21,7 @@ #include <EGL/egl.h> #include <EGL/eglext.h> +#include <EGL/eglplatform.h> // ---------------------------------------------------------------------------- namespace android { @@ -37,7 +38,7 @@ struct egl_connection_t int unavailable; }; -EGLImageKHR egl_get_image_for_current_context(EGLImageKHR image); +EGLAPI EGLImageKHR egl_get_image_for_current_context(EGLImageKHR image); // ---------------------------------------------------------------------------- }; // namespace android |