Keith Whitwell
aa02683e45
Merge branch 'i965g-restart'
...
Conflicts:
configure.ac
2009-12-22 09:40:39 +00:00
Brian Paul
9eb7fc6661
Merge branch 'mesa_7_7_branch'
...
Conflicts:
src/mesa/main/version.h
src/mesa/state_tracker/st_atom_shader.c
2009-12-21 18:35:54 -07:00
Keith Whitwell
a5585cb533
Merge commit 'origin/master' into i965g-restart
...
Conflicts:
SConstruct
configs/default
configs/linux-dri
2009-12-21 19:18:41 +00:00
Michal Krol
75f371e973
Remove grammar module -- no dependencies left.
2009-12-12 16:58:43 +01:00
Michal Krol
a3eb0f718e
Merge branch 'master' into glsl-pp-rework-2
...
Conflicts:
progs/perf/drawoverhead.c
progs/perf/teximage.c
progs/perf/vbo.c
progs/perf/vertexrate.c
src/mesa/shader/slang/library/slang_common_builtin_gc.h
2009-12-12 16:48:32 +01:00
michal
068596c9a7
Build mesa glsl with make.
...
Still don't know how to add glsl to mesa dependencies.
2009-12-10 01:03:15 +01:00
Ian Romanick
ba167f812c
mesa: set version string to 7.7-rc1
...
Also modify the Makefile to use the correct version for the tarballs.
2009-12-07 17:18:56 -08:00
Ian Romanick
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
Brian Paul
cba614bd88
mesa: omit VC6, VC7 project files from tarballs
...
Only VC8 project file is known to work.
2009-11-19 09:00:16 -07:00
Keith Whitwell
211d7ab22b
i965g: add standalone xlib debug winsys
...
Create a dummy winsys that just debug-prints on calls into the winsys
functions. Will use this to get to the point where we are generating
sane-looking debug dumps and diassembly.
Also fix various warnings generated with the new compiler flags set in
this config.
2009-11-04 13:03:35 +00:00
Brian Paul
24e2f61469
mesa: assorted top-level Makefile clean-ups
2009-10-14 19:09:08 -06:00
Brian Paul
0b1de63ad8
mesa: add progs/objviewer to tarball list
2009-10-01 13:14:50 -06:00
Brian Paul
69a3043f41
mesa: bump version to 7.6.1
2009-09-29 09:36:06 -06:00
Ian Romanick
f0dc378705
Prep for 7.6 release
2009-09-28 11:22:54 -07:00
Brian Paul
d9dc4cb0e4
Merge branch 'mesa_7_6_branch'
2009-09-10 15:41:52 -06:00
Brian Paul
2b692cd6d6
mesa: include new u_format.csv file in tarballs
2009-09-09 12:01:39 -06:00
Brian Paul
f78eafcacb
mesa: bump version to 7.7
2009-09-08 16:46:06 -06:00
Brian Paul
1e2a71c5c2
mesa: add new program parser sources to tarball
...
The end user doesn't need the .y or .l or Makefile but include them anyway
in case someone wants to patch or debug things.
2009-08-24 13:12:07 -06:00
Thierry Vignaud
2674d1ba50
mesa: make sure r300/compiler/ sources are included in tarball
2009-08-14 08:16:54 -06:00
Brian Paul
823703418e
mesa: added *.shtest files to demo tarball
2009-08-13 17:03:56 -06:00
Brian Paul
d2f6d6ce49
Merge branch 'mesa_7_5_branch'
...
Conflicts:
Makefile
configs/default
docs/relnotes.html
src/mesa/main/version.h
2009-07-28 08:58:25 -06:00
Brian Paul
c57d81ddc9
mesa: include glew headers in MesaDemos tarballs
2009-07-23 20:20:39 -06:00
Brian Paul
9c4b877519
mesa: bump version to 7.5.1
2009-07-22 12:46:53 -06:00
Brian Paul
b9e2e32daf
mesa: include GLEW sources in MesaDemos tarball
2009-07-22 12:34:07 -06:00
Ian Romanick
bf75ee9ccc
mesa: set version string to 7.7-rc3
2009-12-16 09:15:09 -08:00
Brian Paul
a77b455af0
mesa: set version to 7.5
2009-07-17 12:40:48 -06:00
Brian Paul
077a06c140
mesa: bump version to 7.5-rc4
2009-06-26 13:16:34 -06:00
Brian Paul
cfff2a6189
mesa: bump version to 7.5-rc3
2009-06-05 17:16:47 -06:00
Brian Paul
edfbf7dccb
Merge branch 'mesa_7_5_branch'
...
Conflicts:
Makefile
src/mesa/main/version.h
2009-05-18 10:36:50 -06:00
Brian Paul
df37cde309
mesa: added linux-osmesa-static config
...
Contributed by Nicolas Noble. See SF bug #2792536
2009-05-18 08:47:22 -06:00
Brian Paul
483e247804
mesa: bump version to 7.5-rc2
2009-05-15 08:03:56 -06:00
Brian Paul
e7cb125b2d
Merge branch 'mesa_7_5_branch'
...
Conflicts:
Makefile
src/mesa/main/version.h
2009-05-11 16:27:50 -06:00
Brian Paul
31865904d8
mesa: added more gallium Makefiles to tarball list
2009-05-09 16:21:16 -06:00
Brian Paul
9b3d748f02
mesa: omit files that were removed from git
2009-05-08 15:07:22 -06:00
Brian Paul
6fec2eb143
mesa: set version to 7.5-rc1
2009-05-08 15:04:12 -06:00
Brian Paul
666e5bf4a6
mesa: bump version to 7.6 (devel)
2009-05-01 09:22:20 -06:00
Brian Paul
666702baec
mesa: add distclean target to top-level Makefile
2009-04-16 09:31:45 -06:00
Brian Paul
3ba370ad7f
mesa: add wglext.h to tarball list
2009-03-05 10:01:28 -07:00
Brian Paul
8e6337f582
mesa: added GLES 1/2 headers to tarball file list
2009-02-24 17:21:45 -07:00
Brian Paul
70bebf8863
mesa: add EGL headers to tarball list
2009-02-24 16:17:44 -07:00
Brian Paul
9dfc1b642e
mesa: add gallium and egl files to tarball list
2009-02-24 15:00:14 -07:00
Brian Paul
32ac8cb050
mesa: remove removed VMS files from Makefile
...
I'll help Jouk restore these someday if he's still maintaining VMS support...
2009-02-24 14:29:05 -07:00
Brian Paul
7fcf4c6d2b
mesa: s/sources/sources.mak/ in Makefile
2009-02-24 14:27:43 -07:00
Jakob Bornecrantz
b96d50da8b
Revert "mesa: added new linux-gallium and linux-gallium-debug configs"
...
This reverts commit abbe96cb6e
2009-02-10 16:22:19 +01:00
Brian Paul
abbe96cb6e
mesa: added new linux-gallium and linux-gallium-debug configs
...
Also, remove gallium-related things from configs/default. They're in
linux-gallium now.
So the default builds are the same as they have been for Mesa/master.
2009-02-09 10:17:58 -07:00
Brian Paul
e97681c7f5
mesa: merge gallium-0.2 into gallium-master-merge
...
Merge commit 'origin/gallium-0.2' into gallium-master-merge
Conflicts:
Makefile
docs/relnotes-7.4.html
docs/relnotes.html
src/mesa/drivers/dri/i965/brw_wm.h
src/mesa/main/imports.c
src/mesa/main/mtypes.h
src/mesa/main/texcompress.c
src/mesa/main/texenvprogram.c
src/mesa/main/version.h
src/mesa/vbo/vbo_exec_api.c
src/mesa/vbo/vbo_save_draw.c
2009-02-09 09:22:22 -07:00
Brian Paul
aafcc26642
Revert "mesa: meaningless whitespace change to see if git's working (ignore)"
...
This reverts commit b2e779988e
2009-02-06 10:00:34 -07:00
Brian Paul
b2e779988e
mesa: meaningless whitespace change to see if git's working (ignore)
2009-02-06 09:57:28 -07:00
Brian Paul
6e5d311719
mesa: remove oddball linux-directfb-install makefile rule
...
It's probably not needed since the 'make install' rules were overhauled last year.
2009-02-05 08:41:27 -07:00
Brian Paul
681a13e7f9
mesa: minor Makefile improvement for versioning
2009-02-05 08:39:10 -07:00
