fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 13:28:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'master' of ssh://git.freedesktop.org/git/mesa/mesa

Browse source
This commit is contained in:
Jesse Barnes 2007-10-29 12:06:36 -07:00
commit ad8ee7db3b
3 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
configs/linux-dri
View file

@ -55,10 +55,10 @@ USING_EGL=0
# Directories # Directories
ifeq ($(USING_EGL), 1) ifeq ($(USING_EGL), 1)
SRC_DIRS = egl glx/x11 mesa glu glut/glx glw SRC_DIRS = egl glx/x11 mesa glu glut/glx glw
PROGRAM_DIRS = egl PROGRAM_DIRS = egl xdemos
else else
SRC_DIRS = glx/x11 mesa glu glut/glx glw SRC_DIRS = glx/x11 mesa glu glut/glx glw
PROGRAM_DIRS = PROGRAM_DIRS = xdemos
endif endif
DRIVER_DIRS = dri DRIVER_DIRS = dri

9
configs/linux-dri-xcb
View file

@ -41,8 +41,9 @@ EXTRA_LIB_PATH=`pkg-config --libs-only-L x11`
LIBDRM_CFLAGS = `pkg-config --cflags libdrm` LIBDRM_CFLAGS = `pkg-config --cflags libdrm`
LIBDRM_LIB = `pkg-config --libs libdrm` LIBDRM_LIB = `pkg-config --libs libdrm`
DRI_LIB_DEPS = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl $(LIBDRM_LIB) DRI_LIB_DEPS = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl $(LIBDRM_LIB)
GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lm -lpthread -ldl \ GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \
$(LIBDRM_LIB) `pkg-config --libs xcb` `pkg-config --libs x11-xcb` `pkg-config --libs xcb-glx` -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 # This is now 0 by default since it seems to confuse the hell out of people
@ -54,10 +55,10 @@ USING_EGL=0
# Directories # Directories
ifeq ($(USING_EGL), 1) ifeq ($(USING_EGL), 1)
SRC_DIRS = egl glx/x11 mesa glu glut/glx glw SRC_DIRS = egl glx/x11 mesa glu glut/glx glw
PROGRAM_DIRS = egl PROGRAM_DIRS = egl xdemos
else else
SRC_DIRS = glx/x11 mesa glu glut/glx glw SRC_DIRS = glx/x11 mesa glu glut/glx glw
PROGRAM_DIRS = PROGRAM_DIRS = xdemos
endif endif
DRIVER_DIRS = dri DRIVER_DIRS = dri

1
src/glx/x11/glxcmds.c
View file

@ -106,6 +106,7 @@ static void GarbageCollectDRIDrawables(Display *dpy, __GLXscreenConfigs *sc)
} while (__glxHashNext(sc->drawHash, &draw, (void *)&pdraw) == 1); } while (__glxHashNext(sc->drawHash, &draw, (void *)&pdraw) == 1);
} }
XSync(dpy, GL_FALSE);
XSetErrorHandler(oldXErrorHandler); XSetErrorHandler(oldXErrorHandler);
} }