andreacavalli
/
xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

dmx: glxproxy prototype cleanup 

Gets rid of 107 -Wmissing-prototypes & -Wredundant-decls warnings
from gcc 4.8

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Rémi Cardona <remi@gentoo.org>
Reviewed-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Alan Coopersmith 2014-12-12 22:09:14 -08:00
parent bd563fd48f
commit ac64a653fb
12 changed files with 41 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hw/dmx/glxProxy/compsize.h
View File

@ -48,4 +48,11 @@ extern GLint __glTexGeniv_size(GLenum e);
extern GLint __glTexParameterfv_size(GLenum e);
extern GLint __glTexParameteriv_size(GLenum e);
extern GLint __glCallLists_size(GLsizei n, GLenum type);
extern GLint __glDrawPixels_size(GLenum format, GLenum type, GLsizei w, GLsizei h);
extern GLint __glBitmap_size(GLsizei w, GLsizei h);
extern GLint __glTexImage1D_size(GLenum format, GLenum type, GLsizei w);
extern GLint __glTexImage2D_size(GLenum format, GLenum type, GLsizei w, GLsizei h);
extern GLint __glTexImage3D_size(GLenum format, GLenum type, GLsizei w, GLsizei h, GLsizei d);
#endif /* !__compsize_h__ */

21
hw/dmx/glxProxy/g_disptab.h
View File

@ -655,7 +655,6 @@ extern void __glXDispSwap_CopyConvolutionFilter2D(GLbyte *);
extern void __glXDispSwap_SeparableFilter2D(GLbyte *);
extern void __glXDispSwap_TexImage3D(GLbyte *);
extern void __glXDispSwap_TexSubImage3D(GLbyte *);
extern void __glXDispSwap_DrawArrays(GLbyte *);
extern void __glXDispSwap_PrioritizeTextures(GLbyte *);
extern void __glXDispSwap_CopyTexImage1D(GLbyte *);
extern void __glXDispSwap_CopyTexImage2D(GLbyte *);
@ -663,6 +662,26 @@ extern void __glXDispSwap_CopyTexSubImage1D(GLbyte *);
extern void __glXDispSwap_CopyTexSubImage2D(GLbyte *);
extern void __glXDispSwap_CopyTexSubImage3D(GLbyte *);
extern void __glXDispSwap_BindTexture(GLbyte *);
extern void __glXDispSwap_BlendColor(GLbyte *);
extern void __glXDispSwap_BlendEquation(GLbyte *);
extern void __glXDispSwap_ColorTable(GLbyte *);
extern void __glXDispSwap_ColorTableParameterfv(GLbyte *);
extern void __glXDispSwap_ColorTableParameteriv(GLbyte *);
extern void __glXDispSwap_CopyColorTable(GLbyte *);
extern void __glXDispSwap_ConvolutionParameterf(GLbyte *);
extern void __glXDispSwap_ConvolutionParameteri(GLbyte *);
extern void __glXDispSwap_Histogram(GLbyte *);
extern void __glXDispSwap_Minmax(GLbyte *);
extern void __glXDispSwap_ResetHistogram(GLbyte *);
extern void __glXDispSwap_ResetMinmax(GLbyte *);
extern int __glXSwapCreateContextWithConfigSGIX(__GLXclientState *, GLbyte *);
extern int __glXSwapBindSwapBarrierSGIX(__GLXclientState *, GLbyte *);
extern int __glXSwapJoinSwapGroupSGIX(__GLXclientState *, GLbyte *);
extern int __glXSwapQueryMaxSwapBarriersSGIX(__GLXclientState *, GLbyte *);
extern int __glXSwapMakeCurrentReadSGI(__GLXclientState *, GLbyte *);
#define __GLX_MIN_GLXCMD_OPCODE 1
#define __GLX_MAX_GLXCMD_OPCODE 20
#define __GLX_MIN_RENDER_OPCODE 1

1
hw/dmx/glxProxy/glxcmds.c
View File

@ -61,7 +61,6 @@
extern __GLXFBConfig **__glXFBConfigs;
extern int __glXNumFBConfigs;
extern int glxIsExtensionSupported(char *ext);
extern int __glXGetFBConfigsSGIX(__GLXclientState * cl, GLbyte * pc);
#define BE_TO_CLIENT_ERROR(x) \

6
hw/dmx/glxProxy/glxcmds.h
View File

@ -33,5 +33,11 @@ extern int __glXCreateContextWithConfigSGIX(__GLXclientState * cl, GLbyte * pc);
extern int __glXJoinSwapGroupSGIX(__GLXclientState * cl, GLbyte * pc);
extern int __glXMakeCurrentReadSGI(__GLXclientState * cl, GLbyte * pc);
extern int __glXQueryMaxSwapBarriersSGIX(__GLXclientState * cl, GLbyte * pc);
extern int __glXDoSwapBuffers(__GLXclientState * cl, XID drawId,
GLXContextTag tag);
extern Display *GetBackEndDisplay(__GLXclientState * cl, int s);
extern int GetCurrentBackEndTag(__GLXclientState * cl, GLXContextTag tag,
int s);
#endif /* !__GLX_cmds_h__ */

2
hw/dmx/glxProxy/glxcmdsswap.c
View File

@ -39,8 +39,6 @@
#include "glxext.h"
#include "glxvendor.h"
extern int glxIsExtensionSupported(char *ext);
int __glXSwapGetFBConfigsSGIX(__GLXclientState * cl, GLbyte * pc);
/************************************************************************/

1
hw/dmx/glxProxy/glxext.h
View File

@ -53,6 +53,7 @@ extern void __glXFlushContextCache(void);
extern void __glXFreeGLXWindow(__glXWindow * pGlxWindow);
extern void __glXFreeGLXPixmap(__GLXpixmap * pGlxPixmap);
extern void __glXFreeGLXPbuffer(__glXPbuffer * pGlxPbuffer);
extern void __glXNoSuchRenderOpcode(GLbyte *);
extern int __glXNoSuchSingleOpcode(__GLXclientState *, GLbyte *);

2
hw/dmx/glxProxy/glxscreens.h
View File

@ -50,4 +50,6 @@ extern void __glXScreenReset(void);
extern char *__glXGetServerString(unsigned int name);
extern int glxIsExtensionSupported(char *ext);
#endif /* !__GLX_screens_h__ */

8
hw/dmx/glxProxy/glxserver.h
View File

@ -149,9 +149,7 @@ extern __GLXclientState *__glXClients[];
typedef void (*__GLXdispatchRenderProcPtr) (GLbyte *);
typedef int (*__GLXdispatchSingleProcPtr) (__GLXclientState *, GLbyte *);
typedef int (*__GLXdispatchVendorPrivProcPtr) (__GLXclientState *, GLbyte *);
extern __GLXdispatchSingleProcPtr __glXSingleTable[];
extern __GLXdispatchVendorPrivProcPtr __glXVendorPrivTable_EXT[];
extern __GLXdispatchSingleProcPtr __glXSwapSingleTable[];
extern __GLXdispatchVendorPrivProcPtr __glXSwapVendorPrivTable_EXT[];
extern __GLXdispatchRenderProcPtr __glXSwapRenderTable[];
@ -193,9 +191,6 @@ extern RESTYPE __glXPbufferRes;
extern char *__glXcombine_strings(const char *, const char *);
extern void __glXDisp_DrawArrays(GLbyte *);
extern void __glXDispSwap_DrawArrays(GLbyte *);
/*
** Routines for sending swapped replies.
*/
@ -287,9 +282,6 @@ extern int __glXConvolutionParameterfvSize(GLenum pname);
extern int __glXColorTableParameterfvSize(GLenum pname);
extern int __glXColorTableParameterivSize(GLenum pname);
extern void __glXFreeGLXWindow(__glXWindow * pGlxWindow);
extern void __glXFreeGLXPbuffer(__glXPbuffer * pGlxPbuffer);
extern int __glXVersionMajor;
extern int __glXVersionMinor;

6
hw/dmx/glxProxy/glxsingle.c
View File

@ -45,6 +45,8 @@
/* #include "g_disptab_EXT.h" */
#include "unpack.h"
#include "glxutil.h"
#include "glxcmds.h"
#include "glxsingle.h"
#include "GL/glxproto.h"
@ -81,10 +83,6 @@
#define X_GLXSingle 0 /* needed by GetReqExtra */
extern Display *GetBackEndDisplay(__GLXclientState * cl, int s);
extern int GetCurrentBackEndTag(__GLXclientState * cl, GLXContextTag tag,
int s);
static int swap_vec_element_size = 0;
static void

4
hw/dmx/glxProxy/glxsingle.h
View File

@ -47,8 +47,4 @@ extern int __glXForwardAllWithReplySwapsv(__GLXclientState * cl, GLbyte * pc);
extern int __glXForwardAllWithReplySwapiv(__GLXclientState * cl, GLbyte * pc);
extern int __glXForwardAllWithReplySwapdv(__GLXclientState * cl, GLbyte * pc);
extern int __glXDisp_ReadPixels(__GLXclientState * cl, GLbyte * pc);
extern int __glXDispSwap_GetTexImage(__GLXclientState * cl, GLbyte * pc);
extern int __glXDispSwap_GetColorTable(__GLXclientState * cl, GLbyte * pc);
#endif

4
hw/dmx/glxProxy/glxswap.c
View File

@ -39,9 +39,7 @@
#include "dmxwindow.h"
#include "glxserver.h"
#include "glxswap.h"
extern int __glXDoSwapBuffers(__GLXclientState * cl, XID drawId,
GLXContextTag tag);
#include "glxcmds.h"
typedef struct _SwapGroup *SwapGroupPtr;

6
hw/dmx/glxProxy/glxvendor.c
View File

@ -44,6 +44,8 @@
/* #include "g_disptab_EXT.h" */
#include "unpack.h"
#include "glxutil.h"
#include "glxcmds.h"
#include "glxvendor.h"
#include "GL/glxproto.h"
@ -78,10 +80,6 @@
dpy->request++
#endif
extern Display *GetBackEndDisplay(__GLXclientState * cl, int s);
extern int GetCurrentBackEndTag(__GLXclientState * cl, GLXContextTag tag,
int s);
static int swap_vec_element_size = 0;
static void