diff options
Diffstat (limited to 'opengl/system/renderControl_enc')
6 files changed, 115 insertions, 170 deletions
diff --git a/opengl/system/renderControl_enc/renderControl_client_context.cpp b/opengl/system/renderControl_enc/renderControl_client_context.cpp index a4bdb25..f58f549 100644 --- a/opengl/system/renderControl_enc/renderControl_client_context.cpp +++ b/opengl/system/renderControl_enc/renderControl_client_context.cpp @@ -10,34 +10,32 @@ int renderControl_client_context_t::initDispatchByName(void *(*getProc)(const char *, void *userData), void *userData) { - void *ptr; - - ptr = getProc("rcGetRendererVersion", userData); set_rcGetRendererVersion((rcGetRendererVersion_client_proc_t)ptr); - ptr = getProc("rcGetEGLVersion", userData); set_rcGetEGLVersion((rcGetEGLVersion_client_proc_t)ptr); - ptr = getProc("rcQueryEGLString", userData); set_rcQueryEGLString((rcQueryEGLString_client_proc_t)ptr); - ptr = getProc("rcGetGLString", userData); set_rcGetGLString((rcGetGLString_client_proc_t)ptr); - ptr = getProc("rcGetNumConfigs", userData); set_rcGetNumConfigs((rcGetNumConfigs_client_proc_t)ptr); - ptr = getProc("rcGetConfigs", userData); set_rcGetConfigs((rcGetConfigs_client_proc_t)ptr); - ptr = getProc("rcChooseConfig", userData); set_rcChooseConfig((rcChooseConfig_client_proc_t)ptr); - ptr = getProc("rcGetFBParam", userData); set_rcGetFBParam((rcGetFBParam_client_proc_t)ptr); - ptr = getProc("rcCreateContext", userData); set_rcCreateContext((rcCreateContext_client_proc_t)ptr); - ptr = getProc("rcDestroyContext", userData); set_rcDestroyContext((rcDestroyContext_client_proc_t)ptr); - ptr = getProc("rcCreateWindowSurface", userData); set_rcCreateWindowSurface((rcCreateWindowSurface_client_proc_t)ptr); - ptr = getProc("rcDestroyWindowSurface", userData); set_rcDestroyWindowSurface((rcDestroyWindowSurface_client_proc_t)ptr); - ptr = getProc("rcCreateColorBuffer", userData); set_rcCreateColorBuffer((rcCreateColorBuffer_client_proc_t)ptr); - ptr = getProc("rcOpenColorBuffer", userData); set_rcOpenColorBuffer((rcOpenColorBuffer_client_proc_t)ptr); - ptr = getProc("rcCloseColorBuffer", userData); set_rcCloseColorBuffer((rcCloseColorBuffer_client_proc_t)ptr); - ptr = getProc("rcSetWindowColorBuffer", userData); set_rcSetWindowColorBuffer((rcSetWindowColorBuffer_client_proc_t)ptr); - ptr = getProc("rcFlushWindowColorBuffer", userData); set_rcFlushWindowColorBuffer((rcFlushWindowColorBuffer_client_proc_t)ptr); - ptr = getProc("rcMakeCurrent", userData); set_rcMakeCurrent((rcMakeCurrent_client_proc_t)ptr); - ptr = getProc("rcFBPost", userData); set_rcFBPost((rcFBPost_client_proc_t)ptr); - ptr = getProc("rcFBSetSwapInterval", userData); set_rcFBSetSwapInterval((rcFBSetSwapInterval_client_proc_t)ptr); - ptr = getProc("rcBindTexture", userData); set_rcBindTexture((rcBindTexture_client_proc_t)ptr); - ptr = getProc("rcBindRenderbuffer", userData); set_rcBindRenderbuffer((rcBindRenderbuffer_client_proc_t)ptr); - ptr = getProc("rcColorBufferCacheFlush", userData); set_rcColorBufferCacheFlush((rcColorBufferCacheFlush_client_proc_t)ptr); - ptr = getProc("rcReadColorBuffer", userData); set_rcReadColorBuffer((rcReadColorBuffer_client_proc_t)ptr); - ptr = getProc("rcUpdateColorBuffer", userData); set_rcUpdateColorBuffer((rcUpdateColorBuffer_client_proc_t)ptr); - ptr = getProc("rcOpenColorBuffer2", userData); set_rcOpenColorBuffer2((rcOpenColorBuffer2_client_proc_t)ptr); + rcGetRendererVersion = (rcGetRendererVersion_client_proc_t) getProc("rcGetRendererVersion", userData); + rcGetEGLVersion = (rcGetEGLVersion_client_proc_t) getProc("rcGetEGLVersion", userData); + rcQueryEGLString = (rcQueryEGLString_client_proc_t) getProc("rcQueryEGLString", userData); + rcGetGLString = (rcGetGLString_client_proc_t) getProc("rcGetGLString", userData); + rcGetNumConfigs = (rcGetNumConfigs_client_proc_t) getProc("rcGetNumConfigs", userData); + rcGetConfigs = (rcGetConfigs_client_proc_t) getProc("rcGetConfigs", userData); + rcChooseConfig = (rcChooseConfig_client_proc_t) getProc("rcChooseConfig", userData); + rcGetFBParam = (rcGetFBParam_client_proc_t) getProc("rcGetFBParam", userData); + rcCreateContext = (rcCreateContext_client_proc_t) getProc("rcCreateContext", userData); + rcDestroyContext = (rcDestroyContext_client_proc_t) getProc("rcDestroyContext", userData); + rcCreateWindowSurface = (rcCreateWindowSurface_client_proc_t) getProc("rcCreateWindowSurface", userData); + rcDestroyWindowSurface = (rcDestroyWindowSurface_client_proc_t) getProc("rcDestroyWindowSurface", userData); + rcCreateColorBuffer = (rcCreateColorBuffer_client_proc_t) getProc("rcCreateColorBuffer", userData); + rcOpenColorBuffer = (rcOpenColorBuffer_client_proc_t) getProc("rcOpenColorBuffer", userData); + rcCloseColorBuffer = (rcCloseColorBuffer_client_proc_t) getProc("rcCloseColorBuffer", userData); + rcSetWindowColorBuffer = (rcSetWindowColorBuffer_client_proc_t) getProc("rcSetWindowColorBuffer", userData); + rcFlushWindowColorBuffer = (rcFlushWindowColorBuffer_client_proc_t) getProc("rcFlushWindowColorBuffer", userData); + rcMakeCurrent = (rcMakeCurrent_client_proc_t) getProc("rcMakeCurrent", userData); + rcFBPost = (rcFBPost_client_proc_t) getProc("rcFBPost", userData); + rcFBSetSwapInterval = (rcFBSetSwapInterval_client_proc_t) getProc("rcFBSetSwapInterval", userData); + rcBindTexture = (rcBindTexture_client_proc_t) getProc("rcBindTexture", userData); + rcBindRenderbuffer = (rcBindRenderbuffer_client_proc_t) getProc("rcBindRenderbuffer", userData); + rcColorBufferCacheFlush = (rcColorBufferCacheFlush_client_proc_t) getProc("rcColorBufferCacheFlush", userData); + rcReadColorBuffer = (rcReadColorBuffer_client_proc_t) getProc("rcReadColorBuffer", userData); + rcUpdateColorBuffer = (rcUpdateColorBuffer_client_proc_t) getProc("rcUpdateColorBuffer", userData); + rcOpenColorBuffer2 = (rcOpenColorBuffer2_client_proc_t) getProc("rcOpenColorBuffer2", userData); return 0; } diff --git a/opengl/system/renderControl_enc/renderControl_client_context.h b/opengl/system/renderControl_enc/renderControl_client_context.h index 46a007f..4c71d89 100644 --- a/opengl/system/renderControl_enc/renderControl_client_context.h +++ b/opengl/system/renderControl_enc/renderControl_client_context.h @@ -34,39 +34,12 @@ struct renderControl_client_context_t { rcReadColorBuffer_client_proc_t rcReadColorBuffer; rcUpdateColorBuffer_client_proc_t rcUpdateColorBuffer; rcOpenColorBuffer2_client_proc_t rcOpenColorBuffer2; - //Accessors - virtual rcGetRendererVersion_client_proc_t set_rcGetRendererVersion(rcGetRendererVersion_client_proc_t f) { rcGetRendererVersion_client_proc_t retval = rcGetRendererVersion; rcGetRendererVersion = f; return retval;} - virtual rcGetEGLVersion_client_proc_t set_rcGetEGLVersion(rcGetEGLVersion_client_proc_t f) { rcGetEGLVersion_client_proc_t retval = rcGetEGLVersion; rcGetEGLVersion = f; return retval;} - virtual rcQueryEGLString_client_proc_t set_rcQueryEGLString(rcQueryEGLString_client_proc_t f) { rcQueryEGLString_client_proc_t retval = rcQueryEGLString; rcQueryEGLString = f; return retval;} - virtual rcGetGLString_client_proc_t set_rcGetGLString(rcGetGLString_client_proc_t f) { rcGetGLString_client_proc_t retval = rcGetGLString; rcGetGLString = f; return retval;} - virtual rcGetNumConfigs_client_proc_t set_rcGetNumConfigs(rcGetNumConfigs_client_proc_t f) { rcGetNumConfigs_client_proc_t retval = rcGetNumConfigs; rcGetNumConfigs = f; return retval;} - virtual rcGetConfigs_client_proc_t set_rcGetConfigs(rcGetConfigs_client_proc_t f) { rcGetConfigs_client_proc_t retval = rcGetConfigs; rcGetConfigs = f; return retval;} - virtual rcChooseConfig_client_proc_t set_rcChooseConfig(rcChooseConfig_client_proc_t f) { rcChooseConfig_client_proc_t retval = rcChooseConfig; rcChooseConfig = f; return retval;} - virtual rcGetFBParam_client_proc_t set_rcGetFBParam(rcGetFBParam_client_proc_t f) { rcGetFBParam_client_proc_t retval = rcGetFBParam; rcGetFBParam = f; return retval;} - virtual rcCreateContext_client_proc_t set_rcCreateContext(rcCreateContext_client_proc_t f) { rcCreateContext_client_proc_t retval = rcCreateContext; rcCreateContext = f; return retval;} - virtual rcDestroyContext_client_proc_t set_rcDestroyContext(rcDestroyContext_client_proc_t f) { rcDestroyContext_client_proc_t retval = rcDestroyContext; rcDestroyContext = f; return retval;} - virtual rcCreateWindowSurface_client_proc_t set_rcCreateWindowSurface(rcCreateWindowSurface_client_proc_t f) { rcCreateWindowSurface_client_proc_t retval = rcCreateWindowSurface; rcCreateWindowSurface = f; return retval;} - virtual rcDestroyWindowSurface_client_proc_t set_rcDestroyWindowSurface(rcDestroyWindowSurface_client_proc_t f) { rcDestroyWindowSurface_client_proc_t retval = rcDestroyWindowSurface; rcDestroyWindowSurface = f; return retval;} - virtual rcCreateColorBuffer_client_proc_t set_rcCreateColorBuffer(rcCreateColorBuffer_client_proc_t f) { rcCreateColorBuffer_client_proc_t retval = rcCreateColorBuffer; rcCreateColorBuffer = f; return retval;} - virtual rcOpenColorBuffer_client_proc_t set_rcOpenColorBuffer(rcOpenColorBuffer_client_proc_t f) { rcOpenColorBuffer_client_proc_t retval = rcOpenColorBuffer; rcOpenColorBuffer = f; return retval;} - virtual rcCloseColorBuffer_client_proc_t set_rcCloseColorBuffer(rcCloseColorBuffer_client_proc_t f) { rcCloseColorBuffer_client_proc_t retval = rcCloseColorBuffer; rcCloseColorBuffer = f; return retval;} - virtual rcSetWindowColorBuffer_client_proc_t set_rcSetWindowColorBuffer(rcSetWindowColorBuffer_client_proc_t f) { rcSetWindowColorBuffer_client_proc_t retval = rcSetWindowColorBuffer; rcSetWindowColorBuffer = f; return retval;} - virtual rcFlushWindowColorBuffer_client_proc_t set_rcFlushWindowColorBuffer(rcFlushWindowColorBuffer_client_proc_t f) { rcFlushWindowColorBuffer_client_proc_t retval = rcFlushWindowColorBuffer; rcFlushWindowColorBuffer = f; return retval;} - virtual rcMakeCurrent_client_proc_t set_rcMakeCurrent(rcMakeCurrent_client_proc_t f) { rcMakeCurrent_client_proc_t retval = rcMakeCurrent; rcMakeCurrent = f; return retval;} - virtual rcFBPost_client_proc_t set_rcFBPost(rcFBPost_client_proc_t f) { rcFBPost_client_proc_t retval = rcFBPost; rcFBPost = f; return retval;} - virtual rcFBSetSwapInterval_client_proc_t set_rcFBSetSwapInterval(rcFBSetSwapInterval_client_proc_t f) { rcFBSetSwapInterval_client_proc_t retval = rcFBSetSwapInterval; rcFBSetSwapInterval = f; return retval;} - virtual rcBindTexture_client_proc_t set_rcBindTexture(rcBindTexture_client_proc_t f) { rcBindTexture_client_proc_t retval = rcBindTexture; rcBindTexture = f; return retval;} - virtual rcBindRenderbuffer_client_proc_t set_rcBindRenderbuffer(rcBindRenderbuffer_client_proc_t f) { rcBindRenderbuffer_client_proc_t retval = rcBindRenderbuffer; rcBindRenderbuffer = f; return retval;} - virtual rcColorBufferCacheFlush_client_proc_t set_rcColorBufferCacheFlush(rcColorBufferCacheFlush_client_proc_t f) { rcColorBufferCacheFlush_client_proc_t retval = rcColorBufferCacheFlush; rcColorBufferCacheFlush = f; return retval;} - virtual rcReadColorBuffer_client_proc_t set_rcReadColorBuffer(rcReadColorBuffer_client_proc_t f) { rcReadColorBuffer_client_proc_t retval = rcReadColorBuffer; rcReadColorBuffer = f; return retval;} - virtual rcUpdateColorBuffer_client_proc_t set_rcUpdateColorBuffer(rcUpdateColorBuffer_client_proc_t f) { rcUpdateColorBuffer_client_proc_t retval = rcUpdateColorBuffer; rcUpdateColorBuffer = f; return retval;} - virtual rcOpenColorBuffer2_client_proc_t set_rcOpenColorBuffer2(rcOpenColorBuffer2_client_proc_t f) { rcOpenColorBuffer2_client_proc_t retval = rcOpenColorBuffer2; rcOpenColorBuffer2 = f; return retval;} virtual ~renderControl_client_context_t() {} typedef renderControl_client_context_t *CONTEXT_ACCESSOR_TYPE(void); static void setContextAccessor(CONTEXT_ACCESSOR_TYPE *f); int initDispatchByName( void *(*getProc)(const char *name, void *userData), void *userData); - virtual void setError(unsigned int error){}; + virtual void setError(unsigned int error){ (void)error; }; virtual unsigned int getError(){ return 0; }; }; diff --git a/opengl/system/renderControl_enc/renderControl_enc.cpp b/opengl/system/renderControl_enc/renderControl_enc.cpp index a40a501..34113e1 100644 --- a/opengl/system/renderControl_enc/renderControl_enc.cpp +++ b/opengl/system/renderControl_enc/renderControl_enc.cpp @@ -9,7 +9,10 @@ #include <stdio.h> -static void enc_unsupported() + +namespace { + +void enc_unsupported() { ALOGE("Function is unsupported\n"); } @@ -311,7 +314,6 @@ void rcCloseColorBuffer_enc(void *self , uint32_t colorbuffer) memcpy(ptr, &packetSize, 4); ptr += 4; memcpy(ptr, &colorbuffer, 4); ptr += 4; - stream->flush(); } @@ -524,35 +526,37 @@ int rcOpenColorBuffer2_enc(void *self , uint32_t colorbuffer) return retval; } +} // namespace + renderControl_encoder_context_t::renderControl_encoder_context_t(IOStream *stream) { m_stream = stream; - set_rcGetRendererVersion(rcGetRendererVersion_enc); - set_rcGetEGLVersion(rcGetEGLVersion_enc); - set_rcQueryEGLString(rcQueryEGLString_enc); - set_rcGetGLString(rcGetGLString_enc); - set_rcGetNumConfigs(rcGetNumConfigs_enc); - set_rcGetConfigs(rcGetConfigs_enc); - set_rcChooseConfig(rcChooseConfig_enc); - set_rcGetFBParam(rcGetFBParam_enc); - set_rcCreateContext(rcCreateContext_enc); - set_rcDestroyContext(rcDestroyContext_enc); - set_rcCreateWindowSurface(rcCreateWindowSurface_enc); - set_rcDestroyWindowSurface(rcDestroyWindowSurface_enc); - set_rcCreateColorBuffer(rcCreateColorBuffer_enc); - set_rcOpenColorBuffer(rcOpenColorBuffer_enc); - set_rcCloseColorBuffer(rcCloseColorBuffer_enc); - set_rcSetWindowColorBuffer(rcSetWindowColorBuffer_enc); - set_rcFlushWindowColorBuffer(rcFlushWindowColorBuffer_enc); - set_rcMakeCurrent(rcMakeCurrent_enc); - set_rcFBPost(rcFBPost_enc); - set_rcFBSetSwapInterval(rcFBSetSwapInterval_enc); - set_rcBindTexture(rcBindTexture_enc); - set_rcBindRenderbuffer(rcBindRenderbuffer_enc); - set_rcColorBufferCacheFlush(rcColorBufferCacheFlush_enc); - set_rcReadColorBuffer(rcReadColorBuffer_enc); - set_rcUpdateColorBuffer(rcUpdateColorBuffer_enc); - set_rcOpenColorBuffer2(rcOpenColorBuffer2_enc); + this->rcGetRendererVersion = &rcGetRendererVersion_enc; + this->rcGetEGLVersion = &rcGetEGLVersion_enc; + this->rcQueryEGLString = &rcQueryEGLString_enc; + this->rcGetGLString = &rcGetGLString_enc; + this->rcGetNumConfigs = &rcGetNumConfigs_enc; + this->rcGetConfigs = &rcGetConfigs_enc; + this->rcChooseConfig = &rcChooseConfig_enc; + this->rcGetFBParam = &rcGetFBParam_enc; + this->rcCreateContext = &rcCreateContext_enc; + this->rcDestroyContext = &rcDestroyContext_enc; + this->rcCreateWindowSurface = &rcCreateWindowSurface_enc; + this->rcDestroyWindowSurface = &rcDestroyWindowSurface_enc; + this->rcCreateColorBuffer = &rcCreateColorBuffer_enc; + this->rcOpenColorBuffer = &rcOpenColorBuffer_enc; + this->rcCloseColorBuffer = &rcCloseColorBuffer_enc; + this->rcSetWindowColorBuffer = &rcSetWindowColorBuffer_enc; + this->rcFlushWindowColorBuffer = &rcFlushWindowColorBuffer_enc; + this->rcMakeCurrent = &rcMakeCurrent_enc; + this->rcFBPost = &rcFBPost_enc; + this->rcFBSetSwapInterval = &rcFBSetSwapInterval_enc; + this->rcBindTexture = &rcBindTexture_enc; + this->rcBindRenderbuffer = &rcBindRenderbuffer_enc; + this->rcColorBufferCacheFlush = &rcColorBufferCacheFlush_enc; + this->rcReadColorBuffer = &rcReadColorBuffer_enc; + this->rcUpdateColorBuffer = &rcUpdateColorBuffer_enc; + this->rcOpenColorBuffer2 = &rcOpenColorBuffer2_enc; } 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 diff --git a/opengl/system/renderControl_enc/renderControl_entry.cpp b/opengl/system/renderControl_enc/renderControl_entry.cpp index a15fd14..71edb83 100644 --- a/opengl/system/renderControl_enc/renderControl_entry.cpp +++ b/opengl/system/renderControl_enc/renderControl_entry.cpp @@ -38,162 +38,162 @@ extern "C" { #ifndef GET_CONTEXT static renderControl_client_context_t::CONTEXT_ACCESSOR_TYPE *getCurrentContext = NULL; void renderControl_client_context_t::setContextAccessor(CONTEXT_ACCESSOR_TYPE *f) { getCurrentContext = f; } -#define GET_CONTEXT renderControl_client_context_t * ctx = getCurrentContext() +#define GET_CONTEXT renderControl_client_context_t * ctx = getCurrentContext() #endif GLint rcGetRendererVersion() { - GET_CONTEXT; - return ctx->rcGetRendererVersion(ctx); + GET_CONTEXT; + return ctx->rcGetRendererVersion(ctx); } EGLint rcGetEGLVersion(EGLint* major, EGLint* minor) { - GET_CONTEXT; - return ctx->rcGetEGLVersion(ctx, major, minor); + GET_CONTEXT; + return ctx->rcGetEGLVersion(ctx, major, minor); } EGLint rcQueryEGLString(EGLenum name, void* buffer, EGLint bufferSize) { - GET_CONTEXT; - return ctx->rcQueryEGLString(ctx, name, buffer, bufferSize); + GET_CONTEXT; + return ctx->rcQueryEGLString(ctx, name, buffer, bufferSize); } EGLint rcGetGLString(EGLenum name, void* buffer, EGLint bufferSize) { - GET_CONTEXT; - return ctx->rcGetGLString(ctx, name, buffer, bufferSize); + GET_CONTEXT; + return ctx->rcGetGLString(ctx, name, buffer, bufferSize); } EGLint rcGetNumConfigs(uint32_t* numAttribs) { - GET_CONTEXT; - return ctx->rcGetNumConfigs(ctx, numAttribs); + GET_CONTEXT; + return ctx->rcGetNumConfigs(ctx, numAttribs); } EGLint rcGetConfigs(uint32_t bufSize, GLuint* buffer) { - GET_CONTEXT; - return ctx->rcGetConfigs(ctx, bufSize, buffer); + GET_CONTEXT; + return ctx->rcGetConfigs(ctx, bufSize, buffer); } EGLint rcChooseConfig(EGLint* attribs, uint32_t attribs_size, uint32_t* configs, uint32_t configs_size) { - GET_CONTEXT; - return ctx->rcChooseConfig(ctx, attribs, attribs_size, configs, configs_size); + GET_CONTEXT; + return ctx->rcChooseConfig(ctx, attribs, attribs_size, configs, configs_size); } EGLint rcGetFBParam(EGLint param) { - GET_CONTEXT; - return ctx->rcGetFBParam(ctx, param); + GET_CONTEXT; + return ctx->rcGetFBParam(ctx, param); } uint32_t rcCreateContext(uint32_t config, uint32_t share, uint32_t glVersion) { - GET_CONTEXT; - return ctx->rcCreateContext(ctx, config, share, glVersion); + GET_CONTEXT; + return ctx->rcCreateContext(ctx, config, share, glVersion); } void rcDestroyContext(uint32_t context) { - GET_CONTEXT; - ctx->rcDestroyContext(ctx, context); + GET_CONTEXT; + ctx->rcDestroyContext(ctx, context); } uint32_t rcCreateWindowSurface(uint32_t config, uint32_t width, uint32_t height) { - GET_CONTEXT; - return ctx->rcCreateWindowSurface(ctx, config, width, height); + GET_CONTEXT; + return ctx->rcCreateWindowSurface(ctx, config, width, height); } void rcDestroyWindowSurface(uint32_t windowSurface) { - GET_CONTEXT; - ctx->rcDestroyWindowSurface(ctx, windowSurface); + GET_CONTEXT; + ctx->rcDestroyWindowSurface(ctx, windowSurface); } uint32_t rcCreateColorBuffer(uint32_t width, uint32_t height, GLenum internalFormat) { - GET_CONTEXT; - return ctx->rcCreateColorBuffer(ctx, width, height, internalFormat); + GET_CONTEXT; + return ctx->rcCreateColorBuffer(ctx, width, height, internalFormat); } void rcOpenColorBuffer(uint32_t colorbuffer) { - GET_CONTEXT; - ctx->rcOpenColorBuffer(ctx, colorbuffer); + GET_CONTEXT; + ctx->rcOpenColorBuffer(ctx, colorbuffer); } void rcCloseColorBuffer(uint32_t colorbuffer) { - GET_CONTEXT; - ctx->rcCloseColorBuffer(ctx, colorbuffer); + GET_CONTEXT; + ctx->rcCloseColorBuffer(ctx, colorbuffer); } void rcSetWindowColorBuffer(uint32_t windowSurface, uint32_t colorBuffer) { - GET_CONTEXT; - ctx->rcSetWindowColorBuffer(ctx, windowSurface, colorBuffer); + GET_CONTEXT; + ctx->rcSetWindowColorBuffer(ctx, windowSurface, colorBuffer); } int rcFlushWindowColorBuffer(uint32_t windowSurface) { - GET_CONTEXT; - return ctx->rcFlushWindowColorBuffer(ctx, windowSurface); + GET_CONTEXT; + return ctx->rcFlushWindowColorBuffer(ctx, windowSurface); } EGLint rcMakeCurrent(uint32_t context, uint32_t drawSurf, uint32_t readSurf) { - GET_CONTEXT; - return ctx->rcMakeCurrent(ctx, context, drawSurf, readSurf); + GET_CONTEXT; + return ctx->rcMakeCurrent(ctx, context, drawSurf, readSurf); } void rcFBPost(uint32_t colorBuffer) { - GET_CONTEXT; - ctx->rcFBPost(ctx, colorBuffer); + GET_CONTEXT; + ctx->rcFBPost(ctx, colorBuffer); } void rcFBSetSwapInterval(EGLint interval) { - GET_CONTEXT; - ctx->rcFBSetSwapInterval(ctx, interval); + GET_CONTEXT; + ctx->rcFBSetSwapInterval(ctx, interval); } void rcBindTexture(uint32_t colorBuffer) { - GET_CONTEXT; - ctx->rcBindTexture(ctx, colorBuffer); + GET_CONTEXT; + ctx->rcBindTexture(ctx, colorBuffer); } void rcBindRenderbuffer(uint32_t colorBuffer) { - GET_CONTEXT; - ctx->rcBindRenderbuffer(ctx, colorBuffer); + GET_CONTEXT; + ctx->rcBindRenderbuffer(ctx, colorBuffer); } EGLint rcColorBufferCacheFlush(uint32_t colorbuffer, EGLint postCount, int forRead) { - GET_CONTEXT; - return ctx->rcColorBufferCacheFlush(ctx, colorbuffer, postCount, forRead); + GET_CONTEXT; + return ctx->rcColorBufferCacheFlush(ctx, colorbuffer, postCount, forRead); } void rcReadColorBuffer(uint32_t colorbuffer, GLint x, GLint y, GLint width, GLint height, GLenum format, GLenum type, void* pixels) { - GET_CONTEXT; - ctx->rcReadColorBuffer(ctx, colorbuffer, x, y, width, height, format, type, pixels); + GET_CONTEXT; + ctx->rcReadColorBuffer(ctx, colorbuffer, x, y, width, height, format, type, pixels); } int rcUpdateColorBuffer(uint32_t colorbuffer, GLint x, GLint y, GLint width, GLint height, GLenum format, GLenum type, void* pixels) { - GET_CONTEXT; - return ctx->rcUpdateColorBuffer(ctx, colorbuffer, x, y, width, height, format, type, pixels); + GET_CONTEXT; + return ctx->rcUpdateColorBuffer(ctx, colorbuffer, x, y, width, height, format, type, pixels); } int rcOpenColorBuffer2(uint32_t colorbuffer) { - GET_CONTEXT; - return ctx->rcOpenColorBuffer2(ctx, colorbuffer); + GET_CONTEXT; + return ctx->rcOpenColorBuffer2(ctx, colorbuffer); } diff --git a/opengl/system/renderControl_enc/renderControl_ftable.h b/opengl/system/renderControl_enc/renderControl_ftable.h index a43fe5b..e15fb0c 100644 --- a/opengl/system/renderControl_enc/renderControl_ftable.h +++ b/opengl/system/renderControl_enc/renderControl_ftable.h @@ -4,7 +4,7 @@ #define __renderControl_client_ftable_t_h -static struct _renderControl_funcs_by_name { +static const struct _renderControl_funcs_by_name { const char *name; void *proc; } renderControl_funcs_by_name[] = { @@ -35,7 +35,7 @@ static struct _renderControl_funcs_by_name { {"rcUpdateColorBuffer", (void*)rcUpdateColorBuffer}, {"rcOpenColorBuffer2", (void*)rcOpenColorBuffer2}, }; -static int renderControl_num_funcs = sizeof(renderControl_funcs_by_name) / sizeof(struct _renderControl_funcs_by_name); +static const int renderControl_num_funcs = sizeof(renderControl_funcs_by_name) / sizeof(struct _renderControl_funcs_by_name); #endif |