Commit graph

13 commits

Author SHA1 Message Date
Keith Packard
b84acf6410 fix stale dri2 build 2008-09-11 17:06:07 -07:00
Keith Packard
f209924c36 Merge commit 'origin/master' into transform-proposal
Conflicts:

	Xi/exevents.c
	configure.ac
	hw/xfree86/modes/xf86Rotate.c

All of these merges were of differently formated but equivalent code.
2008-07-21 11:08:04 -07:00
Ian Romanick
b84a27fd9f VBO: Regenerate files based on recent changes to gl_API.xml
Since GL_ARB_vertex_buffer_object protocol isn't supported yet, these
changes are innocuous.
2008-07-02 06:25:03 -07:00
Keith Packard
93b9a6d067 Merge commit 'origin/master' into transform-proposal 2008-06-13 10:13:53 -07:00
George Sapountzis
3108980f5e glx: drop unused cleargc 2008-06-13 16:00:15 +03:00
Michel Dänzer
23b55a61f8 AIGLX/DRI1: Switch to server context for calling pScreen->GetImage.
Fixes http://bugs.freedesktop.org/show_bug.cgi?id=16292 .
2008-06-13 11:13:56 +02:00
Roland Scheidegger
49751fee3b glx: copy msaa visual capabilities 2008-06-10 15:40:48 +02:00
Paulo Cesar Pereira de Andrade
8d4d0b47a0 gl: include assert.h if we're compiling with DEBUG.
Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
2008-06-05 09:19:16 +09:30
Keith Packard
04a1da3771 Merge commit 'origin/master' into transform-proposal
Conflicts:

	configure.ac
	xkb/ddxLoad.c
2008-06-03 21:55:15 -07:00
George Sapountzis
6c72961d8f glx: fix memory corruption with r5g6b5
should cherry-pick to xserver-1.5
2008-05-23 22:40:26 +03:00
George Sapountzis
877e6c35ff glx: missing swrast is fatal 2008-05-23 22:40:26 +03:00
George Sapountzis
1345c93ad4 glx: drop stray glcore.h include 2008-05-23 22:40:25 +03:00
Kristian Høgsberg
c3eb5b80d8 Move GL/glx on level up now that it's the only thing left under GL. 2008-05-21 13:33:36 -04:00