diff options
| author | Dave Airlie <airlied@linux.ie> | 2008-04-16 20:25:08 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2008-04-16 20:25:08 +1000 |
| commit | 09df5eaff2ba2694b82d1211fd24410cb2997e25 (patch) | |
| tree | 0028ffd43d1895bb9e7d1ab0f5906629b0fa4825 /src/glx/x11/glxextensions.h | |
| parent | 9566cf0e2f326d8fe638748d0bc10626e8c0387e (diff) | |
| parent | b64448b3e4026d3f11f366515b7544a6581403f3 (diff) | |
Merge branch 'master' into r500test
Conflicts:
src/mesa/drivers/dri/r300/r300_cmdbuf.c
src/mesa/drivers/dri/r300/r300_ioctl.c
Diffstat (limited to 'src/glx/x11/glxextensions.h')
| -rw-r--r-- | src/glx/x11/glxextensions.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/glx/x11/glxextensions.h b/src/glx/x11/glxextensions.h index 144b02ad03..9cdd05ed76 100644 --- a/src/glx/x11/glxextensions.h +++ b/src/glx/x11/glxextensions.h @@ -235,10 +235,6 @@ extern const char * __glXGetClientExtensions( void ); extern void __glXCalculateUsableExtensions( struct __GLXscreenConfigsRec *psc, GLboolean display_is_direct_capable, int server_minor_version ); -#ifdef GLX_DIRECT_RENDERING -extern void __glXScrEnableDRIExtension( struct __GLXscreenConfigsRec *psc ); -#endif - extern void __glXCalculateUsableGLExtensions( struct __GLXcontextRec * gc, const char * server_string, int major_version, int minor_version ); extern void __glXGetGLVersion( int * major_version, int * minor_version ); @@ -247,6 +243,8 @@ extern char * __glXGetClientGLExtensionString( void ); extern GLboolean __glExtensionBitIsEnabled( const struct __GLXcontextRec * gc, unsigned bit ); +extern void +__glXEnableDirectExtension(__GLXscreenConfigs *psc, const char *name); /* Source-level backwards compatibility with old drivers. They won't * find the respective functions, though. |