diff options
| author | Jesse Barnes <[email protected]> | 2007-10-29 12:06:36 -0700 |
|---|---|---|
| committer | Jesse Barnes <[email protected]> | 2007-10-29 12:06:36 -0700 |
| commit | ad8ee7db3b406b23136873fc8c87a22e4d8b94de (patch) | |
| tree | 315376bc48f2a0e9d17caad053b48e1de524e820 | |
| parent | 38fdb47d26055e19d50cd407266b56ed4317ae0a (diff) | |
| parent | 06ca14543ee3dc4ed35a98db71b0d4a7aa7d9371 (diff) | |
Merge branch 'master' of ssh://git.freedesktop.org/git/mesa/mesa
| -rw-r--r-- | configs/linux-dri | 4 | ||||
| -rw-r--r-- | configs/linux-dri-xcb | 9 | ||||
| -rw-r--r-- | src/glx/x11/glxcmds.c | 1 |
3 files changed, 8 insertions, 6 deletions
diff --git a/configs/linux-dri b/configs/linux-dri index afa2d8ca346..2369f75b07d 100644 --- a/configs/linux-dri +++ b/configs/linux-dri @@ -55,10 +55,10 @@ USING_EGL=0 # Directories ifeq ($(USING_EGL), 1) SRC_DIRS = egl glx/x11 mesa glu glut/glx glw -PROGRAM_DIRS = egl +PROGRAM_DIRS = egl xdemos else SRC_DIRS = glx/x11 mesa glu glut/glx glw -PROGRAM_DIRS = +PROGRAM_DIRS = xdemos endif DRIVER_DIRS = dri diff --git a/configs/linux-dri-xcb b/configs/linux-dri-xcb index 5620fe58e70..1f233f07f58 100644 --- a/configs/linux-dri-xcb +++ b/configs/linux-dri-xcb @@ -41,8 +41,9 @@ EXTRA_LIB_PATH=`pkg-config --libs-only-L x11` LIBDRM_CFLAGS = `pkg-config --cflags libdrm` LIBDRM_LIB = `pkg-config --libs libdrm` DRI_LIB_DEPS = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl $(LIBDRM_LIB) -GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lm -lpthread -ldl \ - $(LIBDRM_LIB) `pkg-config --libs xcb` `pkg-config --libs x11-xcb` `pkg-config --libs xcb-glx` +GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \ + -lm -lpthread -ldl $(LIBDRM_LIB) `pkg-config --libs xcb` \ + `pkg-config --libs x11-xcb` `pkg-config --libs xcb-glx` # This is now 0 by default since it seems to confuse the hell out of people @@ -54,10 +55,10 @@ USING_EGL=0 # Directories ifeq ($(USING_EGL), 1) SRC_DIRS = egl glx/x11 mesa glu glut/glx glw -PROGRAM_DIRS = egl +PROGRAM_DIRS = egl xdemos else SRC_DIRS = glx/x11 mesa glu glut/glx glw -PROGRAM_DIRS = +PROGRAM_DIRS = xdemos endif DRIVER_DIRS = dri diff --git a/src/glx/x11/glxcmds.c b/src/glx/x11/glxcmds.c index 7e8a0c146d5..37bfc2a67cf 100644 --- a/src/glx/x11/glxcmds.c +++ b/src/glx/x11/glxcmds.c @@ -106,6 +106,7 @@ static void GarbageCollectDRIDrawables(Display *dpy, __GLXscreenConfigs *sc) } while (__glxHashNext(sc->drawHash, &draw, (void *)&pdraw) == 1); } + XSync(dpy, GL_FALSE); XSetErrorHandler(oldXErrorHandler); } |