diff options
author | David 'Digit' Turner <digit@google.com> | 2014-10-31 16:27:34 +0100 |
---|---|---|
committer | David 'Digit' Turner <digit@google.com> | 2014-10-31 16:27:34 +0100 |
commit | 54284eb63c164d924f39f15086e55c65d8e6833f (patch) | |
tree | 2233de38d227b7e60045b687ee6ffa1d667f5f26 /opengl/system/renderControl_enc/renderControl_enc.h | |
parent | c1a91516fefca31994dc45a8a634a88eaf6a129f (diff) | |
parent | 5a7d8f2d70c2c84f0f84c2b8d0ac3fc119935259 (diff) | |
download | android_device_generic_goldfish-54284eb63c164d924f39f15086e55c65d8e6833f.tar.gz android_device_generic_goldfish-54284eb63c164d924f39f15086e55c65d8e6833f.tar.bz2 android_device_generic_goldfish-54284eb63c164d924f39f15086e55c65d8e6833f.zip |
resolved conflicts for merge of 5a7d8f2d to stage-aosp-master
Change-Id: I4ce3cee422f8e98d70bbf2ffcaac34650c7182b4
Diffstat (limited to 'opengl/system/renderControl_enc/renderControl_enc.h')
-rw-r--r-- | opengl/system/renderControl_enc/renderControl_enc.h | 32 |
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 |