a087eb590d
Merge branch 'mesa_7_7_branch'
...
Conflicts:
src/gallium/state_trackers/xorg/xorg_xv.c
src/mesa/drivers/dri/intel/intel_span.c
2009-12-11 10:04:07 -07:00
e128cc205e
Merge branch 'mesa_7_6_branch' into mesa_7_7_branch
2009-12-11 09:51:27 -07:00
7d41b4248b
docs: updated 7.6.1 relnotes with GLSL fixes
2009-12-11 09:41:34 -07:00
b5e256c76d
Merge branch 'mesa_7_7_branch'
...
Conflicts:
src/mesa/drivers/dri/r600/r700_assembler.c
src/mesa/main/version.h
2009-12-08 11:57:24 +02:00
8fc433fa0f
Merge branch 'mesa_7_6_branch' into mesa_7_7_branch
...
Conflicts:
progs/demos/projtex.c
progs/xdemos/glxinfo.c
src/mesa/main/version.h
To fix the confilicts in projtex.c and glxinfo.c I just took the code from
mesa_7_6_branch. The conflicts seem to have occured from cherry-picks from
mesa_7_7_branch to mesa_7_6_branch followed by commmits just to
mesa_7_6_branch.
2009-12-07 17:16:10 -08:00
fb83fa26c4
docs: a few more fixes for 7.6.1
2009-12-04 08:09:07 -07:00
06d3732a90
Merge commit 'origin/mesa_7_7_branch'
...
Conflicts:
src/gallium/drivers/svga/svga_screen_texture.c
src/gallium/state_trackers/xorg/xorg_composite.c
src/gallium/state_trackers/xorg/xorg_exa.c
src/gallium/state_trackers/xorg/xorg_renderer.c
src/gallium/state_trackers/xorg/xorg_xv.c
src/mesa/main/texgetimage.c
src/mesa/main/version.h
2009-12-01 10:57:37 +00:00
650e02003f
Merge branch 'mesa_7_6_branch' into mesa_7_7_branch
...
Conflicts:
progs/util/shaderutil.c
src/mesa/drivers/dri/r600/r600_context.c
src/mesa/main/version.h
2009-11-30 17:47:07 -08:00
601edbef17
Fix the DRI swrast driver for big endian platforms.
...
Too bad I didn't realize earlier how easy this could be...
Fixes http://bugs.freedesktop.org/show_bug.cgi?id=22767 .
2009-11-23 19:56:37 +01:00
3128d65fd7
docs: document fixes for AIX
2009-11-19 09:35:01 -07:00
5117725fd0
docs: removed VC6/7 project files
2009-11-19 09:07:34 -07:00
e16b59df42
docs: update news file for 7.6.1 release
2009-11-19 09:07:17 -07:00
2a1505b42e
docs: remove VC6/7 project file info
2009-11-19 09:01:48 -07:00
c5add6a468
docs: Add note about r600
2009-11-18 11:32:55 -05:00
3ba983bf5d
docs: setup 7.8 release notes file
2009-11-18 07:46:17 -07:00
4440d8adb6
docs: libGL documentation, from the xorg-docs tree
...
This is pretty old and needs some updating but might be useful or
interesting to some people.
2009-11-17 16:33:22 -07:00
2b3ea2be90
docs: i965 clipping fix
2009-11-17 15:53:27 -07:00
63bc736f90
docs: list the new VMware SVGA Gallium driver in release notes
2009-11-17 11:23:19 -07:00
0f060250fc
docs: Update r300g status.
2009-11-16 10:46:20 -08:00
664b7303c2
docs: fixes, changes for Mesa 7.7
2009-11-16 11:33:45 -07:00
898de4a9d5
Merge branch 'mesa_7_6_branch'
...
Conflicts:
src/mesa/drivers/windows/gdi/mesa.def
2009-11-04 17:57:20 -07:00
c5106339d3
docs: fix 7.6 build with Visual Studio
2009-11-03 16:12:02 -07:00
b73c4ad98b
docs: document Intel glBitmap fixes
2009-10-27 16:59:44 -06:00
0a47631849
docs: document Intel glBitmap fixes
2009-10-26 10:58:47 -06:00
49d402e275
Merge remote branch 'origin/mesa_7_6_branch'
...
Conflicts:
src/mesa/drivers/dri/intel/intel_fbo.c
src/mesa/drivers/dri/intel/intel_mipmap_tree.c
src/mesa/drivers/dri/intel/intel_mipmap_tree.h
src/mesa/drivers/dri/intel/intel_tex_copy.c
src/mesa/drivers/dri/intel/intel_tex_image.c
2009-10-23 15:21:05 -07:00
96d7d66dff
docs: document updated GL extension header files
2009-10-23 14:49:47 -06:00
ff3f09a7fe
docs: document cell, glGetTexLevelParameter() fixes
2009-10-23 14:45:44 -06:00
347fb3737b
docs: document 'useprog' debug option
2009-10-22 18:35:13 -06:00
620270c76e
Merge branch 'mesa_7_6_branch' of git+ssh://agd5f@git.freedesktop.org/git/mesa/mesa
...
regenerated lex.yy.c
2009-10-19 12:10:59 -04:00
946bc9aa42
docs: document GLSL float parsing bug fix
2009-10-16 07:38:39 -06:00
85fb3e4027
docs: document more MESA_GLSL env var options
2009-10-14 19:09:08 -06:00
57e3eb1b17
Merge branch 'mesa_7_6_branch'
2009-10-10 09:25:34 -06:00
2738681e84
docs: fix aux buffer bug 24426
2009-10-09 13:23:07 -06:00
90692486aa
docs: bump libdrm version requirement
...
Probably need to bump other version requirements too...
2009-10-08 20:49:36 -06:00
5b4c0b864a
Merge branch 'mesa_7_6_branch'
2009-10-07 20:39:22 +02:00
cdcd9da480
docs: fix glXQueryDrawable() bugs
2009-10-07 09:41:38 -06:00
55770d09c1
Merge branch 'mesa_7_6_branch'
...
Conflicts:
src/gallium/auxiliary/util/u_cpu_detect.c
2009-10-05 14:42:08 -06:00
bbe384c86a
r300: Workaround problem on R500 with very large fragment programs
...
The non-KMS interface is to blame here. In theory, a proper fix
could be produced that works for the KMS interface only, but it
require cleaning a lot of mess. Easier to just do it right in r300g.
Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com>
2009-10-03 01:39:13 +02:00
c01a77d304
docs: document default texture binding fix
2009-10-02 09:58:16 -06:00
5d2413fca4
Merge branch 'mesa_7_6_branch'
2009-10-01 13:35:42 -06:00
d622c4ddba
docs: added objviewer to release notes
2009-10-01 13:14:50 -06:00
b77469871a
docs: document GLSL sqrt(0) fix
2009-09-29 19:05:04 -06:00
5f1faf4a21
docs: fixed glXQueryContext(GLX_RENDER_TYPE)
2009-09-29 12:18:41 -06:00
124f5875ea
Merge branch 'mesa_7_6_branch'
...
Conflicts:
Makefile
configs/default
docs/relnotes.html
src/gallium/drivers/softpipe/sp_context.c
src/gallium/drivers/softpipe/sp_tile_cache.c
src/mesa/main/version.h
2009-09-29 09:46:49 -06:00
2d400d43bf
docs: initial 7.6.1 release notes
2009-09-29 09:34:47 -06:00
6829ef7460
docs: update news.html file with 7.5.2 and 7.6 release
2009-09-28 13:20:15 -06:00
41865d991f
Merge branch 'mesa_7_6_branch'
...
Conflicts:
Makefile
src/mesa/main/version.h
2009-09-28 12:03:23 -07:00
d39fd9f641
Merge branch 'mesa_7_5_branch' into mesa_7_6_branch
...
Conflicts:
src/mesa/main/version.h
2009-09-28 12:02:39 -07:00
18f3afbe88
docs: 7.5.2 md5 sums
2009-09-28 11:41:23 -07:00
b807d49f18
Prep for 7.5.2 release
2009-09-28 11:33:52 -07:00
Brian Paul
Andre Maasikas
Ian Romanick
Keith Whitwell
Michel Dänzer
Alex Deucher
Corbin Simpson
Eric Anholt
Nicolai Hähnle