diff options
| author | Mathias Agopian <mathias@google.com> | 2013-08-09 04:39:55 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-08-09 04:39:55 +0000 |
| commit | 5893a97cbf398ca3e1bff5444454343d94e25a4c (patch) | |
| tree | 0f06405449cc68737265d6b81dcc90ca6bdcb028 | |
| parent | 003123004f7b23b3dc472d5c40b8c1a16df37a54 (diff) | |
| parent | e3eae73abb5e429d9747f9c36ab025219e68bb26 (diff) | |
| download | frameworks_base-5893a97cbf398ca3e1bff5444454343d94e25a4c.zip frameworks_base-5893a97cbf398ca3e1bff5444454343d94e25a4c.tar.gz frameworks_base-5893a97cbf398ca3e1bff5444454343d94e25a4c.tar.bz2 | |
Merge "fix-up dependencies to gl headers" into klp-dev
| -rw-r--r-- | core/jni/android/graphics/SurfaceTexture.cpp | 3 | ||||
| -rw-r--r-- | media/mca/filterfw/native/core/gl_env.cpp | 2 | ||||
| -rw-r--r-- | media/mca/filterfw/native/core/gl_env.h | 3 |
3 files changed, 8 insertions, 0 deletions
diff --git a/core/jni/android/graphics/SurfaceTexture.cpp b/core/jni/android/graphics/SurfaceTexture.cpp index 2c482ea..bacfdf6 100644 --- a/core/jni/android/graphics/SurfaceTexture.cpp +++ b/core/jni/android/graphics/SurfaceTexture.cpp @@ -18,6 +18,9 @@ #include <stdio.h> +#include <GLES2/gl2.h> +#include <GLES2/gl2ext.h> + #include <gui/GLConsumer.h> #include <gui/Surface.h> diff --git a/media/mca/filterfw/native/core/gl_env.cpp b/media/mca/filterfw/native/core/gl_env.cpp index fdecda3..84dad8c 100644 --- a/media/mca/filterfw/native/core/gl_env.cpp +++ b/media/mca/filterfw/native/core/gl_env.cpp @@ -26,6 +26,8 @@ #include <string> #include <EGL/eglext.h> +#include <gui/GLConsumer.h> + namespace android { namespace filterfw { diff --git a/media/mca/filterfw/native/core/gl_env.h b/media/mca/filterfw/native/core/gl_env.h index 81e1e9d..a709638 100644 --- a/media/mca/filterfw/native/core/gl_env.h +++ b/media/mca/filterfw/native/core/gl_env.h @@ -31,6 +31,9 @@ #include <gui/Surface.h> namespace android { + +class GLConsumer; + namespace filterfw { class ShaderProgram; |