diff options
| author | bohu <bohu@google.com> | 2014-12-02 11:44:44 -0800 |
|---|---|---|
| committer | bohu <bohu@google.com> | 2014-12-02 11:44:44 -0800 |
| commit | 8d97f57470bcb540bf7bf60c0b23391942838271 (patch) | |
| tree | 5e99ddb9caa643ac352b263829b2ab12a30b40e7 /opengl/system/GLESv1_enc/GLEncoderUtils.h | |
| parent | 758ef0bc56397ba50f96b7b9109cb6c50a7cdf29 (diff) | |
| download | android_device_generic_goldfish-8d97f57470bcb540bf7bf60c0b23391942838271.tar.gz android_device_generic_goldfish-8d97f57470bcb540bf7bf60c0b23391942838271.tar.bz2 android_device_generic_goldfish-8d97f57470bcb540bf7bf60c0b23391942838271.zip | |
Update goldfish from aosp/master
Merge aosp/master fixes into lmp-dev
This patch updates the goldfish device to match the following
patches:
1c9492dd Fix GPU emulation crash.
1da62b8c opengl: Fix a few function name typos.
a4d0e1ca opengl: Remove accessor functions from encoders.
223a765d opengl: Remove compiler warnings.
b7837c3c opengl: Regenerate GPU emulation encoder sources.
622970b4 opengl: Fix 64-bit build.
5fa17220 Unbind buffer when buffer is deleted
4a01a642 Properly initialize GLClientState's m_states
2c71ccd4 handles glGetBooleanv when value is nonboolean
4f9ec391 Fix eglDestroyContext and glTexImage2D
585a4b03 opengl: Fix pixelDataSize() ambiguity.
Change-Id: I3f574149558b4b4cee8a3e354314f6da8f49957d
Diffstat (limited to 'opengl/system/GLESv1_enc/GLEncoderUtils.h')
| -rw-r--r-- | opengl/system/GLESv1_enc/GLEncoderUtils.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/opengl/system/GLESv1_enc/GLEncoderUtils.h b/opengl/system/GLESv1_enc/GLEncoderUtils.h index 1d0c847..05cc9e1 100644 --- a/opengl/system/GLESv1_enc/GLEncoderUtils.h +++ b/opengl/system/GLESv1_enc/GLEncoderUtils.h @@ -16,7 +16,8 @@ #ifndef GL_ENCODER_UTILS_H #define GL_ENCLODER_UTILS_H -extern "C" { +namespace glesv1_enc { size_t pixelDataSize(void *self, GLsizei width, GLsizei height, GLenum format, GLenum type, int pack); }; + #endif |