diff options
| author | Kristian Høgsberg <krh@redhat.com> | 2006-03-21 22:32:13 +0000 |
|---|---|---|
| committer | Kristian Høgsberg <krh@redhat.com> | 2006-03-21 22:32:13 +0000 |
| commit | 8e3ad87d01c102591c7dc25614f6ac10e444a1b1 (patch) | |
| tree | c8dc18dfd1762cbd57bc1207f437c7d805e4b112 | |
| parent | dcc43d57cbe9d2b65384fe9ba2e4e4fbb43cb0a1 (diff) | |
#include indirect_dispatch to get prototypes for FBO functions.
Fix a couple of warnings.
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | GL/glx/glxcmds.c | 1 | ||||
| -rw-r--r-- | GL/glx/glxcmdsswap.c | 1 | ||||
| -rw-r--r-- | GL/glx/glxcontext.h | 2 | ||||
| -rw-r--r-- | GL/glx/glxdri.c | 2 | ||||
| -rw-r--r-- | GL/glx/glxserver.h | 3 |
6 files changed, 18 insertions, 1 deletions
@@ -1,3 +1,13 @@ +2006-03-21 Kristian Høgsberg <krh@redhat.com> + + * GL/glx/glxcmds.c: + * GL/glx/glxcmdsswap.c: #include indirect_dispatch to get + prototypes for FBO functions. + + * GL/glx/glxcontext.h: + * GL/glx/glxserver.h: + * GL/glx/glxdri.c: Fix a couple of warnings. + 2006-03-20 Donnie Berkholz <spyderous@gentoo.org> reviewed by: Kristian Høgsberg diff --git a/GL/glx/glxcmds.c b/GL/glx/glxcmds.c index ef4992446..3a3b43027 100644 --- a/GL/glx/glxcmds.c +++ b/GL/glx/glxcmds.c @@ -57,6 +57,7 @@ #include "glapi.h" #include "glthread.h" #include "dispatch.h" +#include "indirect_dispatch.h" #ifndef GLX_TEXTURE_TARGET_EXT #define GLX_TEXTURE_TARGET_EXT 0x6001 diff --git a/GL/glx/glxcmdsswap.c b/GL/glx/glxcmdsswap.c index ca708a9a7..ed1276f22 100644 --- a/GL/glx/glxcmdsswap.c +++ b/GL/glx/glxcmdsswap.c @@ -54,6 +54,7 @@ #include "glapi.h" #include "glthread.h" #include "dispatch.h" +#include "indirect_dispatch.h" static int __glXSwapGetFBConfigsSGIX(__GLXclientState *cl, GLbyte *pc); static int __glXSwapCreateContextWithConfigSGIX(__GLXclientState *cl, GLbyte *pc); diff --git a/GL/glx/glxcontext.h b/GL/glx/glxcontext.h index 5c27aa0b8..d57745a25 100644 --- a/GL/glx/glxcontext.h +++ b/GL/glx/glxcontext.h @@ -177,4 +177,6 @@ struct __GLXcontext { #define __GLX_PENDING_DESTROY 0x2 #define __GLX_PENDING_SWAP 0x4 +void __glXContextDestroy(__GLXcontext *context); + #endif /* !__GLX_context_h__ */ diff --git a/GL/glx/glxdri.c b/GL/glx/glxdri.c index 40f137864..0760290a1 100644 --- a/GL/glx/glxdri.c +++ b/GL/glx/glxdri.c @@ -227,7 +227,7 @@ __glXDRIcontextDestroy(__GLXcontext *baseContext) context->driContext.destroyContext(NULL, context->base.pScreen->myNum, context->driContext.private); - __glXContextDestroy(context); + __glXContextDestroy(&context->base); xfree(context); } diff --git a/GL/glx/glxserver.h b/GL/glx/glxserver.h index 62e756551..a41720f54 100644 --- a/GL/glx/glxserver.h +++ b/GL/glx/glxserver.h @@ -101,6 +101,9 @@ extern __GLXscreen *__glXgetActiveScreen(int num); void GlxSetVisualConfigs(int nconfigs, __GLXvisualConfig *configs, void **privates); +struct _glapi_table; +void GlxSetRenderTables (struct _glapi_table *table); + void __glXScreenInitVisuals(__GLXscreen *screen); /* |