From c1a91516fefca31994dc45a8a634a88eaf6a129f Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Thu, 30 Oct 2014 13:39:22 -0700 Subject: Fix build which is due to a poor merge Related commit: fbb8828965084a753f04263f3265d68acbfdc7ab BUG:18155628 --- opengl/system/GLESv1_enc/gl_enc.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'opengl/system') diff --git a/opengl/system/GLESv1_enc/gl_enc.h b/opengl/system/GLESv1_enc/gl_enc.h index 2899b66..2935ef9 100644 --- a/opengl/system/GLESv1_enc/gl_enc.h +++ b/opengl/system/GLESv1_enc/gl_enc.h @@ -20,6 +20,7 @@ struct gl_encoder_context_t : public gl_client_context_t { }; +#if 0 extern "C" { void glAlphaFunc_enc(void *self , GLenum func, GLclampf ref); void glClearColor_enc(void *self , GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha); @@ -313,4 +314,6 @@ extern "C" { void glStartTilingQCOM_enc(void *self , GLuint x, GLuint y, GLuint width, GLuint height, GLbitfield preserveMask); void glEndTilingQCOM_enc(void *self , GLbitfield preserveMask); }; +#endif // 0 + #endif -- cgit v1.2.3