Commit graph

12 commits

Author SHA1 Message Date
Alan Hourihane
1d538d9cd3 Update XGL path Enter/Leave path 2008-08-20 10:42:41 +01:00
Alan Hourihane
10853f9104 Fix build 2008-08-12 21:40:53 +01:00
Alan Hourihane
8689f7e348 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into glucose-2
Conflicts:

	hw/xfree86/Makefile.am
	hw/xfree86/dri/dri.c
	hw/xfree86/dri/dristruct.h
	hw/xgl/glx/xglx.c
	hw/xgl/xglscreen.c
	render/picture.c
2008-02-27 17:30:21 +00:00
Alan Hourihane
959f81a34d Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into glucose-2 2007-11-19 19:56:00 +00:00
Alan Hourihane
f3f704b848 update for CreatePixmap changes 2007-11-05 22:35:30 +00:00
Alan Hourihane
bb4b196f98 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into glucose-2
Conflicts:

	GL/glx/glxscreens.c
	hw/xfree86/Makefile.am
	hw/xgl/xglscreen.c
	mi/miinitext.c
2007-11-05 22:12:47 +00:00
Alan Hourihane
57d8fd992f Move xglCreateSolidAlphaPicture 2007-10-23 09:05:50 +01:00
Alan Hourihane
8e4190627e Missed a rename 2007-10-19 12:00:17 +01:00
Alan Hourihane
b45d236590 Fix recent merge problems and add enter/leave wrapper
from Jose's code.
2007-10-19 11:46:01 +01:00
Alan Hourihane
8cd2200498 ensure finish is called for front buffer rendering. 2007-10-17 11:23:59 +01:00
Alan Hourihane
381be46465 Don't link XGL_LIBS in xgl
Link glucose in with libxgl to pull in symbols.
2007-09-28 16:56:42 +01:00
José Fonseca
ac41255d56 Factor-out glucose symlinked code from xgl into a common library. 2007-09-26 16:43:56 +00:00