fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-03 15:50:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Use __GLXextFuncPtr type instead of void * for generic functions to

Browse source 
avoid gcc 3.4 compiler warnings.
Remove the unused/obsolete GLX_render_texture stuff.
This commit is contained in:
Brian Paul 2004-11-25 23:25:33 +00:00
parent 4dafbc3dc7
commit be2de8b299
5 changed files with 255 additions and 256 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/mesa/drivers/x11/fakeglx.c
View file

@ -1,6 +1,6 @@
/*
* Mesa 3-D graphics library
* Version: 6.2
* Version: 6.3
*
* Copyright (C) 1999-2004 Brian Paul All Rights Reserved.
*
@ -2709,29 +2709,6 @@ Fake_glXGetAGPOffsetMESA( const GLvoid *pointer )
}
/*** GLX_ARB_render_texture ***/
static Bool
Fake_glXBindTexImageARB( Display *dpy, GLXPbuffer pbuffer, int buffer )
{
return False;
}
static Bool
Fake_glXReleaseTexImageARB(Display *dpy, GLXPbuffer pbuffer, int buffer )
{
return False;
}
static Bool
Fake_glXDrawableAttribARB( Display *dpy, GLXDrawable draw, const int *attribList )
{
return False;
}
/* silence warning */
extern struct _glxapi_table *_mesa_GetGLXDispatchTable(void);
@ -2887,10 +2864,5 @@ _mesa_GetGLXDispatchTable(void)
/*** GLX_MESA_agp_offset ***/
glx.GetAGPOffsetMESA = Fake_glXGetAGPOffsetMESA;
/*** GLX_ARB_render_texture ***/
glx.BindTexImageARB = Fake_glXBindTexImageARB;
glx.ReleaseTexImageARB = Fake_glXReleaseTexImageARB;
glx.DrawableAttribARB = Fake_glXDrawableAttribARB;
return &glx;
}

462
src/mesa/drivers/x11/glxapi.c
View file

File diff suppressed because it is too large Load diff

12
src/mesa/drivers/x11/glxapi.h
View file

@ -1,9 +1,8 @@
/*
* Mesa 3-D graphics library
* Version: 5.1
* Version: 6.3
*
* Copyright (C) 1999-2002 Brian Paul All Rights Reserved.
* Copyright (C) 1999-2004 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"),
@ -204,11 +203,6 @@ struct _glxapi_table {
/*** GLX_MESA_agp_offset ***/
GLuint (*GetAGPOffsetMESA)( const GLvoid *pointer );
/*** GLX_ARB_render_texture ***/
Bool (*BindTexImageARB)(Display *dpy, GLXPbuffer pbuffer, int buffer);
Bool (*ReleaseTexImageARB)(Display *dpy, GLXPbuffer pbuffer, int buffer);
Bool (*DrawableAttribARB)(Display *dpy, GLXDrawable draw, const int *attribList);
};
@ -229,7 +223,7 @@ extern void
_glxapi_set_no_op_table(struct _glxapi_table *t);
extern const GLvoid *
extern __GLXextFuncPtr
_glxapi_get_proc_address(const char *funcName);

5
src/mesa/drivers/x11/realglx.c
View file

@ -176,10 +176,5 @@ _real_GetGLXDispatchTable(void)
/*** GLX_MESA_agp_offset ***/
glx.GetAGPOffsetMESA = _real_glXGetAGPOffsetMESA;
/*** GLX_ARB_render_texture ***/
glx.BindTexImageARB = _real_glXBindTexImageARB;
glx.ReleaseTexImageARB = _real_glXReleaseTexImageARB;
glx.DrawableAttribARB = _real_glXDrawableAttribARB;
return &glx;
}

2
src/mesa/drivers/x11/xm_dd.c
View file

@ -1242,6 +1242,8 @@ void xmesa_init_driver_functions( XMesaVisual xmvisual,
driver->TestProxyTexImage = test_proxy_teximage;
#if SWTC
driver->ChooseTextureFormat = choose_tex_format;
#else
(void) choose_tex_format;
#endif
}