diff options
| author | David 'Digit' Turner <digit@google.com> | 2014-10-30 11:30:02 +0100 |
|---|---|---|
| committer | David 'Digit' Turner <digit@google.com> | 2014-10-30 11:30:02 +0100 |
| commit | fbb8828965084a753f04263f3265d68acbfdc7ab (patch) | |
| tree | 49eb103adee3ada4731e8926b84258b637522a9c /opengl | |
| parent | 488d8a3b67937ec6a0898f4de82717b2021e81c2 (diff) | |
| parent | 7472654eec2594e6476b38cea396a3f213dedd1a (diff) | |
| download | android_device_generic_goldfish-fbb8828965084a753f04263f3265d68acbfdc7ab.tar.gz android_device_generic_goldfish-fbb8828965084a753f04263f3265d68acbfdc7ab.tar.bz2 android_device_generic_goldfish-fbb8828965084a753f04263f3265d68acbfdc7ab.zip | |
resolved conflicts for merge of 7472654e to stage-aosp-master
Change-Id: Ieda2d8d1ac00854de28959e4632827a12b399cf2
Diffstat (limited to 'opengl')
| -rw-r--r-- | opengl/system/GLESv1_enc/gl_enc.cpp | 5 | ||||
| -rw-r--r-- | opengl/system/GLESv2_enc/gl2_enc.cpp | 7 | ||||
| -rw-r--r-- | opengl/system/GLESv2_enc/gl2_enc.h | 3 |
3 files changed, 15 insertions, 0 deletions
diff --git a/opengl/system/GLESv1_enc/gl_enc.cpp b/opengl/system/GLESv1_enc/gl_enc.cpp index 0a343df..019c409 100644 --- a/opengl/system/GLESv1_enc/gl_enc.cpp +++ b/opengl/system/GLESv1_enc/gl_enc.cpp @@ -7,6 +7,7 @@ #include "gl_enc.h" +namespace glesv1_enc { #include <stdio.h> static void enc_unsupported() @@ -4885,6 +4886,10 @@ void glEndTilingQCOM_enc(void *self , GLbitfield preserveMask) memcpy(ptr, &preserveMask, 4); ptr += 4; } +} // namespace glesv1_enc + +using namespace glesv1_enc; + gl_encoder_context_t::gl_encoder_context_t(IOStream *stream) { m_stream = stream; diff --git a/opengl/system/GLESv2_enc/gl2_enc.cpp b/opengl/system/GLESv2_enc/gl2_enc.cpp index 5929697..9a5c1b4 100644 --- a/opengl/system/GLESv2_enc/gl2_enc.cpp +++ b/opengl/system/GLESv2_enc/gl2_enc.cpp @@ -9,6 +9,9 @@ #include <stdio.h> + +namespace glesv2_enc { + static void enc_unsupported() { ALOGE("Function is unsupported\n"); @@ -2914,6 +2917,10 @@ int glFinishRoundTrip_enc(void *self ) return retval; } +} // namespace glesv2_enc + +using namespace glesv2_enc; + gl2_encoder_context_t::gl2_encoder_context_t(IOStream *stream) { m_stream = stream; diff --git a/opengl/system/GLESv2_enc/gl2_enc.h b/opengl/system/GLESv2_enc/gl2_enc.h index f4f3f60..7189377 100644 --- a/opengl/system/GLESv2_enc/gl2_enc.h +++ b/opengl/system/GLESv2_enc/gl2_enc.h @@ -21,6 +21,7 @@ struct gl2_encoder_context_t : public gl2_client_context_t { }; +#if 0 extern "C" { void glActiveTexture_enc(void *self , GLenum texture); void glAttachShader_enc(void *self , GLuint program, GLuint shader); @@ -231,4 +232,6 @@ extern "C" { void glShaderString_enc(void *self , GLuint shader, const GLchar* string, GLsizei len); int glFinishRoundTrip_enc(void *self ); }; +#endif // 0 + #endif |