fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-21 00:18:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
129707 commits 66 branches 936 tags 992 MiB
Commit graph

1507 commits

Author SHA1 Message Date
Eric Anholt
0f72de5538 dri2: add complaints for more initialization failures. 
Somehow we're running into DRI2Authenticate failing, and silent demotion to
swrast is bad.
 2009-01-27 14:34:29 -08:00
Alan Hourihane
4df482086e Merge commit 'origin/master' into gallium-0.2 
Conflicts:
	windows/VC8/mesa/osmesa/osmesa.vcproj
	windows/VC8/progs/demos/gears.vcproj
	windows/VC8/progs/progs.sln
 2009-01-22 09:43:42 +00:00
Ian Romanick
ab9b4e1f59 Fix issues with glXMakeContextCurrent and glXMakeCurrentReadSGI 
There were several bugs in the infrastructure for these two routines.

1. GLX_ALIAS was incorrectly used.  The function and its alias must be
identical!  glXMakeContextCurrent / glXMakeCurrentReadSGI and
MakeContextCurrent had different parameters.  This caused the last
parameter of MakeContextCurrent to get random values.

2. We based the implementation of glXMakeContextCurrent on the manual
page instead of the GLX spec.  The GLX spec says that
glXMakeContextCurrent can be passed a Window as a drawable.  When this
happens, it will behave just like glXMakeCurrentReadSGI or
glXMakeCurrent.

3. If there was a problem finding or creating the DRI drawable,
MakeContextCurrent would crash instead of returning an error.

This commit fixes all three issues, and fixes bug #18367 and bug #19625.
 2009-01-20 13:55:18 -08:00
Brian Paul
b7f802eca2 glx: gcc 2.95 build fix (move declaration before code) 
Adapted from patch by Matthieu Herbb <matthieu.herrb@laas.fr>
 2009-01-18 10:00:34 -07:00
Alan Hourihane
658b1bdb1c Merge commit 'origin/master' into gallium-0.2 
Conflicts:
	docs/install.html
	docs/relnotes-7.3.html
	src/mesa/shader/slang/slang_codegen.c
	src/mesa/shader/slang/slang_compile.c
	src/mesa/shader/slang/slang_emit.c
	src/mesa/shader/slang/slang_preprocess.c
	src/mesa/shader/slang/slang_preprocess.h
 2009-01-14 23:33:41 +00:00
Matthieu Herrb
436024561a Build fixes for gcc 2.95 2009-01-11 16:56:34 -07:00
Owain G. Ainsworth
b4866f8a52 Fix build with GCC 2.95. 2009-01-11 16:44:40 -07:00
Alan Hourihane
a22d865f93 Merge commit 'origin/master' into gallium-0.2 2008-12-15 11:16:03 +00:00
Ian Romanick
2dd0c16f21 GLX: Change resulting from previous commit 
Commit db61cbfa2aa241da49589331d8b6875d9a77d826 made modifications to
the protocol generator data and scripts.  This commit represents the
changes to the generated files resulting from the previous changes.

This is the client-side part of the fix for bugzilla #11003.
 2008-12-14 18:46:17 -08:00
Alan Hourihane
33a1f495d4 Merge commit 'origin/master' into gallium-0.2 
Conflicts:

	progs/glsl/Makefile
 2008-12-08 14:29:50 +00:00
Kristian Høgsberg
154a9e5317 Bump dri2proto requirement to 1.99.3, drop CopyRegion bitmask from protocol. 2008-12-01 21:44:03 -05:00
Alan Hourihane
c4c86bbd16 Merge commit 'origin/master' into gallium-0.2 2008-11-28 16:19:10 +00:00
RALOVICH, Kristóf
8c2b4b33c5 Revert "glx: xcbified visual and FBConfig choosing" 
This reverts commit 62688f1135.
 2008-11-27 07:20:38 -07:00
RALOVICH, Kristóf
80d1531ebe Revert "glx: revert using nonexsisten XCB version of glXGetFBConfigsSGIX" 
This reverts commit 5369876501.
 2008-11-27 07:20:35 -07:00
RALOVICH, Kristóf
5369876501 glx: revert using nonexsisten XCB version of glXGetFBConfigsSGIX 
This uses a GLX VendorPrivate request. VendorPrivates are real GLX API
calls but use the same protocol request. XCB does not currently
support specific VendorPrivetes directly. See eg.:
http://lists.freedesktop.org/archives/xcb/2008-November/004036.html
for more information.
 2008-11-26 10:02:11 -07:00
RALOVICH, Kristóf
1e167f6b5c glx: remove XCB debug leftover 2008-11-26 10:02:11 -07:00
RALOVICH, Kristóf
ff3fa92eaa glx: xcbified glXSwapBuffers 2008-11-26 10:02:11 -07:00
RALOVICH, Kristóf
62688f1135 glx: xcbified visual and FBConfig choosing 2008-11-26 10:02:11 -07:00
RALOVICH, Kristóf
66db1b64e8 glx: xcbified __glXClientInfo 2008-11-26 10:02:11 -07:00
RALOVICH, Kristóf
6d1d157606 glx: no graphics context during initialization 2008-11-26 10:02:11 -07:00
RALOVICH, Kristóf
9c7aaa7afb glx: xcbified __glXIsDirect 2008-11-26 10:02:10 -07:00
RALOVICH, Kristóf
00f22f972f glx: missing static on local function 2008-11-26 10:02:10 -07:00
RALOVICH, Kristóf
f0d015cccb glx: use __glXGetString 2008-11-26 10:00:58 -07:00
RALOVICH, Kristóf
9c98e35ff6 glx: use __glXQueryServerString 2008-11-26 10:00:58 -07:00
RALOVICH, Kristóf
24b8a8cfe8 glx: implement __glXGetString, hide __glXGetStringFromServer 2008-11-26 10:00:58 -07:00
RALOVICH, Kristóf
fd52001c5c glx: implement QueryVersion using XCB 2008-11-26 10:00:58 -07:00
RALOVICH, Kristóf
5444424562 glx: implement __glXQueryServerString using XCB 2008-11-26 10:00:58 -07:00
Brian Paul
df6155fcff Merge commit 'origin/master' into gallium-0.2 
Conflicts:

	progs/glsl/Makefile
 2008-11-24 14:08:58 -07:00
Bernd Buschinski
d52e8543b6 glx: Add missing include for XCB, fixing crash on 64-bit. 
Bug #18689
 2008-11-24 11:40:38 -08:00
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