295a02549d
glapi: fix es after mv
2010-02-24 02:11:31 +02:00
c3168e050e
makefiles: Don't complaint about changing configs if the same one is reselected.
...
Otherwise it creates unnecessary pain when automating builds in a build
server/farm.
2010-02-14 13:15:49 +00:00
3c28fad20b
mesa: remove darwin-x86ppc and dangling darwin refs in Makefile
2010-02-11 09:04:03 -07:00
6e8897ff9f
Retire miniglx and move the actual glx code up to src/glx
2010-02-09 09:58:36 -05:00
bee9964b29
Merge remote branch 'origin/master' into lp-binning
...
Conflicts:
Makefile
src/gallium/auxiliary/util/u_surface.c
src/gallium/drivers/llvmpipe/lp_flush.c
src/gallium/drivers/llvmpipe/lp_setup.c
src/gallium/drivers/llvmpipe/lp_state_derived.c
src/gallium/drivers/llvmpipe/lp_state_fs.c
src/gallium/drivers/llvmpipe/lp_state_surface.c
src/gallium/drivers/llvmpipe/lp_tex_cache.c
src/gallium/drivers/llvmpipe/lp_texture.c
src/gallium/drivers/llvmpipe/lp_tile_cache.c
src/mesa/state_tracker/st_cb_condrender.c
2010-01-31 05:36:33 +00:00
562c127693
Merge branch 'master' into opengl-es-v2
...
Conflicts:
src/mesa/main/dd.h
2010-01-12 11:25:02 +08:00
080c40ab32
Merge remote branch 'origin/master' into lp-binning
...
Conflicts:
src/gallium/auxiliary/util/u_surface.c
src/gallium/drivers/llvmpipe/Makefile
src/gallium/drivers/llvmpipe/SConscript
src/gallium/drivers/llvmpipe/lp_bld_arit.c
src/gallium/drivers/llvmpipe/lp_bld_flow.c
src/gallium/drivers/llvmpipe/lp_bld_interp.c
src/gallium/drivers/llvmpipe/lp_clear.c
src/gallium/drivers/llvmpipe/lp_context.c
src/gallium/drivers/llvmpipe/lp_context.h
src/gallium/drivers/llvmpipe/lp_draw_arrays.c
src/gallium/drivers/llvmpipe/lp_jit.c
src/gallium/drivers/llvmpipe/lp_jit.h
src/gallium/drivers/llvmpipe/lp_prim_vbuf.c
src/gallium/drivers/llvmpipe/lp_setup.c
src/gallium/drivers/llvmpipe/lp_setup_point.c
src/gallium/drivers/llvmpipe/lp_state.h
src/gallium/drivers/llvmpipe/lp_state_blend.c
src/gallium/drivers/llvmpipe/lp_state_derived.c
src/gallium/drivers/llvmpipe/lp_state_fs.c
src/gallium/drivers/llvmpipe/lp_state_sampler.c
src/gallium/drivers/llvmpipe/lp_state_surface.c
src/gallium/drivers/llvmpipe/lp_tex_cache.c
src/gallium/drivers/llvmpipe/lp_tex_cache.h
src/gallium/drivers/llvmpipe/lp_tex_sample.h
src/gallium/drivers/llvmpipe/lp_tile_cache.c
2010-01-08 15:42:57 +00:00
c9a210f158
makefile: added src/glsl/Makefile.template to tarball list
2010-01-07 08:43:24 -07:00
976c858acc
Clean up ES_FILES.
...
Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
2010-01-05 08:08:30 -07:00
aa02683e45
Merge branch 'i965g-restart'
...
Conflicts:
configure.ac
2009-12-22 09:40:39 +00:00
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
a5585cb533
Merge commit 'origin/master' into i965g-restart
...
Conflicts:
SConstruct
configs/default
configs/linux-dri
2009-12-21 19:18:41 +00:00
6a7b6a530d
llvmpipe: added linux-llvm-debug configuration
2009-12-18 11:17:06 -07:00
75f371e973
Remove grammar module -- no dependencies left.
2009-12-12 16:58:43 +01:00
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
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
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
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
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
97ea8e9263
Add new config for OpenGL ES.
...
Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
2009-11-06 14:19:24 -07:00
bfa66bd6f9
mesa/es: Add OpenGL ES overlay.
...
This is primitive support for OpenGL ES. It uses a subset of mesa
sources to build libesXgallium.a and libesXapi.a, where X is 1 for
OpenGL ES 1.x, 2 for OpenGL ES 2.x. The static libraries serve the same
purpose as libmesagallium.a and libglapi.a do for OpenGL.
This is based on the work of opengl-es branch.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
2009-11-05 20:04:20 -07:00
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
24e2f61469
mesa: assorted top-level Makefile clean-ups
2009-10-14 19:09:08 -06:00
0b1de63ad8
mesa: add progs/objviewer to tarball list
2009-10-01 13:14:50 -06:00
69a3043f41
mesa: bump version to 7.6.1
2009-09-29 09:36:06 -06:00
f0dc378705
Prep for 7.6 release
2009-09-28 11:22:54 -07:00
d9dc4cb0e4
Merge branch 'mesa_7_6_branch'
2009-09-10 15:41:52 -06:00
2b692cd6d6
mesa: include new u_format.csv file in tarballs
2009-09-09 12:01:39 -06:00
f78eafcacb
mesa: bump version to 7.7
2009-09-08 16:46:06 -06:00
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
2674d1ba50
mesa: make sure r300/compiler/ sources are included in tarball
2009-08-14 08:16:54 -06:00
823703418e
mesa: added *.shtest files to demo tarball
2009-08-13 17:03:56 -06:00
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
c57d81ddc9
mesa: include glew headers in MesaDemos tarballs
2009-07-23 20:20:39 -06:00
9c4b877519
mesa: bump version to 7.5.1
2009-07-22 12:46:53 -06:00
b9e2e32daf
mesa: include GLEW sources in MesaDemos tarball
2009-07-22 12:34:07 -06:00
bf75ee9ccc
mesa: set version string to 7.7-rc3
2009-12-16 09:15:09 -08:00
a77b455af0
mesa: set version to 7.5
2009-07-17 12:40:48 -06:00
077a06c140
mesa: bump version to 7.5-rc4
2009-06-26 13:16:34 -06:00
cfff2a6189
mesa: bump version to 7.5-rc3
2009-06-05 17:16:47 -06:00
edfbf7dccb
Merge branch 'mesa_7_5_branch'
...
Conflicts:
Makefile
src/mesa/main/version.h
2009-05-18 10:36:50 -06:00
df37cde309
mesa: added linux-osmesa-static config
...
Contributed by Nicolas Noble. See SF bug #2792536
2009-05-18 08:47:22 -06:00
483e247804
mesa: bump version to 7.5-rc2
2009-05-15 08:03:56 -06:00
e7cb125b2d
Merge branch 'mesa_7_5_branch'
...
Conflicts:
Makefile
src/mesa/main/version.h
2009-05-11 16:27:50 -06:00
31865904d8
mesa: added more gallium Makefiles to tarball list
2009-05-09 16:21:16 -06:00
9b3d748f02
mesa: omit files that were removed from git
2009-05-08 15:07:22 -06:00
6fec2eb143
mesa: set version to 7.5-rc1
2009-05-08 15:04:12 -06:00
666e5bf4a6
mesa: bump version to 7.6 (devel)
2009-05-01 09:22:20 -06:00
666702baec
mesa: add distclean target to top-level Makefile
2009-04-16 09:31:45 -06:00
3ba370ad7f
mesa: add wglext.h to tarball list
2009-03-05 10:01:28 -07:00
George Sapountzis
José Fonseca
Brian Paul
Kristian Høgsberg
Chia-I Wu
Keith Whitwell
Michal Krol
michal
Ian Romanick
Thierry Vignaud