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

1 files changed, 1 insertions, 31 deletions

diff --git a/opengl/system/renderControl_enc/renderControl_enc.h b/opengl/system/renderControl_enc/renderControl_enc.h
index 92ef76e..9469ae4 100644
--- a/opengl/system/renderControl_enc/renderControl_enc.h
+++ b/opengl/system/renderControl_enc/renderControl_enc.h
@@ -17,36 +17,6 @@ struct renderControl_encoder_context_t : public renderControl_client_context_t {
 	IOStream *m_stream;
 
 	renderControl_encoder_context_t(IOStream *stream);
-
-
 };
 
-extern "C" {
-	GLint rcGetRendererVersion_enc(void *self );
-	EGLint rcGetEGLVersion_enc(void *self , EGLint* major, EGLint* minor);
-	EGLint rcQueryEGLString_enc(void *self , EGLenum name, void* buffer, EGLint bufferSize);
-	EGLint rcGetGLString_enc(void *self , EGLenum name, void* buffer, EGLint bufferSize);
-	EGLint rcGetNumConfigs_enc(void *self , uint32_t* numAttribs);
-	EGLint rcGetConfigs_enc(void *self , uint32_t bufSize, GLuint* buffer);
-	EGLint rcChooseConfig_enc(void *self , EGLint* attribs, uint32_t attribs_size, uint32_t* configs, uint32_t configs_size);
-	EGLint rcGetFBParam_enc(void *self , EGLint param);
-	uint32_t rcCreateContext_enc(void *self , uint32_t config, uint32_t share, uint32_t glVersion);
-	void rcDestroyContext_enc(void *self , uint32_t context);
-	uint32_t rcCreateWindowSurface_enc(void *self , uint32_t config, uint32_t width, uint32_t height);
-	void rcDestroyWindowSurface_enc(void *self , uint32_t windowSurface);
-	uint32_t rcCreateColorBuffer_enc(void *self , uint32_t width, uint32_t height, GLenum internalFormat);
-	void rcOpenColorBuffer_enc(void *self , uint32_t colorbuffer);
-	void rcCloseColorBuffer_enc(void *self , uint32_t colorbuffer);
-	void rcSetWindowColorBuffer_enc(void *self , uint32_t windowSurface, uint32_t colorBuffer);
-	int rcFlushWindowColorBuffer_enc(void *self , uint32_t windowSurface);
-	EGLint rcMakeCurrent_enc(void *self , uint32_t context, uint32_t drawSurf, uint32_t readSurf);
-	void rcFBPost_enc(void *self , uint32_t colorBuffer);
-	void rcFBSetSwapInterval_enc(void *self , EGLint interval);
-	void rcBindTexture_enc(void *self , uint32_t colorBuffer);
-	void rcBindRenderbuffer_enc(void *self , uint32_t colorBuffer);
-	EGLint rcColorBufferCacheFlush_enc(void *self , uint32_t colorbuffer, EGLint postCount, int forRead);
-	void rcReadColorBuffer_enc(void *self , uint32_t colorbuffer, GLint x, GLint y, GLint width, GLint height, GLenum format, GLenum type, void* pixels);
-	int rcUpdateColorBuffer_enc(void *self , uint32_t colorbuffer, GLint x, GLint y, GLint width, GLint height, GLenum format, GLenum type, void* pixels);
-	int rcOpenColorBuffer2_enc(void *self , uint32_t colorbuffer);
-};
-#endif
\ No newline at end of file
+#endif  // GUARD_renderControl_encoder_context_t
\ No newline at end of file