Mesa (master): glx: Move GetGLXDRIDrawable() prototype to glxclient.h
Kristian Høgsberg
krh at kemper.freedesktop.org
Tue Feb 16 15:39:37 UTC 2010
Module: Mesa
Branch: master
Commit: 97ec6076f596a3820a9b7c4b7eae18bd98c6676b
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=97ec6076f596a3820a9b7c4b7eae18bd98c6676b
Author: Kristian Høgsberg <krh at bitplanet.net>
Date: Mon Feb 15 11:12:28 2010 -0500
glx: Move GetGLXDRIDrawable() prototype to glxclient.h
---
src/glx/glx_pbuffer.c | 4 ----
src/glx/glxclient.h | 4 ++++
src/glx/glxcmds.c | 4 ----
3 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/src/glx/glx_pbuffer.c b/src/glx/glx_pbuffer.c
index a0a0223..4c122ba 100644
--- a/src/glx/glx_pbuffer.c
+++ b/src/glx/glx_pbuffer.c
@@ -186,10 +186,6 @@ DestroyPbuffer(Display * dpy, GLXDrawable drawable)
#ifdef GLX_DIRECT_RENDERING
-extern __GLXDRIdrawable *GetGLXDRIDrawable(Display * dpy,
- GLXDrawable drawable,
- int *const scrn_num);
-
static GLenum
determineTextureTarget(const int *attribs, int numAttribs)
{
diff --git a/src/glx/glxclient.h b/src/glx/glxclient.h
index e0b286b..f88e9fb 100644
--- a/src/glx/glxclient.h
+++ b/src/glx/glxclient.h
@@ -798,6 +798,10 @@ __driGetMscRateOML(__DRIdrawable * draw,
/* So that dri2.c:DRI2WireToEvent() can access
* glx_info->codes->first_event */
XExtDisplayInfo *__glXFindDisplay (Display *dpy);
+
+extern __GLXDRIdrawable *
+GetGLXDRIDrawable(Display *dpy, GLXDrawable drawable, int *const scrn_num);
+
#endif
#endif /* !__GLX_client_h__ */
diff --git a/src/glx/glxcmds.c b/src/glx/glxcmds.c
index c3be974..da0dcf1 100644
--- a/src/glx/glxcmds.c
+++ b/src/glx/glxcmds.c
@@ -105,10 +105,6 @@ GarbageCollectDRIDrawables(Display * dpy, __GLXscreenConfigs * sc)
XSetErrorHandler(oldXErrorHandler);
}
-extern __GLXDRIdrawable *GetGLXDRIDrawable(Display * dpy,
- GLXDrawable drawable,
- int *const scrn_num);
-
/**
* Get the __DRIdrawable for the drawable associated with a GLXContext
*
More information about the mesa-commit
mailing list