frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dmx: Fix some "no previous prototype" warnings by making functions static. 

Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Matt Turner <mattst88@gmail.com>
This commit is contained in:
Jamey Sharp 2010-05-25 16:23:31 -07:00
parent d423012e77
commit b85c10a35d
3 changed files with 39 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -59,9 +59,6 @@
extern __GLXFBConfig **__glXFBConfigs; extern __GLXFBConfig **__glXFBConfigs;
extern int __glXNumFBConfigs; extern int __glXNumFBConfigs;
extern __GLXFBConfig *glxLookupFBConfig( GLXFBConfigID id );
extern __GLXFBConfig *glxLookupFBConfigByVID( VisualID vid );
extern __GLXFBConfig *glxLookupBackEndFBConfig( GLXFBConfigID id, int screen );
extern int glxIsExtensionSupported( char *ext ); extern int glxIsExtensionSupported( char *ext );
extern int __glXGetFBConfigsSGIX(__GLXclientState *cl, GLbyte *pc); extern int __glXGetFBConfigsSGIX(__GLXclientState *cl, GLbyte *pc);
@ -70,6 +67,44 @@ extern int __glXGetFBConfigsSGIX(__GLXclientState *cl, GLbyte *pc);
(x) - dmxScreen->glxErrorBase + __glXerrorBase \ (x) - dmxScreen->glxErrorBase + __glXerrorBase \
: (x) ) : (x) )
static __GLXFBConfig *glxLookupFBConfig( GLXFBConfigID id )
{
int i,j;
for (i=0, j=0; i<__glXNumFBConfigs; i++,j+=(__glXNumActiveScreens+1) ) {
if ( __glXFBConfigs[j]->id == id)
return __glXFBConfigs[j];
}
return NULL;
}
static __GLXFBConfig *glxLookupFBConfigByVID( VisualID vid )
{
int i,j;
for (i=0, j=0; i<__glXNumFBConfigs; i++,j+=(__glXNumActiveScreens+1) ) {
if ( __glXFBConfigs[j]->associatedVisualId == vid)
return __glXFBConfigs[j];
}
return NULL;
}
static __GLXFBConfig *glxLookupBackEndFBConfig( GLXFBConfigID id, int screen )
{
int i;
int j;
for (i=0, j=0; i<__glXNumFBConfigs; i++,j+=(__glXNumActiveScreens+1) ) {
if ( __glXFBConfigs[j]->id == id)
return __glXFBConfigs[j+screen+1];
}
return NULL;
}
Display *GetBackEndDisplay( __GLXclientState *cl, int s ) Display *GetBackEndDisplay( __GLXclientState *cl, int s )
{ {
if (! cl->be_displays[s] ) { if (! cl->be_displays[s] ) {

39
hw/dmx/glxProxy/glxscreens.c
View File

@ -326,45 +326,6 @@ char *__glXGetServerString( unsigned int name )
} }
__GLXFBConfig *glxLookupFBConfig( GLXFBConfigID id )
{
int i,j;
for (i=0, j=0; i<__glXNumFBConfigs; i++,j+=(__glXNumActiveScreens+1) ) {
if ( __glXFBConfigs[j]->id == id)
return __glXFBConfigs[j];
}
return NULL;
}
__GLXFBConfig *glxLookupFBConfigByVID( VisualID vid )
{
int i,j;
for (i=0, j=0; i<__glXNumFBConfigs; i++,j+=(__glXNumActiveScreens+1) ) {
if ( __glXFBConfigs[j]->associatedVisualId == vid)
return __glXFBConfigs[j];
}
return NULL;
}
__GLXFBConfig *glxLookupBackEndFBConfig( GLXFBConfigID id, int screen )
{
int i;
int j;
for (i=0, j=0; i<__glXNumFBConfigs; i++,j+=(__glXNumActiveScreens+1) ) {
if ( __glXFBConfigs[j]->id == id)
return __glXFBConfigs[j+screen+1];
}
return NULL;
}
int glxIsExtensionSupported( char *ext ) int glxIsExtensionSupported( char *ext )
{ {
return( strstr(ExtensionsString, ext) != NULL ); return( strstr(ExtensionsString, ext) != NULL );

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

@ -32,7 +32,7 @@
#include "unpack.h" #include "unpack.h"
#include "g_disptab.h" #include "g_disptab.h"
GLint __glEvalComputeK(GLenum target) static GLint __glEvalComputeK(GLenum target)
{ {
switch (target) { switch (target) {
case GL_MAP1_VERTEX_4: case GL_MAP1_VERTEX_4: