Commit graph

478 commits

Author SHA1 Message Date
Keith Whitwell
7468765b18 Merge commit 'origin/master' into gallium-0.2
Conflicts:

	src/mesa/shader/prog_print.c
2008-11-15 16:53:24 +00:00
Kristian Høgsberg
e1fbb30211 glFlush before CopySubBuffer, fix coordinates and extension name typo. 2008-11-12 15:26:25 -05:00
Hanno Böck
becf3d9272 glx: fix xcb build 2008-11-12 06:56:42 -07:00
Brian Paul
19e4222f93 Merge commit 'origin/master' into gallium-0.2
Conflicts:

	src/mesa/shader/prog_execute.c
	src/mesa/shader/slang/library/slang_vertex_builtin_gc.h
2008-11-11 14:42:41 -07:00
Kristian Høgsberg
57d78067bd Don't mess with emacs tab width. 2008-11-11 13:41:43 -05:00
Brian Paul
13f96c5401 GLX: fix out-of-bounds memory issue in indirect glAreTexturesResident()
See bug 18445.
When getting array results, __glXReadReply() always reads a multiple of
four bytes.  This can cause writing to invalid memory when 'n' is not a
multiple of four.

Special-case the glAreTexturesResident() functions now.
To fix the bug, we use a temporary buffer that's a multiple of four bytes
in length.

NOTE: this commit also reverts part of commit 919ec22ecf
(glx/x11: Added some #ifdef GLX_DIRECT_RENDERING protection) which
directly edited the indirect.c file rather than the python generator!
I'm not repairing that issue at this time.
2008-11-10 14:27:42 -07:00
Alan Hourihane
61d3a66456 Merge commit 'origin/master' into gallium-0.2 2008-10-27 15:37:22 +00:00
Kristof Ralovich
0970de3171 glx: updated comment 2008-10-21 08:20:43 -06:00
Kristian Høgsberg
d533a5d00a Update DRI2 implementation according to new specification. 2008-10-15 11:18:05 +01:00
Kristian Høgsberg
e5ef0beb05 Revert pointless reindents to avoid merge conflicts.
Why are we reindenting code that's work in progress...
2008-10-15 11:18:05 +01:00
RALOVICH, Kristóf
5f6472fc69 glx: indent -br -i3 -npcs --no-tabs glxclient.h 2008-10-15 11:18:05 +01:00
RALOVICH, Kristóf
5e3edb6f98 glx: indent -br -i3 -npcs --no-tabs glcontextmodes.h 2008-10-15 11:18:04 +01:00
RALOVICH, Kristóf
00be6dfe2b glx: indent -br -i3 -npcs --no-tabs glxextensions.c 2008-10-15 11:18:04 +01:00
RALOVICH, Kristóf
c6d037678d glx: indent -br -i3 -npcs --no-tabs glxextensions.h 2008-10-15 11:18:00 +01:00
RALOVICH, Kristóf
1bb4658fab glx: indent -br -i3 -npcs --no-tabs xfont.c 2008-10-15 11:17:59 +01:00
RALOVICH, Kristóf
b57e9f2a74 glx: indent -br -i3 -npcs --no-tabs xf86dristr.h 2008-10-15 11:17:59 +01:00
RALOVICH, Kristóf
400c2d0cea glx: indent -br -i3 -npcs --no-tabs XF86dri.c 2008-10-15 11:17:58 +01:00
RALOVICH, Kristóf
b69ef3eb51 glx: indent -br -i3 -npcs --no-tabs xf86dri.h 2008-10-15 11:17:58 +01:00
RALOVICH, Kristóf
f7ff9f1913 glx: kill old K&R syntax in XF86dri.c 2008-10-15 11:17:58 +01:00
RALOVICH, Kristóf
dd8b90a81b glx: indent -br -i3 -npcs --no-tabs vertarr.c 2008-10-15 11:17:58 +01:00
RALOVICH, Kristóf
801933c3e4 glx: indent -br -i3 -npcs --no-tabs singlepix.c 2008-10-15 11:17:57 +01:00
RALOVICH, Kristóf
ee88fff432 glx: indent -br -i3 -npcs --no-tabs single2.c 2008-10-15 11:17:57 +01:00
RALOVICH, Kristóf
750f497713 glx: indent -br -i3 -npcs --no-tabs renderpix.c 2008-10-15 11:17:57 +01:00
RALOVICH, Kristóf
5b48c862c6 glx: indent -br -i3 -npcs --no-tabs render2.c 2008-10-15 11:17:56 +01:00
RALOVICH, Kristóf
3c900bd546 glx: indent -br -i3 -npcs --no-tabs pixelstore.c 2008-10-15 11:17:56 +01:00
RALOVICH, Kristóf
32d7d5fbae glx: indent -br -i3 -npcs --no-tabs pixel.c 2008-10-15 11:17:56 +01:00
RALOVICH, Kristóf
1b2f122739 glx: indent -br -i3 -npcs --no-tabs packsingle.h 2008-10-15 11:17:55 +01:00
RALOVICH, Kristóf
3a2568b375 glx: indent -br -i3 -npcs --no-tabs packrender.h 2008-10-15 11:17:55 +01:00
RALOVICH, Kristóf
b5f7c84cdf glx: indent -br -i3 -npcs --no-tabs indirect_window_pos.c 2008-10-15 11:17:55 +01:00
RALOVICH, Kristóf
f9fa7400d7 glx: indent -br -i3 -npcs --no-tabs indirect_vertex_program.c 2008-10-15 11:17:55 +01:00
RALOVICH, Kristóf
76ddfa3a4c glx: indent -br -i3 -npcs --no-tabs indirect_vertex_array_priv.h 2008-10-15 11:17:54 +01:00
RALOVICH, Kristóf
c09881c79f glx: indent -br -i3 -npcs --no-tabs indirect_vertex_array.h 2008-10-15 11:17:54 +01:00
RALOVICH, Kristóf
f2d45617dd glx: indent -br -i3 -npcs --no-tabs indirect_vertex_array.c 2008-10-15 11:17:54 +01:00
RALOVICH, Kristóf
5ae395a883 glx: indent -br -i3 -npcs --no-tabs indirect_transpose_matrix.c 2008-10-15 11:17:53 +01:00
RALOVICH, Kristóf
4cc369e820 glx: indent -br -i3 -npcs --no-tabs indirect_texture_compression.c 2008-10-15 11:17:53 +01:00
RALOVICH, Kristóf
5a3db8004e glx: indent -br -i3 -npcs --no-tabs glx_query.c 2008-10-15 11:17:51 +01:00
RALOVICH, Kristóf
35dc7eadfa glx: indent -br -i3 -npcs --no-tabs glx_pbuffer.c 2008-10-15 11:17:51 +01:00
RALOVICH, Kristóf
3dd46f15c3 glx: indent -br -i3 -npcs --no-tabs glxhash.c 2008-10-15 11:17:51 +01:00
RALOVICH, Kristóf
b87e8ae0f5 glx: indent -br -i3 -npcs --no-tabs glxhash.h 2008-10-15 11:17:50 +01:00
RALOVICH, Kristóf
b7f76587b8 glx: indent -br -i3 -npcs --no-tabs glxext.c 2008-10-15 11:17:49 +01:00
RALOVICH, Kristóf
3959d457d6 glx: indent -br -i3 -npcs --no-tabs glxcurrent.c 2008-10-15 11:17:49 +01:00
RALOVICH, Kristóf
c6ea997137 glx: indent -br -i3 -npcs --no-tabs glxcmds.c 2008-10-15 11:17:48 +01:00
RALOVICH, Kristóf
b928a12ee3 glx: indent -br -i3 -npcs --no-tabs glcontextmodes.c 2008-10-15 11:17:48 +01:00
RALOVICH, Kristóf
7f04f8ddee glx: indent -br -i3 -npcs --no-tabs eval.c 2008-10-15 11:17:48 +01:00
RALOVICH, Kristóf
a1a2078f71 glx: indent -br -i3 -npcs --no-tabs drisw_glx.c 2008-10-15 11:17:48 +01:00
RALOVICH, Kristóf
79d830ce5d glx: indent -br -i3 -npcs --no-tabs dri_glx.c 2008-10-15 11:17:47 +01:00
RALOVICH, Kristóf
e7970d6b17 glx: indent -br -i3 -npcs --no-tabs dri_common.h 2008-10-15 11:17:47 +01:00
RALOVICH, Kristóf
321a73d9d5 glx: indent -br -i3 -npcs --no-tabs dri_common.c 2008-10-15 11:17:47 +01:00
RALOVICH, Kristóf
9ca7330be3 glx: indent -br -i3 -npcs --no-tabs dri2.h 2008-10-15 11:17:47 +01:00
RALOVICH, Kristóf
ae5b588dc9 glx: indent -br -i3 -npcs --no-tabs dri2_glx.c 2008-10-15 11:17:47 +01:00