Attachment 38478 Details for Bug 30045 – Some fixes for GLX_INDIRECT_RENDERING only build

[patch] Some fixes for GLX_INDIRECT_RENDERING only build

0001-Some-fixes-for-GLX_INDIRECT_RENDERING-only-build.patch (text/plain), 3.03 KB, created by Jon Turney on 2010-09-06 08:51:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jon Turney

Created: 2010-09-06 08:51:59 UTC

Size: 3.03 KB

patch

obsolete

>From 844075de246fd87ed296ec4118978fed8ad05728 Mon Sep 17 00:00:00 2001
>From: Jon TURNEY <jon.turney@dronecode.org.uk>
>Date: Mon, 9 Aug 2010 14:47:26 +0100
>Subject: [PATCH] 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@dronecode.org.uk>
>---
> src/glx/glx_pbuffer.c |    6 ++++++
> src/glx/glxcmds.c     |    4 ++--
> src/glx/glxext.c      |    2 +-
> 3 files changed, 9 insertions(+), 3 deletions(-)
>
>diff --git a/src/glx/glx_pbuffer.c b/src/glx/glx_pbuffer.c
>index 15bfb15..0b46870 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,7 +97,9 @@ ChangeDrawableAttribute(Display * dpy, GLXDrawable drawable,
>       return;
>    }
> 
>+#ifdef GLX_DIRECT_RENDERING
>    pdraw = GetGLXDRIDrawable(dpy, drawable);
>+#endif
> 
>    opcode = __glXSetupForCommand(dpy);
>    if (!opcode)
>@@ -133,6 +137,7 @@ ChangeDrawableAttribute(Display * dpy, GLXDrawable drawable,
>    UnlockDisplay(dpy);
>    SyncHandle();
> 
>+#ifdef GLX_DIRECT_RENDERING
>    for (i = 0; i < num_attribs; i++) {
>       switch(attribs[i * 2]) {
>       case GLX_EVENT_MASK:
>@@ -141,6 +146,7 @@ ChangeDrawableAttribute(Display * dpy, GLXDrawable drawable,
> 	 break;
>       }
>    }
>+#endif
> 
>    return;
> }
>diff --git a/src/glx/glxcmds.c b/src/glx/glxcmds.c
>index 3d4fdc0..7016fdf 100644
>--- a/src/glx/glxcmds.c
>+++ b/src/glx/glxcmds.c
>@@ -2163,9 +2163,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
>@@ -2195,9 +2195,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 0b9db5e..a61682a 100644
>--- a/src/glx/glxext.c
>+++ b/src/glx/glxext.c
>@@ -251,9 +251,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);
>-- 
>1.7.1
>

Actions: View | Splinter Review

Attachments on bug 30045: 38478

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.