Merge lp:~marcoil/glproxy/extensions-cleanup into lp:glproxy

[Marc Ordinas i Llopis]

Removed automatically resolving all known extensions and added a simple API to get extension functions.

Removed automatically resolving all known extensions and added a simple API to get extension functions.

Added a function to help getting extensions, glProxyGetExtProcAddr. Users need to pass the extension
name and the function name, and glProxy will look for it in both the current backend (EGL or GLX) and
GL, but the later will only work if there's a valid current context.

[Alexandros Frantzis (afrantzis)]

> 472 + static char const *gl_extensions = "";

It's not safe to cache gl_extensions in this manner, as the extensions are context-dependent. For example, glProxyGetExtProcAddr() could be called again after a user has changed GL context or by two different threads having different GL contexts.

I would argue that we don't need to cache the extension strings anyway as 1. getting the extension string is fast enough and 2. extension checking isn't usually in a performance-critical path.

> 501 + if (!strstr(backend_extensions, extension) &&
> 502 + !strstr(gl_extensions, extension))
> 503 + return NULL;

There are extension names that are prefixes of other extension names (eg EGL_KHR_image and EGL_KHR_image_base), so a simple strstr() check is not enough. You can check cairo-gl-info.c in the cairo sources for a more robust implementation of an extension check.

By the way, this complication is the reason glGetString(GL_EXTENSIONS) was deprecated in GL 3.0 (and removed in GL 3.1) in favor of glGetStringi(GL_EXTENSIONS, i).

review: Needs Fixing

[lp:~marcoil/glproxy/extensions-cleanup]

36. By Marc Ordinas i Llopis on 2011-10-19

Removed caching the extensions strings. Ensured that extension names are checked correctly.

Added a new API function to check if an extension is present in both the backend and GL,
glProxyHasExtension.

[Marc Ordinas i Llopis (marcoil)]

Thanks, Alexandros! I removed the string caching and copied the check from cairo, please take a look.

[Alexandros Frantzis (afrantzis)]

Looks good!

review: Approve

=== modified file 'include/GL/gl_proxy.h'
--- include/GL/gl_proxy.h	2011-09-10 10:03:08 +0000
+++ include/GL/gl_proxy.h	2011-10-19 11:31:30 +0000
@@ -22,7 +22,9 @@
  */
 
 /*
- * Authored-by: Jammy Zhou <[e-mail]>
+ * Authors:
+ *  Jammy Zhou <[e-mail]>
+ *  Marc Ordinas i Llopis, Collabora Ltd <[e-mail]>
  */
 
 #ifndef _GL_PROXY_H
@@ -930,6 +932,9 @@
 extern int glProxyInit(PROXY_BACKEND_OPTION *pProxyBackend);
 extern int glProxyClose(void);
 
+extern GLboolean glProxyHasExtension(const char *extension);
+extern void *glProxyGetExtProcAddr(const char *extension, const char *name);
+
 #ifdef __cplusplus
 }
 #endif

=== modified file 'include/GL/glext_proxy.h'
--- include/GL/glext_proxy.h	2011-02-24 04:52:03 +0000
+++ include/GL/glext_proxy.h	2011-10-19 11:31:30 +0000
@@ -22,7 +22,9 @@
  */
 
 /*
- * Authored-by: Jammy Zhou <[e-mail]>
+ * Authors:
+ *  Jammy Zhou <[e-mail]>
+ *  Marc Ordinas i Llopis, Collabora Ltd <[e-mail]>
  */
 
 #ifndef __GLEXT_PROXY_H
@@ -322,134 +324,6 @@
 typedef void      GL_APIENTRY	(*PFNPROXYSTARTTILINGQCOMPROC) (GLuint x, GLuint y, GLuint width, GLuint height, GLbitfield preserveMask);
 typedef void      GL_APIENTRY	(*PFNPROXYENDTILINGQCOMPROC) (GLbitfield preserveMask);
 
-/* ---------------------------------------------------------------------------
- * function rename
- * -------------------------------------------------------------------------*/
-#define glEGLImageTargetTexture2DOES		pfnProxyEGLImageTargetTexture2DOES
-#define glEGLImageTargetRenderbufferStorageOES	pfnProxyEGLImageTargetRenderbufferStorageOES
-#define glGetProgramBinaryOES	 		pfnProxyGetProgramBinaryOES
-#define glProgramBinaryOES 			pfnProxyProgramBinaryOES
-#define glMapBufferOES 				pfnProxyMapBufferOES
-#define glUnmapBufferOES 			pfnProxyUnmapBufferOES
-#define glGetBufferPointervOES 			pfnProxyGetBufferPointervOES
-#define glTexImage3DOES 			pfnProxyTexImage3DOES
-#define glTexSubImage3DOES 			pfnProxyTexSubImage3DOES
-#define glCopyTexSubImage3DOES 			pfnProxyCopyTexSubImage3DOES
-#define glCompressedTexImage3DOES 		pfnProxyCompressedTexImage3DOES
-#define glCompressedTexSubImage3DOES 		pfnProxyCompressedTexSubImage3DOES
-#define glFramebufferTexture3DOES 		pfnProxyFramebufferTexture3DOES
-#define glBindVertexArrayOES 			pfnProxyBindVertexArrayOES
-#define glDeleteVertexArraysOES 		pfnProxyDeleteVertexArraysOES
-#define glGenVertexArraysOES 			pfnProxyGenVertexArraysOES
-#define glIsVertexArrayOES 			pfnProxyIsVertexArrayOES
-#define glGetPerfMonitorGroupsAMD 		pfnProxyGetPerfMonitorGroupsAMD
-#define glGetPerfMonitorCountersAMD 		pfnProxyGetPerfMonitorCountersAMD
-#define glGetPerfMonitorGroupStringAMD 		pfnProxyGetPerfMonitorGroupStringAMD
-#define glGetPerfMonitorCounterStringAMD 	pfnProxyGetPerfMonitorCounterStringAMD
-#define glGetPerfMonitorCounterInfoAMD 		pfnProxyGetPerfMonitorCounterInfoAMD
-#define glGenPerfMonitorsAMD 			pfnProxyGenPerfMonitorsAMD
-#define glDeletePerfMonitorsAMD 		pfnProxyDeletePerfMonitorsAMD
-#define glSelectPerfMonitorCountersAMD 		pfnProxySelectPerfMonitorCountersAMD
-#define glBeginPerfMonitorAMD 			pfnProxyBeginPerfMonitorAMD
-#define glEndPerfMonitorAMD 			pfnProxyEndPerfMonitorAMD
-#define glGetPerfMonitorCounterDataAMD 		pfnProxyGetPerfMonitorCounterDataAMD
-#define glDiscardFramebufferEXT 		pfnProxyDiscardFramebufferEXT
-#define glMultiDrawArraysEXT 			pfnProxyMultiDrawArraysEXT
-#define glMultiDrawElementsEXT 			pfnProxyMultiDrawElementsEXT
-#define glRenderbufferStorageMultisampleIMG 	pfnProxyRenderbufferStorageMultisampleIMG
-#define glFramebufferTexture2DMultisampleIMG 	pfnProxyFramebufferTexture2DMultisampleIMG
-#define glDeleteFencesNV 			pfnProxyDeleteFencesNV
-#define glGenFencesNV 				pfnProxyGenFencesNV
-#define glIsFenceNV 				pfnProxyIsFenceNV
-#define glTestFenceNV 				pfnProxyTestFenceNV
-#define glGetFenceNV 				pfnProxyGetFenceNV
-#define glFinishFenceNV 			pfnProxyFinishFenceNV
-#define glSetFenceNV 				pfnProxySetFenceNV
-#define glCoverageMaskNV 			pfnProxyCoverageMaskNV
-#define glCoverageOperationNV 			pfnProxyCoverageOperationNV
-#define glGetDriverControlsQCOM 		pfnProxyGetDriverControlsQCOM
-#define glGetDriverControlStringQCOM 		pfnProxyGetDriverControlStringQCOM
-#define glEnableDriverControlQCOM 		pfnProxyEnableDriverControlQCOM
-#define glDisableDriverControlQCOM 		pfnProxyDisableDriverControlQCOM
-#define glExtGetTexturesQCOM 			pfnProxyExtGetTexturesQCOM
-#define glExtGetBuffersQCOM 			pfnProxyExtGetBuffersQCOM
-#define glExtGetRenderbuffersQCOM 		pfnProxyExtGetRenderbuffersQCOM
-#define glExtGetFramebuffersQCOM 		pfnProxyExtGetFramebuffersQCOM
-#define glExtGetTexLevelParameterivQCOM 	pfnProxyExtGetTexLevelParameterivQCOM
-#define glExtTexObjectStateOverrideQCOM 	pfnProxyExtTexObjectStateOverrideQCOM
-#define glExtGetTexSubImageQCOM 		pfnProxyExtGetTexSubImageQCOM
-#define glExtGetBufferPointervQCOM 		pfnProxyExtGetBufferPointervQCOM
-#define glExtGetShadersQCOM 			pfnProxyExtGetShadersQCOM
-#define glExtGetProgramsQCOM 			pfnProxyExtGetProgramsQCOM
-#define glExtIsProgramBinaryQCOM 		pfnProxyExtIsProgramBinaryQCOM
-#define glExtGetProgramBinarySourceQCOM 	pfnProxyExtGetProgramBinarySourceQCOM
-#define glStartTilingQCOM 			pfnProxyStartTilingQCOM
-#define glEndTilingQCOM 			pfnProxyEndTilingQCOM
-
-/* ---------------------------------------------------------------------------
- * export proxy functions
- * -------------------------------------------------------------------------*/
-extern PFNPROXYEGLIMAGETARGETTEXTURE2DOESPROC pfnProxyEGLImageTargetTexture2DOES;
-extern PFNPROXYEGLIMAGETARGETRENDERBUFFERSTORAGEOESPROC pfnProxyEGLImageTargetRenderbufferStorageOES;
-extern PFNPROXYGETPROGRAMBINARYOESPROC pfnProxyGetProgramBinaryOES;
-extern PFNPROXYPROGRAMBINARYOESPROC pfnProxyProgramBinaryOES;
-extern PFNPROXYMAPBUFFEROESPROC pfnProxyMapBufferOES;
-extern PFNPROXYUNMAPBUFFEROESPROC pfnProxyUnmapBufferOES;
-extern PFNPROXYGETBUFFERPOINTERVOESPROC pfnProxyGetBufferPointervOES;
-extern PFNPROXYTEXIMAGE3DOESPROC pfnProxyTexImage3DOES;
-extern PFNPROXYTEXSUBIMAGE3DOESPROC pfnProxyTexSubImage3DOES;
-extern PFNPROXYCOPYTEXSUBIMAGE3DOESPROC pfnProxyCopyTexSubImage3DOES;
-extern PFNPROXYCOMPRESSEDTEXIMAGE3DOESPROC pfnProxyCompressedTexImage3DOES;
-extern PFNPROXYCOMPRESSEDTEXSUBIMAGE3DOESPROC pfnProxyCompressedTexSubImage3DOES;
-extern PFNPROXYFRAMEBUFFERTEXTURE3DOESPROC pfnProxyFramebufferTexture3DOES;
-extern PFNPROXYBINDVERTEXARRAYOESPROC pfnProxyBindVertexArrayOES;
-extern PFNPROXYDELETEVERTEXARRAYSOESPROC pfnProxyDeleteVertexArraysOES;
-extern PFNPROXYGENVERTEXARRAYSOESPROC pfnProxyGenVertexArraysOES;
-extern PFNPROXYISVERTEXARRAYOESPROC pfnProxyIsVertexArrayOES;
-extern PFNPROXYGETPERFMONITORGROUPSAMDPROC pfnProxyGetPerfMonitorGroupsAMD;
-extern PFNPROXYGETPERFMONITORCOUNTERSAMDPROC pfnProxyGetPerfMonitorCountersAMD;
-extern PFNPROXYGETPERFMONITORGROUPSTRINGAMDPROC pfnProxyGetPerfMonitorGroupStringAMD;
-extern PFNPROXYGETPERFMONITORCOUNTERSTRINGAMDPROC pfnProxyGetPerfMonitorCounterStringAMD;
-extern PFNPROXYGETPERFMONITORCOUNTERINFOAMDPROC pfnProxyGetPerfMonitorCounterInfoAMD;
-extern PFNPROXYGENPERFMONITORSAMDPROC pfnProxyGenPerfMonitorsAMD;
-extern PFNPROXYDELETEPERFMONITORSAMDPROC pfnProxyDeletePerfMonitorsAMD;
-extern PFNPROXYSELECTPERFMONITORCOUNTERSAMDPROC pfnProxySelectPerfMonitorCountersAMD;
-extern PFNPROXYBEGINPERFMONITORAMDPROC pfnProxyBeginPerfMonitorAMD;
-extern PFNPROXYENDPERFMONITORAMDPROC pfnProxyEndPerfMonitorAMD;
-extern PFNPROXYGETPERFMONITORCOUNTERDATAAMDPROC pfnProxyGetPerfMonitorCounterDataAMD;
-extern PFNPROXYDISCARDFRAMEBUFFEREXTPROC pfnProxyDiscardFramebufferEXT;
-extern PFNPROXYMULTIDRAWARRAYSEXTPROC pfnProxyMultiDrawArraysEXT;
-extern PFNPROXYMULTIDRAWELEMENTSEXTPROC pfnProxyMultiDrawElementsEXT;
-extern PFNPROXYRENDERBUFFERSTORAGEMULTISAMPLEIMGPROC pfnProxyRenderbufferStorageMultisampleIMG;
-extern PFNPROXYFRAMEBUFFERTEXTURE2DMULTISAMPLEIMGPROC pfnProxyFramebufferTexture2DMultisampleIMG;
-extern PFNPROXYDELETEFENCESNVPROC pfnProxyDeleteFencesNV;
-extern PFNPROXYGENFENCESNVPROC pfnProxyGenFencesNV;
-extern PFNPROXYISFENCENVPROC pfnProxyIsFenceNV;
-extern PFNPROXYTESTFENCENVPROC pfnProxyTestFenceNV;
-extern PFNPROXYGETFENCEIVNVPROC pfnProxyGetFenceivNV;
-extern PFNPROXYFINISHFENCENVPROC pfnProxyFinishFenceNV;
-extern PFNPROXYSETFENCENVPROC pfnProxySetFenceNV;
-extern PFNPROXYCOVERAGEMASKNVPROC pfnProxyCoverageMaskNV;
-extern PFNPROXYCOVERAGEOPERATIONNVPROC pfnProxyCoverageOperationNV;
-extern PFNPROXYGETDRIVERCONTROLSQCOMPROC pfnProxyGetDriverControlsQCOM;
-extern PFNPROXYGETDRIVERCONTROLSTRINGQCOMPROC pfnProxyGetDriverControlStringQCOM;
-extern PFNPROXYENABLEDRIVERCONTROLQCOMPROC pfnProxyEnableDriverControlQCOM;
-extern PFNPROXYDISABLEDRIVERCONTROLQCOMPROC pfnProxyDisableDriverControlQCOM;
-extern PFNPROXYEXTGETTEXTURESQCOMPROC pfnProxyExtGetTexturesQCOM;
-extern PFNPROXYEXTGETBUFFERSQCOMPROC pfnProxyExtGetBuffersQCOM;
-extern PFNPROXYEXTGETRENDERBUFFERSQCOMPROC pfnProxyExtGetRenderbuffersQCOM;
-extern PFNPROXYEXTGETFRAMEBUFFERSQCOMPROC pfnProxyExtGetFramebuffersQCOM;
-extern PFNPROXYEXTGETTEXLEVELPARAMETERIVQCOMPROC pfnProxyExtGetTexLevelParameterivQCOM;
-extern PFNPROXYEXTTEXOBJECTSTATEOVERRIDEIQCOMPROC pfnProxyExtTexObjectStateOverrideiQCOM;
-extern PFNPROXYEXTGETTEXSUBIMAGEQCOMPROC pfnProxyExtGetTexSubImageQCOM;
-extern PFNPROXYEXTGETBUFFERPOINTERVQCOMPROC pfnProxyExtGetBufferPointervQCOM;
-extern PFNPROXYEXTGETSHADERSQCOMPROC pfnProxyExtGetShadersQCOM;
-extern PFNPROXYEXTGETPROGRAMSQCOMPROC pfnProxyExtGetProgramsQCOM;
-extern PFNPROXYEXTISPROGRAMBINARYQCOMPROC pfnProxyExtIsProgramBinaryQCOM;
-extern PFNPROXYEXTGETPROGRAMBINARYSOURCEQCOMPROC pfnProxyExtGetProgramBinarySourceQCOM;
-extern PFNPROXYSTARTTILINGQCOMPROC pfnProxyStartTilingQCOM;
-extern PFNPROXYENDTILINGQCOMPROC pfnProxyEndTilingQCOM;
-
 #ifdef __cplusplus
 }
 #endif

=== modified file 'include/GL/glx_proxy.h'
--- include/GL/glx_proxy.h	2011-02-24 04:52:03 +0000
+++ include/GL/glx_proxy.h	2011-10-19 11:31:30 +0000
@@ -22,7 +22,9 @@
  */
 
 /*
- * Authored-by: Jammy Zhou <[e-mail]>
+ * Authors:
+ *  Jammy Zhou <[e-mail]>
+ *  Marc Ordinas i Llopis, Collabora Ltd <[e-mail]>
  */
 
 #ifndef _GLX_PROXY_H

=== modified file 'include/GL/glxext_proxy.h'
--- include/GL/glxext_proxy.h	2011-09-13 16:03:17 +0000
+++ include/GL/glxext_proxy.h	2011-10-19 11:31:30 +0000
@@ -22,7 +22,9 @@
  */
 
 /*
- * Authored-by: Jammy Zhou <[e-mail]>
+ * Authors:
+ *  Jammy Zhou <[e-mail]>
+ *  Marc Ordinas i Llopis, Collabora Ltd <[e-mail]>
  */
 
 #ifndef __GLXEXT_PROXY_H
@@ -467,178 +469,6 @@
 typedef int ( * PFNPROXYSWAPINTERVALMESAPROC) (unsigned int interval);
 typedef int ( * PFNPROXYGETSWAPINTERVALMESAPROC) (void);
 
-/* ---------------------------------------------------------------------------------------------
- * function rename
- * -------------------------------------------------------------------------------------------*/
-#define glXCreateContextAttribsARB              pfnProxyCreateContextAttribsARB
-#define glXSwapIntervalSGI                      pfnProxySwapIntervalSGI
-#define glXGetVideoSyncSGI                      pfnProxyGetVideoSyncSGI
-#define glXWaitVideoSyncSGI                     pfnProxyWaitVideoSyncSGI
-#define glXMakeCurrentReadSGI                   pfnProxyMakeCurrentReadSGI
-#define glXGetCurrentReadDrawableSGI            pfnProxyGetCurrentReadDrawableSGI
-#ifdef _VL_H
-#define glXCreateGLXVideoSourceSGIX             pfnProxyCreateGLXVideoSourceSGIX
-#define glXDestroyGLXVideoSourceSGIX            pfnProxyDestroyGLXVideoSourceSGIX
-#endif
-#define glXGetCurrentDisplayEXT                 pfnProxyGetCurrentDisplayEXT
-#define glXQueryContextInfoEXT                  pfnProxyQueryContextInfoEXT
-#define glXGetContextIDEXT                      pfnProxyGetContextIDEXT
-#define glXImportContextEXT                     pfnProxyImportContextEXT
-#define glXFreeContextEXT                       pfnProxyFreeContextEXT
-#define glXGetFBConfigAttribSGIX                pfnProxyGetFBConfigAttribSGIX
-#define glXChooseFBConfigSGIX                   pfnProxyChooseFBConfigSGIX
-#define glXCreateGLXPixmapWithConfigSGIX        pfnProxyCreateGLXPixmapWithConfigSGIX
-#define glXCreateContextWithConfigSGIX          pfnProxyCreateContextWithConfigSGIX
-#define glXGetVisualFromFBConfigSGIX            pfnProxyGetVisualFromFBConfigSGIX
-#define glXGetFBConfigFromVisualSGIX            pfnProxyGetFBConfigFromVisualSGIX
-#define glXCreateGLXPbufferSGIX                 pfnProxyCreateGLXPbufferSGIX
-#define glXDestroyGLXPbufferSGIX                pfnProxyDestroyGLXPbufferSGIX
-#define glXQueryGLXPbufferSGIX                  pfnProxyQueryGLXPbufferSGIX
-#define glXSelectEventSGIX                      pfnProxySelectEventSGIX
-#define glXGetSelectedEventSGIX                 pfnProxyGetSelectedEventSGIX
-#define glXCushionSGI                           pfnProxyCushionSGI
-#define glXBindChannelToWindowSGIX              pfnProxyBindChannelToWindowSGIX
-#define glXChannelRectSGIX                      pfnProxyChannelRectSGIX
-#define glXQueryChannelRectSGIX                 pfnProxyQueryChannelRectSGIX
-#define glXQueryChannelDeltasSGIX               pfnProxyQueryChannelDeltasSGIX
-#define glXChannelRectSyncSGIX                  pfnProxyChannelRectSyncSGIX
-#ifdef _DM_BUFFER_H
-#define glXAssociateDMPbufferSGIX               pfnProxyAssociateDMPbufferSGIX
-#endif
-#define glXJoinSwapGroupSGIX                    pfnProxyJoinSwapGroupSGIX
-#define glXBindSwapBarrierSGIX                  pfnProxyBindSwapBarrierSGIX
-#define glXQueryMaxSwapBarriersSGIX             pfnProxyQueryMaxSwapBarriersSGIX
-#define glXGetTransparentIndexSUN               pfnProxyGetTransparentIndexSUN
-#define glXCopySubBufferMESA                    pfnProxyCopySubBufferMESA
-#define glXCreateGLXPixmapMESA                  pfnProxyCreateGLXPixmapMESA
-#define glXReleaseBuffersMESA                   pfnProxyReleaseBuffersMESA
-#define glXSet3DfxModeMESA                      pfnProxySet3DfxModeMESA
-#define glXGetSyncValuesOML                     pfnProxyGetSyncValuesOML
-#define glXGetMscRateOML                        pfnProxyGetMscRateOML
-#define glXSwapBuffersMscOML                    pfnProxySwapBuffersMscOML
-#define glXWaitForMscOML                        pfnProxyWaitForMscOML
-#define glXWaitForSbcOML                        pfnProxyWaitForSbcOML
-#define glXQueryHyperpipeNetworkSGIX            pfnProxyQueryHyperpipeNetworkSGIX
-#define glXHyperpipeConfigSGIX                  pfnProxyHyperpipeConfigSGIX
-#define glXQueryHyperpipeConfigSGIX             pfnProxyQueryHyperpipeConfigSGIX
-#define glXDestroyHyperpipeConfigSGIX           pfnProxyDestroyHyperpipeConfigSGIX
-#define glXBindHyperpipeSGIX                    pfnProxyBindHyperpipeSGIX
-#define glXQueryHyperpipeBestAttribSGIX         pfnProxyQueryHyperpipeBestAttribSGIX
-#define glXHyperpipeAttribSGIX                  pfnProxyHyperpipeAttribSGIX
-#define glXQueryHyperpipeAttribSGIX             pfnProxyQueryHyperpipeAttribSGIX
-#define glXGetAGPOffsetMESA                     pfnProxyGetAGPOffsetMESA
-#define glXBindTexImageEXT                      pfnProxyBindTexImageEXT
-#define glXReleaseTexImageEXT                   pfnProxyReleaseTexImageEXT
-#define glXEnumerateVideoDevicesNV              pfnProxyEnumerateVideoDevicesNV
-#define glXBindVideoDeviceNV                    pfnProxyBindVideoDeviceNV
-#define glXGetVideoDeviceNV                     pfnProxyBindVideoDeviceNV
-#define glXReleaseVideoDeviceNV                 pfnProxyReleaseVideoDeviceNV
-#define glXBindVideoImageNV                     pfnProxyBindVideoImageNV
-#define glXReleaseVideoImageNV                  pfnProxyReleaseVideoImageNV
-#define glXSendPbufferToVideoNV                 pfnProxySendPbufferToVideoNV
-#define glXGetVideoInfoNV                       pfnProxyGetVideoInfoNV
-#define glXJoinSwapGroupNV                      pfnProxyJoinSwapGroupNV
-#define glXBindSwapBarrierNV                    pfnProxyBindSwapBarrierNV
-#define glXQuerySwapGroupNV                     pfnProxyQuerySwapGroupNV
-#define glXQueryMaxSwapGroupsNV                 pfnProxyQueryMaxSwapGroupsNV
-#define glXQueryFrameCountNV                    pfnProxyQueryFrameCountNV
-#define glXResetFrameCountNV                    pfnProxyResetFrameCountNV
-#define glXBindVideoCaptureDeviceNV             pfnProxyBindVideoCaptureDeviceNV
-#define glXEnumerateVideoCaptureDevicesNV       pfnProxyEnumerateVideoCaptureDevicesNV
-#define glXLockVideoCaptureDeviceNV             pfnProxyLockVideoCaptureDeviceNV
-#define glXQueryVideoCaptureDeviceNV            pfnProxyQueryVideoCaptureDeviceNV
-#define glXReleaseVideoCaptureDeviceNV          pfnProxyReleaseVideoCaptureDeviceNV
-#define glXSwapIntervalEXT                      pfnProxySwapIntervalEXT
-#define glXCopyImageSubDataNV                   pfnProxyCopyImageSubDataNV
-#define glXSwapIntervalMESA                     pfnProxySwapIntervalMESA
-#define glXGetSwapIntervalMESA                  pfnProxyGetSwapIntervalMESA
-
-/* ---------------------------------------------------------------------------------------------
- * export proxy functions
- * -------------------------------------------------------------------------------------------*/
-extern PFNPROXYCREATECONTEXTATTRIBSARBPROC     pfnProxyCreateContextAttribsARB;
-extern PFNPROXYSWAPINTERVALSGIPROC             pfnProxySwapIntervalSGI;
-extern PFNPROXYGETVIDEOSYNCSGIPROC             pfnProxyGetVideoSyncSGI;
-extern PFNPROXYWAITVIDEOSYNCSGIPROC            pfnProxyWaitVideoSyncSGI;
-extern PFNPROXYMAKECURRENTREADSGIPROC          pfnProxyMakeCurrentReadSGI;
-extern PFNPROXYGETCURRENTREADDRAWABLESGIPROC   pfnProxyGetCurrentReadDrawableSGI;
-#ifdef _VL_H
-extern PFNPROXYCREATEGLXVIDEOSOURCESGIXPROC    pfnProxyCreateGLXVideoSourceSGIX;
-extern PFNPROXYDESTROYGLXVIDEOSOURCESGIXPROC   pfnProxyDestroyGLXVideoSourceSGIX;
-#endif
-extern PFNPROXYGETCURRENTDISPLAYEXTPROC        pfnProxyGetCurrentDisplayEXT;
-extern PFNPROXYQUERYCONTEXTINFOEXTPROC         pfnProxyQueryContextInfoEXT;
-extern PFNPROXYGETCONTEXTIDEXTPROC             pfnProxyGetContextIDEXT;
-extern PFNPROXYIMPORTCONTEXTEXTPROC            pfnProxyImportContextEXT;
-extern PFNPROXYFREECONTEXTEXTPROC              pfnProxyFreeContextEXT;
-extern PFNPROXYGETFBCONFIGATTRIBSGIXPROC       pfnProxyGetFBConfigAttribSGIX;
-extern PFNPROXYCHOOSEFBCONFIGSGIXPROC          pfnProxyChooseFBConfigSGIX;
-extern PFNPROXYCREATEGLXPIXMAPWITHCONFIGSGIXPROC pfnProxyCreateGLXPixmapWithConfigSGIX;
-extern PFNPROXYCREATECONTEXTWITHCONFIGSGIXPROC pfnProxyCreateContextWithConfigSGIX;
-extern PFNPROXYGETVISUALFROMFBCONFIGSGIXPROC   pfnProxyGetVisualFromFBConfigSGIX;
-extern PFNPROXYGETFBCONFIGFROMVISUALSGIXPROC   pfnProxyGetFBConfigFromVisualSGIX;
-extern PFNPROXYCREATEGLXPBUFFERSGIXPROC        pfnProxyCreateGLXPbufferSGIX;
-extern PFNPROXYDESTROYGLXPBUFFERSGIXPROC       pfnProxyDestroyGLXPbufferSGIX;
-extern PFNPROXYQUERYGLXPBUFFERSGIXPROC         pfnProxyQueryGLXPbufferSGIX;
-extern PFNPROXYSELECTEVENTSGIXPROC             pfnProxySelectEventSGIX;
-extern PFNPROXYGETSELECTEDEVENTSGIXPROC        pfnProxyGetSelectedEventSGIX;
-extern PFNPROXYCUSHIONSGIPROC                  pfnProxyCushionSGI;
-extern PFNPROXYBINDCHANNELTOWINDOWSGIXPROC     pfnProxyBindChannelToWindowSGIX;
-extern PFNPROXYCHANNELRECTSGIXPROC             pfnProxyChannelRectSGIX;
-extern PFNPROXYQUERYCHANNELRECTSGIXPROC        pfnProxyQueryChannelRectSGIX;
-extern PFNPROXYQUERYCHANNELDELTASSGIXPROC      pfnProxyQueryChannelDeltasSGIX;
-extern PFNPROXYCHANNELRECTSYNCSGIXPROC         pfnProxyChannelRectSyncSGIX;
-#ifdef _DM_BUFFER_H
-extern PFNPROXYASSOCIATEDMPBUFFERSGIXPROC      pfnProxyAssociateDMPbufferSGIX;
-#endif
-extern PFNPROXYJOINSWAPGROUPSGIXPROC           pfnProxyJoinSwapGroupSGIX;
-extern PFNPROXYBINDSWAPBARRIERSGIXPROC         pfnProxyBindSwapBarrierSGIX;
-extern PFNPROXYQUERYMAXSWAPBARRIERSSGIXPROC    pfnProxyQueryMaxSwapBarriersSGIX;
-extern PFNPROXYGETTRANSPARENTINDEXSUNPROC      pfnProxyGetTransparentIndexSUN;
-extern PFNPROXYCOPYSUBBUFFERMESAPROC           pfnProxyCopySubBufferMESA;
-extern PFNPROXYCREATEGLXPIXMAPMESAPROC         pfnProxyCreateGLXPixmapMESA;
-extern PFNPROXYRELEASEBUFFERSMESAPROC          pfnProxyReleaseBuffersMESA;
-extern PFNPROXYSET3DFXMODEMESAPROC             pfnProxySet3DfxModeMESA;
-extern PFNPROXYGETSYNCVALUESOMLPROC            pfnProxyGetSyncValuesOML;
-extern PFNPROXYGETMSCRATEOMLPROC               pfnProxyGetMscRateOML;
-extern PFNPROXYSWAPBUFFERSMSCOMLPROC           pfnProxySwapBuffersMscOML;
-extern PFNPROXYWAITFORMSCOMLPROC               pfnProxyWaitForMscOML;
-extern PFNPROXYWAITFORSBCOMLPROC               pfnProxyWaitForSbcOML;
-extern PFNPROXYQUERYHYPERPIPENETWORKSGIXPROC   pfnProxyQueryHyperpipeNetworkSGIX;
-extern PFNPROXYHYPERPIPECONFIGSGIXPROC         pfnProxyHyperpipeConfigSGIX;
-extern PFNPROXYQUERYHYPERPIPECONFIGSGIXPROC    pfnProxyQueryHyperpipeConfigSGIX;
-extern PFNPROXYDESTROYHYPERPIPECONFIGSGIXPROC  pfnProxyDestroyHyperpipeConfigSGIX;
-extern PFNPROXYBINDHYPERPIPESGIXPROC           pfnProxyBindHyperpipeSGIX;
-extern PFNPROXYQUERYHYPERPIPEBESTATTRIBSGIXPROC pfnProxyQueryHyperpipeBestAttribSGIX;
-extern PFNPROXYHYPERPIPEATTRIBSGIXPROC         pfnProxyHyperpipeAttribSGIX;
-extern PFNPROXYQUERYHYPERPIPEATTRIBSGIXPROC    pfnProxyQueryHyperpipeAttribSGIX;
-extern PFNPROXYGETAGPOFFSETMESAPROC            pfnProxyGetAGPOffsetMESA;
-extern PFNPROXYBINDTEXIMAGEEXTPROC             pfnProxyBindTexImageEXT;
-extern PFNPROXYRELEASETEXIMAGEEXTPROC          pfnProxyReleaseTexImageEXT;
-extern PFNPROXYENUMERATEVIDEODEVICESNVPROC     pfnProxyEnumerateVideoDevicesNV;
-extern PFNPROXYBINDVIDEODEVICENVPROC           pfnProxyBindVideoDeviceNV;
-extern PFNPROXYGETVIDEODEVICENVPROC            pfnProxyGetVideoDeviceNV;
-extern PFNPROXYRELEASEVIDEODEVICENVPROC        pfnProxyReleaseVideoDeviceNV;
-extern PFNPROXYBINDVIDEOIMAGENVPROC            pfnProxyBindVideoImageNV;
-extern PFNPROXYRELEASEVIDEOIMAGENVPROC         pfnProxyReleaseVideoImageNV;
-extern PFNPROXYSENDPBUFFERTOVIDEONVPROC        pfnProxySendPbufferToVideoNV;
-extern PFNPROXYGETVIDEOINFONVPROC              pfnProxyGetVideoInfoNV;
-extern PFNPROXYJOINSWAPGROUPNVPROC             pfnProxyJoinSwapGroupNV;
-extern PFNPROXYBINDSWAPBARRIERNVPROC           pfnProxyBindSwapBarrierNV;
-extern PFNPROXYQUERYSWAPGROUPNVPROC            pfnProxyQuerySwapGroupNV;
-extern PFNPROXYQUERYMAXSWAPGROUPSNVPROC        pfnProxyQueryMaxSwapGroupsNV;
-extern PFNPROXYQUERYFRAMECOUNTNVPROC           pfnProxyQueryFrameCountNV;
-extern PFNPROXYRESETFRAMECOUNTNVPROC           pfnProxyResetFrameCountNV;
-extern PFNPROXYBINDVIDEOCAPTUREDEVICENVPROC    pfnProxyBindVideoCaptureDeviceNV;
-extern PFNPROXYENUMERATEVIDEOCAPTUREDEVICESNVPROC pfnProxyEnumerateVideoCaptureDevicesNV;
-extern PFNPROXYLOCKVIDEOCAPTUREDEVICENVPROC    pfnProxyLockVideoCaptureDeviceNV;
-extern PFNPROXYQUERYVIDEOCAPTUREDEVICENVPROC   pfnProxyQueryVideoCaptureDeviceNV;
-extern PFNPROXYRELEASEVIDEOCAPTUREDEVICENVPROC pfnProxyReleaseVideoCaptureDeviceNV;
-extern PFNPROXYSWAPINTERVALEXTPROC             pfnProxySwapIntervalEXT;
-extern PFNPROXYCOPYIMAGESUBDATANVPROC          pfnProxyCopyImageSubDataNV;
-extern PFNPROXYSWAPINTERVALMESAPROC            pfnProxySwapIntervalMESA;
-extern PFNPROXYGETSWAPINTERVALMESAPROC         pfnProxyGetSwapIntervalMESA;
-
 #ifdef __cplusplus
 }
 #endif

=== modified file 'src/egldef.h'
--- src/egldef.h	2011-04-29 22:01:08 +0000
+++ src/egldef.h	2011-10-19 11:31:30 +0000
@@ -20,7 +20,9 @@
  */
 
 /*
- * Authored-by: Jammy Zhou <[e-mail]>
+ * Authors:
+ *  Jammy Zhou <[e-mail]>
+ *  Marc Ordinas i Llopis, Collabora Ltd <[e-mail]>
  */
 
 #define LIBEGL_PATH     "/usr/lib/libEGL.so"
@@ -39,6 +41,12 @@
 #define EGL_NO_CONTEXT   ((EGLContext)0)
 #define EGL_NO_SURFACE   ((EGLSurface)0)
 
+/* QueryString targets */
+#define EGL_VENDOR          0x3053
+#define EGL_VERSION         0x3054
+#define EGL_EXTENSIONS          0x3055
+#define EGL_CLIENT_APIS         0x308D
+
 #define EGL_OPENGL_ES_API 0x30A0
 #define EGL_OPENGL_API    0x30A2
 
@@ -52,6 +60,7 @@
 #define EGL_WIDTH                       0x3057
 
 typedef void * (*PFNPROXYEGLGETPROCADDRESSPROC)( char const *procName);
+typedef char const * (*PFNPROXYEGLQUERYSTRINGPROC)(EGLDisplay display, EGLint name);
 typedef EGLDisplay (*PFNPROXYEGLGETDISPLAYPROC)(EGLNativeDisplayType display_id);
 typedef EGLBoolean (*PFNPROXYEGLINITIALIZEPROC)(EGLDisplay dpy, EGLint *major, EGLint *minor);
 typedef EGLBoolean (*PFNPROXYEGLTERMINATEPROC)(EGLDisplay dpy);

=== modified file 'src/gl_proxy.c'
--- src/gl_proxy.c	2011-04-29 22:01:08 +0000
+++ src/gl_proxy.c	2011-10-19 11:31:30 +0000
@@ -20,7 +20,9 @@
  */
 
 /*
- * Authored-by: Jammy Zhou <[e-mail]>
+ * Authors:
+ *  Jammy Zhou <[e-mail]>
+ *  Marc Ordinas i Llopis, Collabora Ltd <[e-mail]>
  */
 
 #include <stdio.h>
@@ -195,6 +197,8 @@
 PFNPROXYGLXGETPROCADDRESSPROC pfnProxyGLXGetProcAddress = NULL;
 PFNPROXYEGLGETPROCADDRESSPROC pfnProxyEGLGetProcAddress = NULL;
 
+PFNPROXYEGLQUERYSTRINGPROC        pfnProxyEGLQueryString = NULL;
+
 /* EGL APIs needed for backend selection */
 PFNPROXYEGLGETDISPLAYPROC pfnProxyEGLGetDisplay = NULL;
 PFNPROXYEGLINITIALIZEPROC pfnProxyEGLInitialize = NULL;
@@ -324,6 +328,7 @@
 			return -1;
 
 		pfnProxyEGLGetProcAddress = dlsym(proxy_context->egl_handle, "eglGetProcAddress");
+		pfnProxyEGLQueryString = dlsym(proxy_context->egl_handle, "eglQueryString");
 	}
 
 	return 0;
@@ -332,30 +337,88 @@
 void *glProxyGetProcAddr(void *handle, const char *name)
 {
 	if (pfnProxyGLXGetProcAddress) {
-		return (*pfnProxyGLXGetProcAddress)(name);
+		return (*pfnProxyGLXGetProcAddress)((const GLubyte *)name);
 	}
 	else if (pfnProxyGLXGetProcAddressARB) {
-		return (*pfnProxyGLXGetProcAddressARB)(name);
+		return (*pfnProxyGLXGetProcAddressARB)((const GLubyte *)name);
 	}
 	else {
 		return dlsym(handle, name);
 	}
 }
 
-void *glProxyGetExtProcAddr(void *handle, const char *name)
-{
-	if (pfnProxyEGLGetProcAddress) {
+static GLboolean glProxyCheckExtension(const char *list, const char *name)
+{
+    size_t len = strlen(name);
+    const char *ext_ptr = list;
+
+    if(ext_ptr == NULL)
+        return GL_FALSE;
+
+    while ((ext_ptr = strstr(ext_ptr, name)) != NULL) {
+        if (ext_ptr[len] == ' ' || ext_ptr[len] == '\0')
+            break;
+        ext_ptr += len;
+    }
+
+    return (ext_ptr != NULL)? GL_TRUE : GL_FALSE;
+}
+
+GLboolean glProxyHasExtension(const char *extension)
+{
+    char const *backend_extensions = NULL;
+    char const *gl_extensions = NULL;
+
+    if (global_proxy_context.current_backend == UNKNOWN_BACKEND)
+        return GL_FALSE;
+
+    /* Get the backend extensions string */
+    if (global_proxy_context.current_backend == OPENGL_BACKEND &&
+        pfnProxyQueryExtensionsString) {
+
+        if (!global_proxy_context.x_dpy) {
+            global_proxy_context.x_dpy = XOpenDisplay(NULL);
+        }
+
+        backend_extensions = pfnProxyQueryExtensionsString(
+                                 global_proxy_context.x_dpy,
+                                 DefaultScreen(global_proxy_context.x_dpy));
+    } else if (global_proxy_context.current_backend == OPENGL_ES20_BACKEND &&
+               pfnProxyEGLQueryString) {
+
+        backend_extensions = pfnProxyEGLQueryString(
+                                (EGLDisplay)global_proxy_context.egl_dpy,
+                                EGL_EXTENSIONS);
+    }
+
+    /* Get the GL extensions string */
+    if (pfnProxyGetString)
+        gl_extensions = (const char *)pfnProxyGetString(GL_EXTENSIONS);
+
+    /* Check if present */
+    if (glProxyCheckExtension(backend_extensions, extension) ||
+        glProxyCheckExtension(gl_extensions, extension))
+        return GL_TRUE;
+
+    return GL_FALSE;
+}
+
+void *glProxyGetExtProcAddr(const char *extension, const char *name)
+{
+    if (!glProxyHasExtension(extension))
+        return NULL;
+
+    if (pfnProxyEGLGetProcAddress) {
 		return (*pfnProxyEGLGetProcAddress)(name);
 	}
 	else if (pfnProxyGLXGetProcAddress) {
- 		return (*pfnProxyGLXGetProcAddress)(name);
+ 		return (*pfnProxyGLXGetProcAddress)((const GLubyte *)name);
  	}
 	else if (pfnProxyGLXGetProcAddressARB) {
-		return (*pfnProxyGLXGetProcAddressARB)(name);
-	}
-	else {
-		return dlsym(handle, name);
-	}
+		return (*pfnProxyGLXGetProcAddressARB)((const GLubyte *)name);
+	}
+
+    return NULL;
 }
 
 static const char *glProxyGetGLRenderer(Display *dpy)
@@ -388,7 +451,7 @@
 
 	(*pfnProxyMakeCurrent)(dpy, root, glx_ctx);
 
-	renderer = (*pfnProxyGetString)(GL_RENDERER);
+	renderer = (const char *)(*pfnProxyGetString)(GL_RENDERER);
 
 	(*pfnProxyMakeCurrent)(dpy, None, NULL);
 
@@ -406,20 +469,20 @@
 	const char *gles2_renderer = NULL;
 
 	if (OPENGL_BACKEND == option) {
-                if (proxy_context->gl_handle = glProxyOpenLibrary(opengl_libraries[OPENGL_BACKEND])) {
+                if ((proxy_context->gl_handle = glProxyOpenLibrary(opengl_libraries[OPENGL_BACKEND]))) {
                         *pProxyBackend = OPENGL_BACKEND;
                 }
-                else if (proxy_context->gles2_handle = glProxyOpenLibrary(opengl_libraries[OPENGL_ES20_BACKEND])) {
+                else if ((proxy_context->gles2_handle = glProxyOpenLibrary(opengl_libraries[OPENGL_ES20_BACKEND]))) {
                         *pProxyBackend = OPENGL_ES20_BACKEND;
                 }
                 else {
                         *pProxyBackend = UNKNOWN_BACKEND;
                 }
         } else if (OPENGL_ES20_BACKEND == option) {
-                if (proxy_context->gles2_handle = glProxyOpenLibrary(opengl_libraries[OPENGL_ES20_BACKEND])) {
+                if ((proxy_context->gles2_handle = glProxyOpenLibrary(opengl_libraries[OPENGL_ES20_BACKEND]))) {
                         *pProxyBackend = OPENGL_ES20_BACKEND;
                 }
-                else if (proxy_context->gl_handle = glProxyOpenLibrary(opengl_libraries[OPENGL_BACKEND])) {
+                else if ((proxy_context->gl_handle = glProxyOpenLibrary(opengl_libraries[OPENGL_BACKEND]))) {
                         *pProxyBackend = OPENGL_BACKEND;
                 }
                 else {
@@ -464,7 +527,7 @@
 
 			CreateEGLRenderingContext(dpy, proxy_context);
 
-			gles2_renderer = pfnProxyGetString(GL_RENDERER);
+			gles2_renderer = (const char *)pfnProxyGetString(GL_RENDERER);
 
 			/* Reset the function pointers */
 			pfnProxyGetString = NULL;
@@ -719,13 +782,13 @@
 	return 0;
 }
 
-extern int glProxyExtInitGLES2(void *handle);
-extern int glProxyExtInitGL(void *handle);
 extern int glxProxyInit(void *handle);
-extern int glxProxyExtInit(void *handle);
 
 int glProxyInit(PROXY_BACKEND_OPTION *pProxyBackend)
 {
+    global_proxy_context.current_backend = UNKNOWN_BACKEND;
+    global_proxy_context.x_dpy = NULL;
+
 	/* Select backend first */
 	glProxyBackendSelection(pProxyBackend, &global_proxy_context);
 
@@ -743,13 +806,10 @@
 	/* Resolve symbols */
 	if (OPENGL_BACKEND == global_proxy_context.current_backend) {
 		glProxyCoreInit(global_proxy_context.gl_handle);
-		glProxyExtInitGL(global_proxy_context.gl_handle);
 		glxProxyInit(global_proxy_context.gl_handle);
-		glxProxyExtInit(global_proxy_context.gl_handle);
 	}
 	else if (OPENGL_ES20_BACKEND == global_proxy_context.current_backend) {
 		glProxyCoreInit(global_proxy_context.gles2_handle);
-		glProxyExtInitGLES2(global_proxy_context.gles2_handle);
 	}
 	else {
 		/* should not get here */

=== removed file 'src/glext_proxy.c'
--- src/glext_proxy.c	2011-02-24 04:52:03 +0000
+++ src/glext_proxy.c	1970-01-01 00:00:00 +0000
@@ -1,168 +0,0 @@
-/* Copyright (C) 2010-2011 Linaro Ltd.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-/*
- * Authored-by: Jammy Zhou <[e-mail]>
- */
-
-#include <stdlib.h>
-
-#include <GL/gl_proxy.h>
-#include <GL/glext_proxy.h>
-
-/* proxy functions for GLES2 extensions */
-PFNPROXYEGLIMAGETARGETTEXTURE2DOESPROC pfnProxyEGLImageTargetTexture2DOES = NULL;
-PFNPROXYEGLIMAGETARGETRENDERBUFFERSTORAGEOESPROC pfnProxyEGLImageTargetRenderbufferStorageOES = NULL;
-PFNPROXYGETPROGRAMBINARYOESPROC pfnProxyGetProgramBinaryOES = NULL;
-PFNPROXYPROGRAMBINARYOESPROC pfnProxyProgramBinaryOES = NULL;
-PFNPROXYMAPBUFFEROESPROC pfnProxyMapBufferOES = NULL;
-PFNPROXYUNMAPBUFFEROESPROC pfnProxyUnmapBufferOES = NULL;
-PFNPROXYGETBUFFERPOINTERVOESPROC pfnProxyGetBufferPointervOES = NULL;
-PFNPROXYTEXIMAGE3DOESPROC pfnProxyTexImage3DOES = NULL;
-PFNPROXYTEXSUBIMAGE3DOESPROC pfnProxyTexSubImage3DOES = NULL;
-PFNPROXYCOPYTEXSUBIMAGE3DOESPROC pfnProxyCopyTexSubImage3DOES = NULL;
-PFNPROXYCOMPRESSEDTEXIMAGE3DOESPROC pfnProxyCompressedTexImage3DOES = NULL;
-PFNPROXYCOMPRESSEDTEXSUBIMAGE3DOESPROC pfnProxyCompressedTexSubImage3DOES = NULL;
-PFNPROXYFRAMEBUFFERTEXTURE3DOESPROC pfnProxyFramebufferTexture3DOES = NULL;
-PFNPROXYBINDVERTEXARRAYOESPROC pfnProxyBindVertexArrayOES = NULL;
-PFNPROXYDELETEVERTEXARRAYSOESPROC pfnProxyDeleteVertexArraysOES = NULL;
-PFNPROXYGENVERTEXARRAYSOESPROC pfnProxyGenVertexArraysOES = NULL;
-PFNPROXYISVERTEXARRAYOESPROC pfnProxyIsVertexArrayOES = NULL;
-PFNPROXYGETPERFMONITORGROUPSAMDPROC pfnProxyGetPerfMonitorGroupsAMD = NULL;
-PFNPROXYGETPERFMONITORCOUNTERSAMDPROC pfnProxyGetPerfMonitorCountersAMD = NULL;
-PFNPROXYGETPERFMONITORGROUPSTRINGAMDPROC pfnProxyGetPerfMonitorGroupStringAMD = NULL;
-PFNPROXYGETPERFMONITORCOUNTERSTRINGAMDPROC pfnProxyGetPerfMonitorCounterStringAMD = NULL;
-PFNPROXYGETPERFMONITORCOUNTERINFOAMDPROC pfnProxyGetPerfMonitorCounterInfoAMD = NULL;
-PFNPROXYGENPERFMONITORSAMDPROC pfnProxyGenPerfMonitorsAMD = NULL;
-PFNPROXYDELETEPERFMONITORSAMDPROC pfnProxyDeletePerfMonitorsAMD = NULL;
-PFNPROXYSELECTPERFMONITORCOUNTERSAMDPROC pfnProxySelectPerfMonitorCountersAMD = NULL;
-PFNPROXYBEGINPERFMONITORAMDPROC pfnProxyBeginPerfMonitorAMD = NULL;
-PFNPROXYENDPERFMONITORAMDPROC pfnProxyEndPerfMonitorAMD = NULL;
-PFNPROXYGETPERFMONITORCOUNTERDATAAMDPROC pfnProxyGetPerfMonitorCounterDataAMD = NULL;
-PFNPROXYDISCARDFRAMEBUFFEREXTPROC pfnProxyDiscardFramebufferEXT = NULL;
-PFNPROXYMULTIDRAWARRAYSEXTPROC pfnProxyMultiDrawArraysEXT = NULL;
-PFNPROXYMULTIDRAWELEMENTSEXTPROC pfnProxyMultiDrawElementsEXT = NULL;
-PFNPROXYRENDERBUFFERSTORAGEMULTISAMPLEIMGPROC pfnProxyRenderbufferStorageMultisampleIMG = NULL;
-PFNPROXYFRAMEBUFFERTEXTURE2DMULTISAMPLEIMGPROC pfnProxyFramebufferTexture2DMultisampleIMG = NULL;
-PFNPROXYDELETEFENCESNVPROC pfnProxyDeleteFencesNV = NULL;
-PFNPROXYGENFENCESNVPROC pfnProxyGenFencesNV = NULL;
-PFNPROXYISFENCENVPROC pfnProxyIsFenceNV = NULL;
-PFNPROXYTESTFENCENVPROC pfnProxyTestFenceNV = NULL;
-PFNPROXYGETFENCEIVNVPROC pfnProxyGetFenceivNV = NULL;
-PFNPROXYFINISHFENCENVPROC pfnProxyFinishFenceNV = NULL;
-PFNPROXYSETFENCENVPROC pfnProxySetFenceNV = NULL;
-PFNPROXYCOVERAGEMASKNVPROC pfnProxyCoverageMaskNV = NULL;
-PFNPROXYCOVERAGEOPERATIONNVPROC pfnProxyCoverageOperationNV = NULL;
-PFNPROXYGETDRIVERCONTROLSQCOMPROC pfnProxyGetDriverControlsQCOM = NULL;
-PFNPROXYGETDRIVERCONTROLSTRINGQCOMPROC pfnProxyGetDriverControlStringQCOM = NULL;
-PFNPROXYENABLEDRIVERCONTROLQCOMPROC pfnProxyEnableDriverControlQCOM = NULL;
-PFNPROXYDISABLEDRIVERCONTROLQCOMPROC pfnProxyDisableDriverControlQCOM = NULL;
-PFNPROXYEXTGETTEXTURESQCOMPROC pfnProxyExtGetTexturesQCOM = NULL;
-PFNPROXYEXTGETBUFFERSQCOMPROC pfnProxyExtGetBuffersQCOM = NULL;
-PFNPROXYEXTGETRENDERBUFFERSQCOMPROC pfnProxyExtGetRenderbuffersQCOM = NULL;
-PFNPROXYEXTGETFRAMEBUFFERSQCOMPROC pfnProxyExtGetFramebuffersQCOM = NULL;
-PFNPROXYEXTGETTEXLEVELPARAMETERIVQCOMPROC pfnProxyExtGetTexLevelParameterivQCOM = NULL;
-PFNPROXYEXTTEXOBJECTSTATEOVERRIDEIQCOMPROC pfnProxyExtTexObjectStateOverrideiQCOM = NULL;
-PFNPROXYEXTGETTEXSUBIMAGEQCOMPROC pfnProxyExtGetTexSubImageQCOM = NULL;
-PFNPROXYEXTGETBUFFERPOINTERVQCOMPROC pfnProxyExtGetBufferPointervQCOM = NULL;
-PFNPROXYEXTGETSHADERSQCOMPROC pfnProxyExtGetShadersQCOM = NULL;
-PFNPROXYEXTGETPROGRAMSQCOMPROC pfnProxyExtGetProgramsQCOM = NULL;
-PFNPROXYEXTISPROGRAMBINARYQCOMPROC pfnProxyExtIsProgramBinaryQCOM = NULL;
-PFNPROXYEXTGETPROGRAMBINARYSOURCEQCOMPROC pfnProxyExtGetProgramBinarySourceQCOM = NULL;
-PFNPROXYSTARTTILINGQCOMPROC pfnProxyStartTilingQCOM = NULL;
-PFNPROXYENDTILINGQCOMPROC pfnProxyEndTilingQCOM = NULL;
-
-/* Symbol resolve */
-extern void *glProxyGetExtProcAddr(void *handle, const char *name);
-
-int glProxyExtInitGLES2(void *handle)
-{
-	if (NULL == handle) {
-		return -1;
-	}
-
-	pfnProxyEGLImageTargetTexture2DOES = glProxyGetExtProcAddr(handle, "glEGLImageTargetTexture2DOES");
-	pfnProxyEGLImageTargetRenderbufferStorageOES = glProxyGetExtProcAddr(handle, "glEGLImageTargetRenderbufferStorageOES");
-	pfnProxyGetProgramBinaryOES = glProxyGetExtProcAddr(handle, "glGetProgramBinaryOES");
-	pfnProxyProgramBinaryOES = glProxyGetExtProcAddr(handle, "glProgramBinaryOES");
-	pfnProxyMapBufferOES = glProxyGetExtProcAddr(handle, "glMapBufferOES");
-	pfnProxyUnmapBufferOES = glProxyGetExtProcAddr(handle, "glUnmapBufferOES");
-	pfnProxyGetBufferPointervOES = glProxyGetExtProcAddr(handle, "glGetBufferPointervOES");
-	pfnProxyTexImage3DOES = glProxyGetExtProcAddr(handle, "glTexImage3DOES");
-	pfnProxyTexSubImage3DOES = glProxyGetExtProcAddr(handle, "glTexSubImage3DOES");
-	pfnProxyCopyTexSubImage3DOES = glProxyGetExtProcAddr(handle, "glCopyTexSubImage3DOES");
-	pfnProxyCompressedTexImage3DOES = glProxyGetExtProcAddr(handle, "glCompressedTexImage3DOES");
-	pfnProxyCompressedTexSubImage3DOES = glProxyGetExtProcAddr(handle, "glCompressedTexSubImage3DOES");
-	pfnProxyFramebufferTexture3DOES = glProxyGetExtProcAddr(handle, "glFramebufferTexture3DOES");
-	pfnProxyBindVertexArrayOES = glProxyGetExtProcAddr(handle, "glBindVertexArrayOES");
-	pfnProxyDeleteVertexArraysOES = glProxyGetExtProcAddr(handle, "glDeleteVertexArraysOES");
-	pfnProxyGenVertexArraysOES = glProxyGetExtProcAddr(handle, "glGenVertexArraysOES");
-	pfnProxyIsVertexArrayOES = glProxyGetExtProcAddr(handle, "glIsVertexArrayOES");
-	pfnProxyGetPerfMonitorGroupsAMD = glProxyGetExtProcAddr(handle, "glGetPerfMonitorGroupsAMD");
-	pfnProxyGetPerfMonitorCountersAMD = glProxyGetExtProcAddr(handle, "glGetPerfMonitorCountersAMD");
-	pfnProxyGetPerfMonitorGroupStringAMD = glProxyGetExtProcAddr(handle, "glGetPerfMonitorGroupStringAMD");
-	pfnProxyGetPerfMonitorCounterStringAMD = glProxyGetExtProcAddr(handle, "glGetPerfMonitorCounterStringAMD");
-	pfnProxyGetPerfMonitorCounterInfoAMD = glProxyGetExtProcAddr(handle, "glGetPerfMonitorCounterInfoAMD");
-	pfnProxyGenPerfMonitorsAMD = glProxyGetExtProcAddr(handle, "glGenPerfMonitorsAMD");
-	pfnProxyDeletePerfMonitorsAMD = glProxyGetExtProcAddr(handle, "glDeletePerfMonitorsAMD");
-	pfnProxySelectPerfMonitorCountersAMD = glProxyGetExtProcAddr(handle, "glSelectPerfMonitorCountersAMD");
-	pfnProxyBeginPerfMonitorAMD = glProxyGetExtProcAddr(handle, "glBeginPerfMonitorAMD");
-	pfnProxyEndPerfMonitorAMD = glProxyGetExtProcAddr(handle, "glEndPerfMonitorAMD");
-	pfnProxyGetPerfMonitorCounterDataAMD = glProxyGetExtProcAddr(handle, "glGetPerfMonitorCounterDataAMD");
-	pfnProxyDiscardFramebufferEXT = glProxyGetExtProcAddr(handle, "glDiscardFramebufferEXT");
-	pfnProxyMultiDrawArraysEXT = glProxyGetExtProcAddr(handle, "glMultiDrawArraysEXT");
-	pfnProxyMultiDrawElementsEXT = glProxyGetExtProcAddr(handle, "glMultiDrawElementsEXT");
-	pfnProxyRenderbufferStorageMultisampleIMG = glProxyGetExtProcAddr(handle, "glRenderbufferStorageMultisampleIMG");
-	pfnProxyFramebufferTexture2DMultisampleIMG = glProxyGetExtProcAddr(handle, "glFramebufferTexture2DMultisampleIMG");
-	pfnProxyDeleteFencesNV = glProxyGetExtProcAddr(handle, "glDeleteFencesNV");
-	pfnProxyGenFencesNV = glProxyGetExtProcAddr(handle, "glGenFencesNV");
-	pfnProxyIsFenceNV = glProxyGetExtProcAddr(handle, "glIsFenceNV");
-	pfnProxyTestFenceNV = glProxyGetExtProcAddr(handle, "glTestFenceNV");
-	pfnProxyGetFenceivNV = glProxyGetExtProcAddr(handle, "glGetFenceivNV");
-	pfnProxyFinishFenceNV = glProxyGetExtProcAddr(handle, "glFinishFenceNV");
-	pfnProxySetFenceNV = glProxyGetExtProcAddr(handle, "glSetFenceNV");
-	pfnProxyCoverageMaskNV = glProxyGetExtProcAddr(handle, "glCoverageMaskNV");
-	pfnProxyCoverageOperationNV = glProxyGetExtProcAddr(handle, "glCoverageOperationNV");
-	pfnProxyGetDriverControlsQCOM = glProxyGetExtProcAddr(handle, "glGetDriverControlsQCOM");
-	pfnProxyGetDriverControlStringQCOM = glProxyGetExtProcAddr(handle, "glGetDriverControlStringQCOM");
-	pfnProxyEnableDriverControlQCOM = glProxyGetExtProcAddr(handle, "glEnableDriverControlQCOM");
-	pfnProxyDisableDriverControlQCOM = glProxyGetExtProcAddr(handle, "glDisableDriverControlQCOM");
-	pfnProxyExtGetTexturesQCOM = glProxyGetExtProcAddr(handle, "glExtGetTexturesQCOM");
-	pfnProxyExtGetBuffersQCOM = glProxyGetExtProcAddr(handle, "glExtGetBuffersQCOM");
-	pfnProxyExtGetRenderbuffersQCOM = glProxyGetExtProcAddr(handle, "glExtGetRenderbuffersQCOM");
-	pfnProxyExtGetFramebuffersQCOM = glProxyGetExtProcAddr(handle, "glExtGetFramebuffersQCOM");
-	pfnProxyExtGetTexLevelParameterivQCOM = glProxyGetExtProcAddr(handle, "glExtGetTexLevelParameterivQCOM");
-	pfnProxyExtTexObjectStateOverrideiQCOM = glProxyGetExtProcAddr(handle, "glExtTexObjectStateOverrideiQCOM");
-	pfnProxyExtGetTexSubImageQCOM = glProxyGetExtProcAddr(handle, "glExtGetTexSubImageQCOM");
-	pfnProxyExtGetBufferPointervQCOM = glProxyGetExtProcAddr(handle, "glExtGetBufferPointervQCOM");
-	pfnProxyExtGetShadersQCOM = glProxyGetExtProcAddr(handle, "glExtGetShadersQCOM");
-	pfnProxyExtGetProgramsQCOM = glProxyGetExtProcAddr(handle, "glExtGetProgramsQCOM");
-	pfnProxyExtIsProgramBinaryQCOM = glProxyGetExtProcAddr(handle, "glExtIsProgramBinaryQCOM");
-	pfnProxyExtGetProgramBinarySourceQCOM = glProxyGetExtProcAddr(handle, "glExtGetProgramBinarySourceQCOM");
-	pfnProxyStartTilingQCOM = glProxyGetExtProcAddr(handle, "glStartTilingQCOM");
-	pfnProxyEndTilingQCOM = glProxyGetExtProcAddr(handle, "glEndTilingQCOM");
-}
-
-int glProxyExtInitGL(void *handle)
-{
-	/* TODO */
-	return 0;
-}

=== modified file 'src/glx_proxy.c'
--- src/glx_proxy.c	2011-09-13 16:03:17 +0000
+++ src/glx_proxy.c	2011-10-19 11:31:30 +0000
@@ -20,7 +20,9 @@
  */
 
 /*
- * Authored-by: Jammy Zhou <[e-mail]>
+ * Authors:
+ *  Jammy Zhou <[e-mail]>
+ *  Marc Ordinas i Llopis, Collabora Ltd <[e-mail]>
  */
 
 #include <GL/gl_proxy.h>
@@ -66,92 +68,7 @@
 PFNPROXYSELECTEVENTPROC             pfnProxySelectEvent = NULL;
 PFNPROXYGETSELECTEDEVENTPROC        pfnProxyGetSelectedEvent = NULL;
 
-/* GLX extension functions */
-PFNPROXYCREATECONTEXTATTRIBSARBPROC     pfnProxyCreateContextAttribsARB = NULL;
-PFNPROXYSWAPINTERVALSGIPROC             pfnProxySwapIntervalSGI = NULL;
-PFNPROXYGETVIDEOSYNCSGIPROC             pfnProxyGetVideoSyncSGI = NULL;
-PFNPROXYWAITVIDEOSYNCSGIPROC            pfnProxyWaitVideoSyncSGI = NULL;
-PFNPROXYMAKECURRENTREADSGIPROC          pfnProxyMakeCurrentReadSGI = NULL;
-PFNPROXYGETCURRENTREADDRAWABLESGIPROC   pfnProxyGetCurrentReadDrawableSGI = NULL;
-#ifdef _VL_H
-PFNPROXYCREATEGLXVIDEOSOURCESGIXPROC    pfnProxyCreateGLXVideoSourceSGIX = NULL;
-PFNPROXYDESTROYGLXVIDEOSOURCESGIXPROC   pfnProxyDestroyGLXVideoSourceSGIX = NULL;
-#endif
-PFNPROXYGETCURRENTDISPLAYEXTPROC        pfnProxyGetCurrentDisplayEXT = NULL;
-PFNPROXYQUERYCONTEXTINFOEXTPROC         pfnProxyQueryContextInfoEXT = NULL;
-PFNPROXYGETCONTEXTIDEXTPROC             pfnProxyGetContextIDEXT = NULL;
-PFNPROXYIMPORTCONTEXTEXTPROC            pfnProxyImportContextEXT = NULL;
-PFNPROXYFREECONTEXTEXTPROC              pfnProxyFreeContextEXT = NULL;
-PFNPROXYGETFBCONFIGATTRIBSGIXPROC       pfnProxyGetFBConfigAttribSGIX = NULL;
-PFNPROXYCHOOSEFBCONFIGSGIXPROC          pfnProxyChooseFBConfigSGIX = NULL;
-PFNPROXYCREATEGLXPIXMAPWITHCONFIGSGIXPROC pfnProxyCreateGLXPixmapWithConfigSGIX = NULL;
-PFNPROXYCREATECONTEXTWITHCONFIGSGIXPROC pfnProxyCreateContextWithConfigSGIX = NULL;
-PFNPROXYGETVISUALFROMFBCONFIGSGIXPROC   pfnProxyGetVisualFromFBConfigSGIX = NULL;
-PFNPROXYGETFBCONFIGFROMVISUALSGIXPROC   pfnProxyGetFBConfigFromVisualSGIX = NULL;
-PFNPROXYCREATEGLXPBUFFERSGIXPROC        pfnProxyCreateGLXPbufferSGIX = NULL;
-PFNPROXYDESTROYGLXPBUFFERSGIXPROC       pfnProxyDestroyGLXPbufferSGIX = NULL;
-PFNPROXYQUERYGLXPBUFFERSGIXPROC         pfnProxyQueryGLXPbufferSGIX = NULL;
-PFNPROXYSELECTEVENTSGIXPROC             pfnProxySelectEventSGIX = NULL;
-PFNPROXYGETSELECTEDEVENTSGIXPROC        pfnProxyGetSelectedEventSGIX = NULL;
-PFNPROXYCUSHIONSGIPROC                  pfnProxyCushionSGI = NULL;
-PFNPROXYBINDCHANNELTOWINDOWSGIXPROC     pfnProxyBindChannelToWindowSGIX = NULL;
-PFNPROXYCHANNELRECTSGIXPROC             pfnProxyChannelRectSGIX = NULL;
-PFNPROXYQUERYCHANNELRECTSGIXPROC        pfnProxyQueryChannelRectSGIX = NULL;
-PFNPROXYQUERYCHANNELDELTASSGIXPROC      pfnProxyQueryChannelDeltasSGIX = NULL;
-PFNPROXYCHANNELRECTSYNCSGIXPROC         pfnProxyChannelRectSyncSGIX = NULL;
-#ifdef _DM_BUFFER_H
-PFNPROXYASSOCIATEDMPBUFFERSGIXPROC      pfnProxyAssociateDMPbufferSGIX = NULL;
-#endif
-PFNPROXYJOINSWAPGROUPSGIXPROC           pfnProxyJoinSwapGroupSGIX = NULL;
-PFNPROXYBINDSWAPBARRIERSGIXPROC         pfnProxyBindSwapBarrierSGIX = NULL;
-PFNPROXYQUERYMAXSWAPBARRIERSSGIXPROC    pfnProxyQueryMaxSwapBarriersSGIX = NULL;
-PFNPROXYGETTRANSPARENTINDEXSUNPROC      pfnProxyGetTransparentIndexSUN = NULL;
-PFNPROXYCOPYSUBBUFFERMESAPROC           pfnProxyCopySubBufferMESA = NULL;
-PFNPROXYCREATEGLXPIXMAPMESAPROC         pfnProxyCreateGLXPixmapMESA = NULL;
-PFNPROXYRELEASEBUFFERSMESAPROC          pfnProxyReleaseBuffersMESA = NULL;
-PFNPROXYSET3DFXMODEMESAPROC             pfnProxySet3DfxModeMESA = NULL;
-PFNPROXYGETSYNCVALUESOMLPROC            pfnProxyGetSyncValuesOML = NULL;
-PFNPROXYGETMSCRATEOMLPROC               pfnProxyGetMscRateOML = NULL;
-PFNPROXYSWAPBUFFERSMSCOMLPROC           pfnProxySwapBuffersMscOML = NULL;
-PFNPROXYWAITFORMSCOMLPROC               pfnProxyWaitForMscOML = NULL;
-PFNPROXYWAITFORSBCOMLPROC               pfnProxyWaitForSbcOML = NULL;
-PFNPROXYQUERYHYPERPIPENETWORKSGIXPROC   pfnProxyQueryHyperpipeNetworkSGIX = NULL;
-PFNPROXYHYPERPIPECONFIGSGIXPROC         pfnProxyHyperpipeConfigSGIX = NULL;
-PFNPROXYQUERYHYPERPIPECONFIGSGIXPROC    pfnProxyQueryHyperpipeConfigSGIX = NULL;
-PFNPROXYDESTROYHYPERPIPECONFIGSGIXPROC  pfnProxyDestroyHyperpipeConfigSGIX = NULL;
-PFNPROXYBINDHYPERPIPESGIXPROC           pfnProxyBindHyperpipeSGIX = NULL;
-PFNPROXYQUERYHYPERPIPEBESTATTRIBSGIXPROC pfnProxyQueryHyperpipeBestAttribSGIX = NULL;
-PFNPROXYHYPERPIPEATTRIBSGIXPROC         pfnProxyHyperpipeAttribSGIX = NULL;
-PFNPROXYQUERYHYPERPIPEATTRIBSGIXPROC    pfnProxyQueryHyperpipeAttribSGIX = NULL;
-PFNPROXYGETAGPOFFSETMESAPROC            pfnProxyGetAGPOffsetMESA = NULL;
-PFNPROXYBINDTEXIMAGEEXTPROC             pfnProxyBindTexImageEXT = NULL;
-PFNPROXYRELEASETEXIMAGEEXTPROC          pfnProxyReleaseTexImageEXT = NULL;
-PFNPROXYENUMERATEVIDEODEVICESNVPROC     pfnProxyEnumerateVideoDevicesNV = NULL;
-PFNPROXYBINDVIDEODEVICENVPROC           pfnProxyBindVideoDeviceNV = NULL;
-PFNPROXYGETVIDEODEVICENVPROC            pfnProxyGetVideoDeviceNV = NULL;
-PFNPROXYRELEASEVIDEODEVICENVPROC        pfnProxyReleaseVideoDeviceNV = NULL;
-PFNPROXYBINDVIDEOIMAGENVPROC            pfnProxyBindVideoImageNV = NULL;
-PFNPROXYRELEASEVIDEOIMAGENVPROC         pfnProxyReleaseVideoImageNV = NULL;
-PFNPROXYSENDPBUFFERTOVIDEONVPROC        pfnProxySendPbufferToVideoNV = NULL;
-PFNPROXYGETVIDEOINFONVPROC              pfnProxyGetVideoInfoNV = NULL;
-PFNPROXYJOINSWAPGROUPNVPROC             pfnProxyJoinSwapGroupNV = NULL;
-PFNPROXYBINDSWAPBARRIERNVPROC           pfnProxyBindSwapBarrierNV = NULL;
-PFNPROXYQUERYSWAPGROUPNVPROC            pfnProxyQuerySwapGroupNV = NULL;
-PFNPROXYQUERYMAXSWAPGROUPSNVPROC        pfnProxyQueryMaxSwapGroupsNV = NULL;
-PFNPROXYQUERYFRAMECOUNTNVPROC           pfnProxyQueryFrameCountNV = NULL;
-PFNPROXYRESETFRAMECOUNTNVPROC           pfnProxyResetFrameCountNV = NULL;
-PFNPROXYBINDVIDEOCAPTUREDEVICENVPROC    pfnProxyBindVideoCaptureDeviceNV = NULL;
-PFNPROXYENUMERATEVIDEOCAPTUREDEVICESNVPROC pfnProxyEnumerateVideoCaptureDevicesNV = NULL;
-PFNPROXYLOCKVIDEOCAPTUREDEVICENVPROC    pfnProxyLockVideoCaptureDeviceNV = NULL;
-PFNPROXYQUERYVIDEOCAPTUREDEVICENVPROC   pfnProxyQueryVideoCaptureDeviceNV = NULL;
-PFNPROXYRELEASEVIDEOCAPTUREDEVICENVPROC pfnProxyReleaseVideoCaptureDeviceNV = NULL;
-PFNPROXYSWAPINTERVALEXTPROC             pfnProxySwapIntervalEXT = NULL;
-PFNPROXYCOPYIMAGESUBDATANVPROC          pfnProxyCopyImageSubDataNV = NULL;
-PFNPROXYSWAPINTERVALMESAPROC            pfnProxySwapIntervalMESA = NULL;
-PFNPROXYGETSWAPINTERVALMESAPROC         pfnProxyGetSwapIntervalMESA = NULL;
-
 extern void *glProxyGetProcAddr(void *handle, const char *name);
-extern void *glProxyGetExtProcAddr(void *handle, const char *name);
 
 int glxProxyInit(void *handle)
 {
@@ -200,95 +117,3 @@
 
 	return 0;
 }
-
-int glxProxyExtInit(void *handle)
-{
-	if (NULL == handle) {
-                return -1;
-        }
-
-	pfnProxyCreateContextAttribsARB = glProxyGetExtProcAddr(handle, "glXCreateContextAttribsARB");
-	pfnProxySwapIntervalSGI = glProxyGetExtProcAddr(handle, "glXSwapIntervalSGI");
-	pfnProxyGetVideoSyncSGI = glProxyGetExtProcAddr(handle, "glXGetVideoSyncSGI");
-	pfnProxyWaitVideoSyncSGI = glProxyGetExtProcAddr(handle, "glXWaitVideoSyncSGI");
-	pfnProxyMakeCurrentReadSGI = glProxyGetExtProcAddr(handle, "glXMakeCurrentReadSGI");
-	pfnProxyGetCurrentReadDrawableSGI = glProxyGetExtProcAddr(handle, "glXGetCurrentReadDrawableSGI");
-#ifdef _VL_H
-	pfnProxyCreateGLXVideoSourceSGIX = glProxyGetExtProcAddr(handle, "glXCreateGLXVideoSourceSGIX");
-	pfnProxyDestroyGLXVideoSourceSGIX = glProxyGetExtProcAddr(handle, "glXDestroyGLXVideoSourceSGIX");
-#endif
-	pfnProxyGetCurrentDisplayEXT = glProxyGetExtProcAddr(handle, "glXGetCurrentDisplayEXT");
-	pfnProxyQueryContextInfoEXT = glProxyGetExtProcAddr(handle, "glXQueryContextInfoEXT");
-	pfnProxyGetContextIDEXT = glProxyGetExtProcAddr(handle, "glXGetContextIDEXT");
-	pfnProxyImportContextEXT = glProxyGetExtProcAddr(handle, "glXImportContextEXT");
-	pfnProxyFreeContextEXT = glProxyGetExtProcAddr(handle, "glXFreeContextEXT");
-	pfnProxyGetFBConfigAttribSGIX = glProxyGetExtProcAddr(handle, "glXGetFBConfigAttribSGIX");
-	pfnProxyChooseFBConfigSGIX = glProxyGetExtProcAddr(handle, "glXChooseFBConfigSGIX");
-	pfnProxyCreateGLXPixmapWithConfigSGIX = glProxyGetExtProcAddr(handle, "glXCreateGLXPixmapWithConfigSGIX");
-	pfnProxyCreateContextWithConfigSGIX = glProxyGetExtProcAddr(handle, "glXCreateContextWithConfigSGIX");
-	pfnProxyGetVisualFromFBConfigSGIX = glProxyGetExtProcAddr(handle, "glXGetVisualFromFBConfigSGIX");
-	pfnProxyGetFBConfigFromVisualSGIX = glProxyGetExtProcAddr(handle, "glXGetFBConfigFromVisualSGIX");
-	pfnProxyCreateGLXPbufferSGIX = glProxyGetExtProcAddr(handle, "glXCreateGLXPbufferSGIX");
-	pfnProxyDestroyGLXPbufferSGIX = glProxyGetExtProcAddr(handle, "glXDestroyGLXPbufferSGIX");
-	pfnProxyQueryGLXPbufferSGIX = glProxyGetExtProcAddr(handle, "glXQueryGLXPbufferSGIX");
-	pfnProxySelectEventSGIX = glProxyGetExtProcAddr(handle, "glXSelectEventSGIX");
-	pfnProxyGetSelectedEventSGIX = glProxyGetExtProcAddr(handle, "glXGetSelectedEventSGIX");
-	pfnProxyCushionSGI = glProxyGetExtProcAddr(handle, "glXCushionSGI");
-	pfnProxyBindChannelToWindowSGIX = glProxyGetExtProcAddr(handle, "glXBindChannelToWindowSGIX");
-	pfnProxyChannelRectSGIX = glProxyGetExtProcAddr(handle, "glXChannelRectSGIX");
-	pfnProxyQueryChannelRectSGIX = glProxyGetExtProcAddr(handle, "glXQueryChannelRectSGIX");
-	pfnProxyQueryChannelDeltasSGIX = glProxyGetExtProcAddr(handle, "glXQueryChannelDeltasSGIX");
-	pfnProxyChannelRectSyncSGIX = glProxyGetExtProcAddr(handle, "glXChannelRectSyncSGIX");
-#ifdef _DM_BUFFER_H
-	pfnProxyAssociateDMPbufferSGIX = glProxyGetExtProcAddr(handle, "glXAssociateDMPbufferSGIX");
-#endif
-	pfnProxyJoinSwapGroupSGIX = glProxyGetExtProcAddr(handle, "glXJoinSwapGroupSGIX");
-	pfnProxyBindSwapBarrierSGIX = glProxyGetExtProcAddr(handle, "glXBindSwapBarrierSGIX");
-	pfnProxyQueryMaxSwapBarriersSGIX = glProxyGetExtProcAddr(handle, "glXQueryMaxSwapBarriersSGIX");
-	pfnProxyGetTransparentIndexSUN = glProxyGetExtProcAddr(handle, "glXGetTransparentIndexSUN");
-	pfnProxyCopySubBufferMESA = glProxyGetExtProcAddr(handle, "glXCopySubBufferMESA");
-	pfnProxyCreateGLXPixmapMESA = glProxyGetExtProcAddr(handle, "glXCreateGLXPixmapMESA");
-	pfnProxyReleaseBuffersMESA = glProxyGetExtProcAddr(handle, "glXReleaseBuffersMESA");
-	pfnProxySet3DfxModeMESA = glProxyGetExtProcAddr(handle, "glXSet3DfxModeMESA");
-	pfnProxyGetSyncValuesOML = glProxyGetExtProcAddr(handle, "glXGetSyncValuesOML");
-	pfnProxyGetMscRateOML = glProxyGetExtProcAddr(handle, "glXGetMscRateOML");
-	pfnProxySwapBuffersMscOML = glProxyGetExtProcAddr(handle, "glXSwapBuffersMscOML");
-	pfnProxyWaitForMscOML = glProxyGetExtProcAddr(handle, "glXWaitForMscOML");
-	pfnProxyWaitForSbcOML = glProxyGetExtProcAddr(handle, "glXWaitForSbcOML");
-	pfnProxyQueryHyperpipeNetworkSGIX = glProxyGetExtProcAddr(handle, "glXQueryHyperpipeNetworkSGIX");
-	pfnProxyHyperpipeConfigSGIX = glProxyGetExtProcAddr(handle, "glXHyperpipeConfigSGIX");
-	pfnProxyQueryHyperpipeConfigSGIX = glProxyGetExtProcAddr(handle, "glXQueryHyperpipeConfigSGIX");
-	pfnProxyDestroyHyperpipeConfigSGIX = glProxyGetExtProcAddr(handle, "glXDestroyHyperpipeConfigSGIX");
-	pfnProxyBindHyperpipeSGIX = glProxyGetExtProcAddr(handle, "glXBindHyperpipeSGIX");
-	pfnProxyQueryHyperpipeBestAttribSGIX = glProxyGetExtProcAddr(handle, "glXQueryHyperpipeBestAttribSGIX");
-	pfnProxyHyperpipeAttribSGIX = glProxyGetExtProcAddr(handle, "glXHyperpipeAttribSGIX");
-	pfnProxyQueryHyperpipeAttribSGIX = glProxyGetExtProcAddr(handle, "glXQueryHyperpipeAttribSGIX");
-	pfnProxyGetAGPOffsetMESA = glProxyGetExtProcAddr(handle, "glXGetAGPOffsetMESA");
-	pfnProxyBindTexImageEXT = glProxyGetExtProcAddr(handle, "glXBindTexImageEXT");
-	pfnProxyReleaseTexImageEXT = glProxyGetExtProcAddr(handle, "glXReleaseTexImageEXT");
-	pfnProxyEnumerateVideoDevicesNV = glProxyGetExtProcAddr(handle, "glXEnumerateVideoDevicesNV");
-	pfnProxyBindVideoDeviceNV = glProxyGetExtProcAddr(handle, "glXBindVideoDeviceNV");
-	pfnProxyGetVideoDeviceNV = glProxyGetExtProcAddr(handle, "glXGetVideoDeviceNV");
-	pfnProxyReleaseVideoDeviceNV = glProxyGetExtProcAddr(handle, "glXReleaseVideoDeviceNV");
-	pfnProxyBindVideoImageNV = glProxyGetExtProcAddr(handle, "glXBindVideoImageNV");
-	pfnProxyReleaseVideoImageNV = glProxyGetExtProcAddr(handle, "glXReleaseVideoImageNV");
-	pfnProxySendPbufferToVideoNV = glProxyGetExtProcAddr(handle, "glXSendPbufferToVideoNV");
-	pfnProxyGetVideoInfoNV = glProxyGetExtProcAddr(handle, "glXGetVideoInfoNV");
-	pfnProxyJoinSwapGroupNV = glProxyGetExtProcAddr(handle, "glXJoinSwapGroupNV");
-	pfnProxyBindSwapBarrierNV = glProxyGetExtProcAddr(handle, "glXBindSwapBarrierNV");
-	pfnProxyQuerySwapGroupNV = glProxyGetExtProcAddr(handle, "glXQuerySwapGroupNV");
-	pfnProxyQueryMaxSwapGroupsNV = glProxyGetExtProcAddr(handle, "glXQueryMaxSwapGroupsNV");
-	pfnProxyQueryFrameCountNV = glProxyGetExtProcAddr(handle, "glXQueryFrameCountNV");
-	pfnProxyResetFrameCountNV = glProxyGetExtProcAddr(handle, "glXResetFrameCountNV");
-	pfnProxyBindVideoCaptureDeviceNV = glProxyGetExtProcAddr(handle, "glXBindVideoCaptureDeviceNV");
-	pfnProxyEnumerateVideoCaptureDevicesNV = glProxyGetExtProcAddr(handle, "glXEnumerateVideoCaptureDevicesNV");
-	pfnProxyLockVideoCaptureDeviceNV = glProxyGetExtProcAddr(handle, "glXLockVideoCaptureDeviceNV");
-	pfnProxyQueryVideoCaptureDeviceNV = glProxyGetExtProcAddr(handle, "glXQueryVideoCaptureDeviceNV");
-	pfnProxyReleaseVideoCaptureDeviceNV = glProxyGetExtProcAddr(handle, "glXReleaseVideoCaptureDeviceNV");
-	pfnProxySwapIntervalEXT = glProxyGetExtProcAddr(handle, "glXSwapIntervalEXT");
-	pfnProxyCopyImageSubDataNV = glProxyGetExtProcAddr(handle, "glXCopyImageSubDataNV");
-    pfnProxySwapIntervalMESA = glProxyGetExtProcAddr(handle, "glXSwapIntervalMESA");
-    pfnProxyGetSwapIntervalMESA = glProxyGetExtProcAddr(handle, "glXGetSwapIntervalMESA");
-
-	return 0;
-}	

=== modified file 'tests/tfp/egl_tfp.c'
--- tests/tfp/egl_tfp.c	2011-05-04 07:10:32 +0000
+++ tests/tfp/egl_tfp.c	2011-10-19 11:31:30 +0000
@@ -103,6 +103,8 @@
    PFNEGLCREATEIMAGEKHRPROC eglCreateImageKHR;
    PFNEGLDESTROYIMAGEKHRPROC eglDestroyImageKHR;
 
+   PFNPROXYEGLIMAGETARGETTEXTURE2DOESPROC glEGLImageTargetTexture2DOES;
+
    /* Shaders */
    GLfloat projection_matrix[16];
    GLfloat model_view_matrix[16];
@@ -253,8 +255,8 @@
        * must be re-attached.
        */
       if (data->options.use_egl_image) {
-         glEGLImageTargetTexture2DOES(GL_TEXTURE_2D,
-                  (GLeglImageOES) data->img);
+         data->glEGLImageTargetTexture2DOES(GL_TEXTURE_2D,
+                                            (GLeglImageOES) data->img);
       }
       else {
          /* Normal texture data upload */
@@ -495,12 +497,19 @@
 
    exts = eglQueryString(data->dpy, EGL_EXTENSIONS);
    printf("EGL extensions: %s\n", exts);
+
+   data->glEGLImageTargetTexture2DOES =
+      (PFNPROXYEGLIMAGETARGETTEXTURE2DOESPROC) glProxyGetExtProcAddr("GL_OES_EGL_image", "glEGLImageTargetTexture2DOES");
+   if (!exts || !data->glEGLImageTargetTexture2DOES) {
+       printf("EGL does not support GL_OES_EGL_image\n");
+       return False;
+   }
+
    data->eglCreateImageKHR =
-      (PFNEGLCREATEIMAGEKHRPROC) eglGetProcAddress("eglCreateImageKHR");
+      (PFNEGLCREATEIMAGEKHRPROC) glProxyGetExtProcAddr("EGL_KHR_image_pixmap", "eglCreateImageKHR");
    data->eglDestroyImageKHR =
-      (PFNEGLDESTROYIMAGEKHRPROC) eglGetProcAddress("eglDestroyImageKHR");
-   if (!exts || !strstr(exts, "EGL_KHR_image_pixmap") ||
-       !data->eglCreateImageKHR || !data->eglDestroyImageKHR) {
+      (PFNEGLDESTROYIMAGEKHRPROC) glProxyGetExtProcAddr("EGL_KHR_image_pixmap", "eglDestroyImageKHR");
+   if (!exts || !data->eglCreateImageKHR || !data->eglDestroyImageKHR) {
       printf("EGL does not support EGL_KHR_image_pixmap\n");
       return False;
    }

=== modified file 'tests/tfp/glx_tfp.c'
--- tests/tfp/glx_tfp.c	2011-01-05 15:48:46 +0000
+++ tests/tfp/glx_tfp.c	2011-10-19 11:31:30 +0000
@@ -76,6 +76,9 @@
 
 static float top, bottom;
 
+PFNPROXYBINDTEXIMAGEEXTPROC glXBindTexImageEXT_ = NULL;
+PFNPROXYRELEASETEXIMAGEEXTPROC glXReleaseTexImageEXT_ = NULL;
+
 static Display *
 OpenDisplay(void)
 {
@@ -91,13 +94,15 @@
 
    screen = DefaultScreen(dpy);
    ext = glXQueryExtensionsString(dpy, screen);
-   if (!strstr(ext, "GLX_EXT_texture_from_pixmap")) {
-      fprintf(stderr, "GLX_EXT_texture_from_pixmap not supported.\n");
-      exit(1);
-   }
-
-   if (!glXBindTexImageEXT || !glXReleaseTexImageEXT) {
-      fprintf(stderr, "glXGetProcAddress failed!\n");
+   printf("GLX extensions: %s\n", ext);
+
+   glXBindTexImageEXT_ = (PFNPROXYBINDTEXIMAGEEXTPROC)
+           glProxyGetExtProcAddr("GLX_EXT_texture_from_pixmap", "glXBindTexImageEXT");
+   glXReleaseTexImageEXT_ = (PFNPROXYRELEASETEXIMAGEEXTPROC)
+        glProxyGetExtProcAddr("GLX_EXT_texture_from_pixmap", "glXReleaseTexImageEXT");
+
+   if (!glXBindTexImageEXT_ || !glXReleaseTexImageEXT_) {
+      fprintf(stderr, "glProxyGetProcAddress failed!\n");
       exit(1);
    }
       
@@ -312,14 +317,14 @@
    glGenTextures(1, &texture);
    glBindTexture(GL_TEXTURE_2D, texture);
 
-   glXBindTexImageEXT(dpy, gp, GLX_FRONT_LEFT_EXT, NULL);
+   glXBindTexImageEXT_(dpy, gp, GLX_FRONT_LEFT_EXT, NULL);
 
    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
 
    glEnable(GL_TEXTURE_2D);
    /*
-     glXReleaseTexImageEXT(display, glxpixmap, GLX_FRONT_LEFT_EXT);
+     glXReleaseTexImageEXT_(display, glxpixmap, GLX_FRONT_LEFT_EXT);
    */
 }