Mesa (master): Some fixes for GLX_INDIRECT_RENDERING only build
Kristian Høgsberg
krh at kemper.freedesktop.org
Tue Sep 7 16:34:39 UTC 2010
Module: Mesa
Branch: master
Commit: ae9487c29984addc96a6d617292370fbc3f8ff9a
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ae9487c29984addc96a6d617292370fbc3f8ff9a
Author: Jon TURNEY <jon.turney at dronecode.org.uk>
Date: Mon Aug 9 14:47:26 2010 +0100
Some fixes for GLX_INDIRECT_RENDERING only build
This fixes some of the build issues with GLX_INDIRECT_RENDERING but !GLX_DIRECT_RENDERING due to recent changes.
Signed-off-by: Jon TURNEY <jon.turney at dronecode.org.uk>
Signed-off-by: Kristian Høgsberg <krh at bitplanet.net>
---
src/glx/glx_pbuffer.c | 8 ++++++--
src/glx/glxcmds.c | 4 ++--
src/glx/glxext.c | 2 +-
3 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/glx/glx_pbuffer.c b/src/glx/glx_pbuffer.c
index 15bfb15..d065f4b 100644
--- a/src/glx/glx_pbuffer.c
+++ b/src/glx/glx_pbuffer.c
@@ -86,7 +86,9 @@ ChangeDrawableAttribute(Display * dpy, GLXDrawable drawable,
const CARD32 * attribs, size_t num_attribs)
{
struct glx_display *priv = __glXInitialize(dpy);
+#ifdef GLX_DIRECT_RENDERING
__GLXDRIdrawable *pdraw;
+#endif
CARD32 *output;
CARD8 opcode;
int i;
@@ -95,8 +97,6 @@ ChangeDrawableAttribute(Display * dpy, GLXDrawable drawable,
return;
}
- pdraw = GetGLXDRIDrawable(dpy, drawable);
-
opcode = __glXSetupForCommand(dpy);
if (!opcode)
return;
@@ -133,6 +133,9 @@ ChangeDrawableAttribute(Display * dpy, GLXDrawable drawable,
UnlockDisplay(dpy);
SyncHandle();
+#ifdef GLX_DIRECT_RENDERING
+ pdraw = GetGLXDRIDrawable(dpy, drawable);
+
for (i = 0; i < num_attribs; i++) {
switch(attribs[i * 2]) {
case GLX_EVENT_MASK:
@@ -141,6 +144,7 @@ ChangeDrawableAttribute(Display * dpy, GLXDrawable drawable,
break;
}
}
+#endif
return;
}
diff --git a/src/glx/glxcmds.c b/src/glx/glxcmds.c
index d4aa8b5..5cd9287 100644
--- a/src/glx/glxcmds.c
+++ b/src/glx/glxcmds.c
@@ -2161,9 +2161,9 @@ __glXWaitForMscOML(Display * dpy, GLXDrawable drawable,
{
#ifdef GLX_DIRECT_RENDERING
__GLXDRIdrawable *pdraw = GetGLXDRIDrawable(dpy, drawable);
-#endif
struct glx_screen *psc = pdraw ? pdraw->psc : NULL;
int ret;
+#endif
/* The OML_sync_control spec says these should "generate a GLX_BAD_VALUE
@@ -2193,9 +2193,9 @@ __glXWaitForSbcOML(Display * dpy, GLXDrawable drawable,
{
#ifdef GLX_DIRECT_RENDERING
__GLXDRIdrawable *pdraw = GetGLXDRIDrawable(dpy, drawable);
-#endif
struct glx_screen *psc = pdraw ? pdraw->psc : NULL;
int ret;
+#endif
/* The OML_sync_control spec says this should "generate a GLX_BAD_VALUE
* error", but the return type in the spec is Bool.
diff --git a/src/glx/glxext.c b/src/glx/glxext.c
index 9e42d83..7ba4666 100644
--- a/src/glx/glxext.c
+++ b/src/glx/glxext.c
@@ -249,9 +249,9 @@ glx_display_free(struct glx_display *priv)
if (priv->serverGLXversion)
Xfree((char *) priv->serverGLXversion);
+#if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL)
__glxHashDestroy(priv->drawHash);
-#if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL)
/* Free the direct rendering per display data */
if (priv->driswDisplay)
(*priv->driswDisplay->destroyDisplay) (priv->driswDisplay);
More information about the mesa-commit
mailing list