KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xlib: remove unused realglx.[ch] files 

At one point in time, the xlib driver could call the real GLX functions.
But that's long dead.

Reviewed-by: José Fonseca <jfonseca@vmware.com>
This commit is contained in:
Brian Paul 2014-03-01 10:21:08 -07:00
parent afbc9b3537
commit 9b8e267976
3 changed files with 4 additions and 517 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/mesa/drivers/x11/glxapi.c
View File

@ -24,9 +24,9 @@
/*
* This is the GLX API dispatcher. Calls to the glX* functions are
* either routed to the real GLX encoders or to Mesa's pseudo-GLX functions.
* See the glxapi.h file for more details.
* This is the GLX API dispatcher. It uses a dispatch table but that's
* not really needed anymore since the table always points to the "fake"
* GLX functions.
*/
@ -40,7 +40,6 @@
#include "glxapi.h"
extern struct _glxapi_table *_real_GetGLXDispatchTable(void);
extern struct _glxapi_table *_mesa_GetGLXDispatchTable(void);
@ -107,9 +106,7 @@ get_dispatch(Display *dpy)
}
}
/* A new display, determine if we should use real GLX
* or Mesa's pseudo-GLX.
*/
/* Setup the dispatch table */
{
struct _glxapi_table *t = _mesa_GetGLXDispatchTable();
@ -130,10 +127,6 @@ get_dispatch(Display *dpy)
}
}
/* If we get here that means we can't use real GLX on this display
* and the Mesa pseudo-GLX software renderer wasn't compiled in.
* Or, we ran out of memory!
*/
return NULL;
}

180
src/mesa/drivers/x11/realglx.c
View File

@ -1,180 +0,0 @@
/*
* Mesa 3-D graphics library
*
* Copyright (C) 1999-2002 Brian Paul All Rights Reserved.
*
* 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.
*/
#include <assert.h>
#include <GL/glx.h>
#include "realglx.h"
#include "glxapi.h"
struct _glxapi_table *
_real_GetGLXDispatchTable(void)
{
static struct _glxapi_table glx;
/* be sure our dispatch table size <= libGL's table */
{
GLuint size = sizeof(struct _glxapi_table) / sizeof(void *);
(void) size;
assert(_glxapi_get_dispatch_table_size() >= size);
}
/* initialize the whole table to no-ops */
_glxapi_set_no_op_table(&glx);
/* now initialize the table with the functions I implement */
/*** GLX_VERSION_1_0 ***/
glx.ChooseVisual = _real_glXChooseVisual;
glx.CopyContext = _real_glXCopyContext;
glx.CreateContext = _real_glXCreateContext;
glx.CreateGLXPixmap = _real_glXCreateGLXPixmap;
glx.DestroyContext = _real_glXDestroyContext;
glx.DestroyGLXPixmap = _real_glXDestroyGLXPixmap;
glx.GetConfig = _real_glXGetConfig;
/*glx.GetCurrentContext = _real_glXGetCurrentContext;*/
/*glx.GetCurrentDrawable = _real_glXGetCurrentDrawable;*/
glx.IsDirect = _real_glXIsDirect;
glx.MakeCurrent = _real_glXMakeCurrent;
glx.QueryExtension = _real_glXQueryExtension;
glx.QueryVersion = _real_glXQueryVersion;
glx.SwapBuffers = _real_glXSwapBuffers;
glx.UseXFont = _real_glXUseXFont;
glx.WaitGL = _real_glXWaitGL;
glx.WaitX = _real_glXWaitX;
/*** GLX_VERSION_1_1 ***/
glx.GetClientString = _real_glXGetClientString;
glx.QueryExtensionsString = _real_glXQueryExtensionsString;
glx.QueryServerString = _real_glXQueryServerString;
/*** GLX_VERSION_1_2 ***/
/*glx.GetCurrentDisplay = _real_glXGetCurrentDisplay;*/
/*** GLX_VERSION_1_3 ***/
glx.ChooseFBConfig = _real_glXChooseFBConfig;
glx.CreateNewContext = _real_glXCreateNewContext;
glx.CreatePbuffer = _real_glXCreatePbuffer;
glx.CreatePixmap = _real_glXCreatePixmap;
glx.CreateWindow = _real_glXCreateWindow;
glx.DestroyPbuffer = _real_glXDestroyPbuffer;
glx.DestroyPixmap = _real_glXDestroyPixmap;
glx.DestroyWindow = _real_glXDestroyWindow;
/*glx.GetCurrentReadDrawable = _real_glXGetCurrentReadDrawable;*/
glx.GetFBConfigAttrib = _real_glXGetFBConfigAttrib;
glx.GetFBConfigs = _real_glXGetFBConfigs;
glx.GetSelectedEvent = _real_glXGetSelectedEvent;
glx.GetVisualFromFBConfig = _real_glXGetVisualFromFBConfig;
glx.MakeContextCurrent = _real_glXMakeContextCurrent;
glx.QueryContext = _real_glXQueryContext;
glx.QueryDrawable = _real_glXQueryDrawable;
glx.SelectEvent = _real_glXSelectEvent;
/*** GLX_SGI_swap_control ***/
glx.SwapIntervalSGI = _real_glXSwapIntervalSGI;
/*** GLX_SGI_video_sync ***/
glx.GetVideoSyncSGI = _real_glXGetVideoSyncSGI;
glx.WaitVideoSyncSGI = _real_glXWaitVideoSyncSGI;
/*** GLX_SGI_make_current_read ***/
glx.MakeCurrentReadSGI = _real_glXMakeCurrentReadSGI;
/*glx.GetCurrentReadDrawableSGI = _real_glXGetCurrentReadDrawableSGI;*/
#if defined(_VL_H)
/*** GLX_SGIX_video_source ***/
glx.CreateGLXVideoSourceSGIX = _real_glXCreateGLXVideoSourceSGIX;
glx.DestroyGLXVideoSourceSGIX = _real_glXDestroyGLXVideoSourceSGIX;
#endif
/*** GLX_EXT_import_context ***/
glx.FreeContextEXT = _real_glXFreeContextEXT;
/*glx.GetContextIDEXT = _real_glXGetContextIDEXT;*/
/*glx.GetCurrentDisplayEXT = _real_glXGetCurrentDisplayEXT;*/
glx.ImportContextEXT = _real_glXImportContextEXT;
glx.QueryContextInfoEXT = _real_glXQueryContextInfoEXT;
/*** GLX_SGIX_fbconfig ***/
glx.GetFBConfigAttribSGIX = _real_glXGetFBConfigAttribSGIX;
glx.ChooseFBConfigSGIX = _real_glXChooseFBConfigSGIX;
glx.CreateGLXPixmapWithConfigSGIX = _real_glXCreateGLXPixmapWithConfigSGIX;
glx.CreateContextWithConfigSGIX = _real_glXCreateContextWithConfigSGIX;
glx.GetVisualFromFBConfigSGIX = _real_glXGetVisualFromFBConfigSGIX;
glx.GetFBConfigFromVisualSGIX = _real_glXGetFBConfigFromVisualSGIX;
/*** GLX_SGIX_pbuffer ***/
glx.CreateGLXPbufferSGIX = _real_glXCreateGLXPbufferSGIX;
glx.DestroyGLXPbufferSGIX = _real_glXDestroyGLXPbufferSGIX;
glx.QueryGLXPbufferSGIX = _real_glXQueryGLXPbufferSGIX;
glx.SelectEventSGIX = _real_glXSelectEventSGIX;
glx.GetSelectedEventSGIX = _real_glXGetSelectedEventSGIX;
/*** GLX_SGI_cushion ***/
glx.CushionSGI = _real_glXCushionSGI;
/*** GLX_SGIX_video_resize ***/
glx.BindChannelToWindowSGIX = _real_glXBindChannelToWindowSGIX;
glx.ChannelRectSGIX = _real_glXChannelRectSGIX;
glx.QueryChannelRectSGIX = _real_glXQueryChannelRectSGIX;
glx.QueryChannelDeltasSGIX = _real_glXQueryChannelDeltasSGIX;
glx.ChannelRectSyncSGIX = _real_glXChannelRectSyncSGIX;
#if defined(_DM_BUFFER_H_)
/*** (GLX_SGIX_dmbuffer ***/
glx.AssociateDMPbufferSGIX = NULL;
#endif
/*** GLX_SGIX_swap_group ***/
glx.JoinSwapGroupSGIX = _real_glXJoinSwapGroupSGIX;
/*** GLX_SGIX_swap_barrier ***/
glx.BindSwapBarrierSGIX = _real_glXBindSwapBarrierSGIX;
glx.QueryMaxSwapBarriersSGIX = _real_glXQueryMaxSwapBarriersSGIX;
/*** GLX_SUN_get_transparent_index ***/
glx.GetTransparentIndexSUN = _real_glXGetTransparentIndexSUN;
/*** GLX_MESA_copy_sub_buffer ***/
glx.CopySubBufferMESA = _real_glXCopySubBufferMESA;
/*** GLX_MESA_release_buffers ***/
glx.ReleaseBuffersMESA = _real_glXReleaseBuffersMESA;
/*** GLX_MESA_pixmap_colormap ***/
glx.CreateGLXPixmapMESA = _real_glXCreateGLXPixmapMESA;
/*** GLX_MESA_set_3dfx_mode ***/
glx.Set3DfxModeMESA = _real_glXSet3DfxModeMESA;
/*** GLX_NV_vertex_array_range ***/
glx.AllocateMemoryNV = _real_glXAllocateMemoryNV;
glx.FreeMemoryNV = _real_glXFreeMemoryNV;
/*** GLX_MESA_agp_offset ***/
glx.GetAGPOffsetMESA = _real_glXGetAGPOffsetMESA;
return &glx;
}

326
src/mesa/drivers/x11/realglx.h
View File

@ -1,326 +0,0 @@
/*
* Mesa 3-D graphics library
*
* Copyright (C) 1999-2001 Brian Paul All Rights Reserved.
*
* 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.
*/
#ifndef REALGLX_H
#define REALGLX_H
extern struct _glxapi_table *
_real_GetGLXDispatchTable(void);
/*
* Basically just need these to prevent compiler warnings.
*/
extern XVisualInfo *
_real_glXChooseVisual( Display *dpy, int screen, int *list );
extern GLXContext
_real_glXCreateContext( Display *dpy, XVisualInfo *visinfo,
GLXContext share_list, Bool direct );
extern GLXPixmap
_real_glXCreateGLXPixmap( Display *dpy, XVisualInfo *visinfo, Pixmap pixmap );
extern GLXPixmap
_real_glXCreateGLXPixmapMESA( Display *dpy, XVisualInfo *visinfo,
Pixmap pixmap, Colormap cmap );
extern void
_real_glXDestroyGLXPixmap( Display *dpy, GLXPixmap pixmap );
extern void
_real_glXCopyContext( Display *dpy, GLXContext src, GLXContext dst,
unsigned long mask );
extern Bool
_real_glXMakeCurrent( Display *dpy, GLXDrawable drawable, GLXContext ctx );
extern Bool
_real_glXQueryExtension( Display *dpy, int *errorb, int *event );
extern void
_real_glXDestroyContext( Display *dpy, GLXContext ctx );
extern Bool
_real_glXIsDirect( Display *dpy, GLXContext ctx );
extern void
_real_glXSwapBuffers( Display *dpy, GLXDrawable drawable );
extern void
_real_glXUseXFont( Font font, int first, int count, int listbase );
extern Bool
_real_glXQueryVersion( Display *dpy, int *maj, int *min );
extern int
_real_glXGetConfig( Display *dpy, XVisualInfo *visinfo,
int attrib, int *value );
extern void
_real_glXWaitGL( void );
extern void
_real_glXWaitX( void );
/* GLX 1.1 and later */
extern const char *
_real_glXQueryExtensionsString( Display *dpy, int screen );
/* GLX 1.1 and later */
extern const char *
_real_glXQueryServerString( Display *dpy, int screen, int name );
/* GLX 1.1 and later */
extern const char *
_real_glXGetClientString( Display *dpy, int name );
/*
* GLX 1.3 and later
*/
extern GLXFBConfig *
_real_glXChooseFBConfig( Display *dpy, int screen,
const int *attribList, int *nitems );
extern int
_real_glXGetFBConfigAttrib( Display *dpy, GLXFBConfig config,
int attribute, int *value );
extern GLXFBConfig *
_real_glXGetFBConfigs( Display *dpy, int screen, int *nelements );
extern XVisualInfo *
_real_glXGetVisualFromFBConfig( Display *dpy, GLXFBConfig config );
extern GLXWindow
_real_glXCreateWindow( Display *dpy, GLXFBConfig config, Window win,
const int *attribList );
extern void
_real_glXDestroyWindow( Display *dpy, GLXWindow window );
extern GLXPixmap
_real_glXCreatePixmap( Display *dpy, GLXFBConfig config, Pixmap pixmap,
const int *attribList );
extern void
_real_glXDestroyPixmap( Display *dpy, GLXPixmap pixmap );
extern GLXPbuffer
_real_glXCreatePbuffer( Display *dpy, GLXFBConfig config,
const int *attribList );
extern void
_real_glXDestroyPbuffer( Display *dpy, GLXPbuffer pbuf );
extern void
_real_glXQueryDrawable( Display *dpy, GLXDrawable draw, int attribute,
unsigned int *value );
extern GLXContext
_real_glXCreateNewContext( Display *dpy, GLXFBConfig config,
int renderType, GLXContext shareList, Bool direct );
extern Bool
_real_glXMakeContextCurrent( Display *dpy, GLXDrawable draw,
GLXDrawable read, GLXContext ctx );
extern int
_real_glXQueryContext( Display *dpy, GLXContext ctx, int attribute, int *value );
extern void
_real_glXSelectEvent( Display *dpy, GLXDrawable drawable, unsigned long mask );
extern void
_real_glXGetSelectedEvent( Display *dpy, GLXDrawable drawable,
unsigned long *mask );
#ifdef GLX_SGI_swap_control
extern int
_real_glXSwapIntervalSGI(int interval);
#endif
#ifdef GLX_SGI_video_sync
extern int
_real_glXGetVideoSyncSGI(unsigned int *count);
extern int
_real_glXWaitVideoSyncSGI(int divisor, int remainder, unsigned int *count);
#endif
#ifdef GLX_SGI_make_current_read
extern Bool
_real_glXMakeCurrentReadSGI(Display *dpy, GLXDrawable draw, GLXDrawable read, GLXContext ctx);
extern GLXDrawable
_real_glXGetCurrentReadDrawableSGI(void);
#endif
#if defined(_VL_H) && defined(GLX_SGIX_video_source)
extern GLXVideoSourceSGIX
_real_glXCreateGLXVideoSourceSGIX(Display *dpy, int screen, VLServer server, VLPath path, int nodeClass, VLNode drainNode);
extern void
_real_glXDestroyGLXVideoSourceSGIX(Display *dpy, GLXVideoSourceSGIX src);
#endif
#ifdef GLX_EXT_import_context
extern void
_real_glXFreeContextEXT(Display *dpy, GLXContext context);
extern GLXContextID
_real_glXGetContextIDEXT(const GLXContext context);
extern Display *
_real_glXGetCurrentDisplayEXT(void);
extern GLXContext
_real_glXImportContextEXT(Display *dpy, GLXContextID contextID);
extern int
_real_glXQueryContextInfoEXT(Display *dpy, GLXContext context, int attribute, int *value);
#endif
#ifdef GLX_SGIX_fbconfig
extern int
_real_glXGetFBConfigAttribSGIX(Display *dpy, GLXFBConfigSGIX config, int attribute, int *value);
extern GLXFBConfigSGIX *
_real_glXChooseFBConfigSGIX(Display *dpy, int screen, int *attrib_list, int *nelements);
extern GLXPixmap
_real_glXCreateGLXPixmapWithConfigSGIX(Display *dpy, GLXFBConfigSGIX config, Pixmap pixmap);
extern GLXContext
_real_glXCreateContextWithConfigSGIX(Display *dpy, GLXFBConfigSGIX config, int render_type, GLXContext share_list, Bool direct);
extern XVisualInfo *
_real_glXGetVisualFromFBConfigSGIX(Display *dpy, GLXFBConfigSGIX config);
extern GLXFBConfigSGIX
_real_glXGetFBConfigFromVisualSGIX(Display *dpy, XVisualInfo *vis);
#endif
#ifdef GLX_SGIX_pbuffer
extern GLXPbufferSGIX
_real_glXCreateGLXPbufferSGIX(Display *dpy, GLXFBConfigSGIX config, unsigned int width, unsigned int height, int *attrib_list);
extern void
_real_glXDestroyGLXPbufferSGIX(Display *dpy, GLXPbufferSGIX pbuf);
extern int
_real_glXQueryGLXPbufferSGIX(Display *dpy, GLXPbufferSGIX pbuf, int attribute, unsigned int *value);
extern void
_real_glXSelectEventSGIX(Display *dpy, GLXDrawable drawable, unsigned long mask);
extern void
_real_glXGetSelectedEventSGIX(Display *dpy, GLXDrawable drawable, unsigned long *mask);
#endif
#ifdef GLX_SGI_cushion
extern void
_real_glXCushionSGI(Display *dpy, Window win, float cushion);
#endif
#ifdef GLX_SGIX_video_resize
extern int
_real_glXBindChannelToWindowSGIX(Display *dpy, int screen, int channel , Window window);
extern int
_real_glXChannelRectSGIX(Display *dpy, int screen, int channel, int x, int y, int w, int h);
extern int
_real_glXQueryChannelRectSGIX(Display *dpy, int screen, int channel, int *x, int *y, int *w, int *h);
extern int
_real_glXQueryChannelDeltasSGIX(Display *dpy, int screen, int channel, int *dx, int *dy, int *dw, int *dh);
extern int
_real_glXChannelRectSyncSGIX(Display *dpy, int screen, int channel, GLenum synctype);
#endif
#if defined(_DM_BUFFER_H_) && defined(GLX_SGIX_dmbuffer)
extern Bool
_real_glXAssociateDMPbufferSGIX(Display *dpy, GLXPbufferSGIX pbuffer, DMparams *params, DMbuffer dmbuffer);
#endif
#ifdef GLX_SGIX_swap_group
extern void
_real_glXJoinSwapGroupSGIX(Display *dpy, GLXDrawable drawable, GLXDrawable member);
#endif
#ifdef GLX_SGIX_swap_barrier
extern void
_real_glXBindSwapBarrierSGIX(Display *dpy, GLXDrawable drawable, int barrier);
extern Bool
_real_glXQueryMaxSwapBarriersSGIX(Display *dpy, int screen, int *max);
#endif
#ifdef GLX_SUN_get_transparent_index
extern Status
_real_glXGetTransparentIndexSUN(Display *dpy, Window overlay, Window underlay, long *pTransparent);
#endif
#ifdef GLX_MESA_release_buffers
extern Bool
_real_glXReleaseBuffersMESA( Display *dpy, GLXDrawable d );
#endif
#ifdef GLX_MESA_set_3dfx_mode
extern Bool
_real_glXSet3DfxModeMESA( int mode );
#endif
#ifdef GLX_NV_vertex_array_range
extern void *
_real_glXAllocateMemoryNV(GLsizei size, GLfloat readfreq, GLfloat writefreq, GLfloat priority);
extern void
_real_glXFreeMemoryNV(GLvoid *pointer);
#endif
#ifdef GLX_MESA_agp_offset
extern GLuint
_real_glXGetAGPOffsetMESA(const GLvoid *pointer);
#endif
#ifdef GLX_MESA_copy_sub_buffer
extern void
_real_glXCopySubBufferMESA( Display *dpy, GLXDrawable drawable,
int x, int y, int width, int height );
#endif
#endif /* REALGLX_H */