ddecefbb82
drop linux-solo configs
2010-02-26 04:02:41 +02:00
40c6bb58be
Drop classic mesa svga driver
2010-02-25 17:40:10 -05:00
e14a5b14b2
Drop glide driver
2010-02-25 17:40:10 -05:00
230d263aca
Remove GGI support
2010-02-25 17:40:10 -05:00
b5c3199afe
Remove dos driver
2010-02-25 17:40:10 -05:00
4387580e50
Remove directfb support
2010-02-25 17:40:09 -05:00
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
8e6337f582
mesa: added GLES 1/2 headers to tarball file list
2009-02-24 17:21:45 -07:00
70bebf8863
mesa: add EGL headers to tarball list
2009-02-24 16:17:44 -07:00
9dfc1b642e
mesa: add gallium and egl files to tarball list
2009-02-24 15:00:14 -07:00
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
7fcf4c6d2b
mesa: s/sources/sources.mak/ in Makefile
2009-02-24 14:27:43 -07:00
b96d50da8b
Revert "mesa: added new linux-gallium and linux-gallium-debug configs"
...
This reverts commit abbe96cb6e
2009-02-10 16:22:19 +01:00
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
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
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
b2e779988e
mesa: meaningless whitespace change to see if git's working (ignore)
2009-02-06 09:57:28 -07:00
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
681a13e7f9
mesa: minor Makefile improvement for versioning
2009-02-05 08:39:10 -07:00
e98ef30351
mesa: set version to 7.4 for mesa_7_4_branch
2009-01-29 00:59:53 +00:00
93cbb2c205
mesa: set version to 7.3
2009-01-29 00:59:53 +00:00
0e48056850
mesa: master is open for new development, eventually will be Mesa 7.5
2009-01-22 10:22:55 -07:00
5a45897711
mesa: set version to 7.3
2009-01-22 10:14:24 -07:00
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
bb63a663b1
mesa: bump version to 7.3-rc3
2009-01-20 09:13:41 -07:00
dace4e3e2a
mesa: inlclude whole windows/VC8/ directory in tarballs
2009-01-20 09:13:06 -07:00
2e28c1fda2
Merge commit 'origin/master' into gallium-0.2
...
Conflicts:
src/mesa/shader/slang/slang_compile.c
2009-01-16 16:44:53 +00:00
8f8435637d
mesa: bump version to 7.3-rc2
2009-01-14 17:05:26 -07:00
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
1598be5083
mesa: add osmesa.pc.in to tarball list
2009-01-12 08:36:21 -07:00
f1455ca5f4
mesa: omit old headers from tarball
2009-01-10 12:21:37 -07:00
ffe7bda603
mesa: 7.3-rc-1 Makefile changes
2009-01-09 11:16:44 +00:00
4497a5a57d
mesa: 7.3-rc-1 Makefile changes
2009-01-08 17:21:20 -07:00
374cf77b2f
Merge commit 'origin/master' into gallium-0.2
...
Conflicts:
src/mesa/drivers/dri/common/dri_util.c
2009-01-06 08:15:54 -07:00
a8ee35c1c5
mesa: remove dri_sarea.h, add glcore.h in Makefile
2009-01-06 07:36:11 -07:00
81c862205e
Merge commit 'origin/master' into gallium-0.2
...
Conflicts:
src/mesa/shader/slang/library/slang_vertex_builtin_gc.h
2008-11-01 22:57:26 +00:00
835a9fef05
mesa: include glslcompiler driver in tarball
2008-10-28 18:27:21 -06:00
cc7dd4fc1b
Merge commit 'origin/gallium-0.1' into gallium-0.2
...
Conflicts:
Makefile
progs/demos/Makefile
progs/glsl/Makefile
progs/redbook/Makefile
progs/samples/Makefile
progs/tests/Makefile
progs/trivial/Makefile
progs/xdemos/Makefile
src/gallium/Makefile
src/mesa/main/attrib.c
src/mesa/main/bufferobj.c
src/mesa/vbo/vbo_exec_draw.c
2008-09-11 18:32:05 +01:00
0397b2bb41
Merge branch 'gallium-0.1' into gallium-0.2
...
A first attempt at moving gallium onto a branch directly off master...
It will be interesting to see how much work this takes to get running.
Have resolved the conflicts semi-arbitarily, not compiled or tested.
Conflicts:
.gitignore
Makefile
configs/config.mgw
configs/darwin
configs/darwin-x86ppc
configs/default
configs/freebsd-dri
configs/linux-dri
configs/linux-dri-xcb
configs/linux-fbdev
configs/linux-static
configs/linux-x86-64-static
configs/linux-x86-static
doxygen/Makefile
include/GL/gl.h
progs/demos/Makefile
progs/demos/descrip.mms
progs/demos/texenv.c
progs/egl/.gitignore
progs/egl/Makefile
progs/glsl/.gitignore
progs/glsl/Makefile
progs/glsl/convolutions.c
progs/samples/Makefile.mgw
progs/tests/.gitignore
progs/trivial/.gitignore
progs/trivial/point-param.c
progs/trivial/tri.c
progs/xdemos/.gitignore
progs/xdemos/glthreads.c
src/egl/drivers/demo/Makefile
src/egl/drivers/dri/Makefile
src/egl/main/Makefile
src/glu/Makefile
src/glu/sgi/Makefile
src/glu/sgi/Makefile.mgw
src/glut/glx/Makefile.mgw
src/glut/os2/WarpWin.cpp
src/glut/os2/glut_cindex.cpp
src/glut/os2/glut_gamemode.cpp
src/glut/os2/glut_win.cpp
src/glut/os2/glut_winmisc.cpp
src/glut/os2/os2_glx.cpp
src/glut/os2/os2_menu.cpp
src/glut/os2/os2_winproc.cpp
src/glw/Makefile
src/glx/x11/dri_glx.c
src/glx/x11/glxext.c
src/mesa/Makefile
src/mesa/Makefile.mgw
src/mesa/descrip.mms
src/mesa/drivers/beos/Makefile
src/mesa/drivers/common/descrip.mms
src/mesa/drivers/common/driverfuncs.c
src/mesa/drivers/directfb/Makefile
src/mesa/drivers/dri/Makefile.template
src/mesa/drivers/dri/common/dri_bufmgr.c
src/mesa/drivers/dri/common/dri_bufmgr.h
src/mesa/drivers/dri/common/dri_util.c
src/mesa/drivers/dri/common/extension_helper.h
src/mesa/drivers/dri/common/mmio.h
src/mesa/drivers/dri/common/utils.c
src/mesa/drivers/dri/common/utils.h
src/mesa/drivers/dri/glcore/Makefile
src/mesa/drivers/dri/i810/i810screen.c
src/mesa/drivers/dri/i915/intel_ioctl.c
src/mesa/drivers/dri/i915/intel_ioctl.h
src/mesa/drivers/dri/i915/intel_screen.c
src/mesa/drivers/dri/i915/server/i830_common.h
src/mesa/drivers/dri/i915/server/i830_dri.h
src/mesa/drivers/dri/i965/intel_screen.c
src/mesa/drivers/dri/i965/server/i830_common.h
src/mesa/drivers/dri/i965/server/i830_dri.h
src/mesa/drivers/dri/mach64/mach64_screen.c
src/mesa/drivers/dri/nouveau/nouveau_context.h
src/mesa/drivers/dri/nouveau/nouveau_fifo.c
src/mesa/drivers/dri/nouveau/nouveau_fifo.h
src/mesa/drivers/dri/nouveau/nouveau_screen.c
src/mesa/drivers/dri/nouveau/nouveau_screen.h
src/mesa/drivers/dri/r128/r128_tex.h
src/mesa/drivers/dri/savage/savageioctl.h
src/mesa/drivers/fbdev/Makefile
src/mesa/drivers/osmesa/Makefile
src/mesa/drivers/osmesa/descrip.mms
src/mesa/drivers/x11/Makefile
src/mesa/drivers/x11/descrip.mms
src/mesa/drivers/x11/xm_dd.c
src/mesa/glapi/glapi.c
src/mesa/glapi/glthread.c
src/mesa/main/api_validate.c
src/mesa/main/attrib.c
src/mesa/main/bufferobj.c
src/mesa/main/bufferobj.h
src/mesa/main/buffers.c
src/mesa/main/config.h
src/mesa/main/context.c
src/mesa/main/descrip.mms
src/mesa/main/drawpix.c
src/mesa/main/enums.c
src/mesa/main/fbobject.c
src/mesa/main/glheader.h
src/mesa/main/imports.c
src/mesa/main/mipmap.c
src/mesa/main/mm.c
src/mesa/main/mm.h
src/mesa/main/mtypes.h
src/mesa/main/points.c
src/mesa/main/sources
src/mesa/main/state.c
src/mesa/main/texcompress_fxt1.c
src/mesa/main/texenvprogram.c
src/mesa/main/texobj.c
src/mesa/main/texstate.c
src/mesa/main/texstore.c
src/mesa/math/descrip.mms
src/mesa/shader/arbprogram.c
src/mesa/shader/descrip.mms
src/mesa/shader/prog_execute.c
src/mesa/shader/prog_statevars.c
src/mesa/shader/prog_statevars.h
src/mesa/shader/prog_uniform.c
src/mesa/shader/program.c
src/mesa/shader/program.h
src/mesa/shader/shader_api.c
src/mesa/shader/slang/descrip.mms
src/mesa/shader/slang/library/slang_vertex_builtin_gc.h
src/mesa/sources
src/mesa/swrast/descrip.mms
src/mesa/swrast/s_drawpix.c
src/mesa/swrast/s_fragprog.c
src/mesa/swrast/s_readpix.c
src/mesa/swrast/s_span.c
src/mesa/swrast_setup/descrip.mms
src/mesa/tnl/descrip.mms
src/mesa/tnl/t_context.h
src/mesa/tnl/t_vp_build.c
src/mesa/tnl/tnl.h
src/mesa/vbo/descrip.mms
src/mesa/vbo/vbo_context.c
src/mesa/vbo/vbo_exec_array.c
src/mesa/x86-64/xform4.S
src/mesa/x86/rtasm/x86sse.c
src/mesa/x86/rtasm/x86sse.h
windows/VC6/progs/glut/glut.dsp
windows/VC7/mesa/gdi/gdi.vcproj
windows/VC7/mesa/glu/glu.vcproj
windows/VC7/mesa/mesa.sln
windows/VC7/mesa/mesa/mesa.vcproj
windows/VC7/mesa/osmesa/osmesa.vcproj
windows/VC7/progs/glut/glut.vcproj
windows/VC8/mesa/gdi/gdi.vcproj
windows/VC8/mesa/glu/glu.vcproj
windows/VC8/mesa/mesa.sln
windows/VC8/mesa/mesa/mesa.vcproj
windows/VC8/progs/glut/glut.vcproj
2008-09-11 16:05:15 +01:00
ab93aa774e
Cell: added linux-cell-debug config
...
linux-cell is now the optimized configuration.
Remove some Cell-specific stuff from winsys/xlib/Makefile.
2008-09-03 09:08:46 -06:00
a9345511d8
remove depend.bak in realclean
2008-09-01 14:24:33 +01:00
5d762e1613
added glu.exports files to tarballs list
2008-08-16 10:09:38 -06:00
7970b2a908
prep for 7.1 rc4
2008-08-16 09:39:10 -06:00
e4d9cc94b8
add yet another Makefile
2008-07-08 16:28:33 -06:00
ee2a101123
bump version to rc3
2008-07-08 16:26:28 -06:00
7d3feef9d6
added more Makefiles to file list
2008-07-08 16:26:06 -06:00
44029f15a8
added src/mesa/drivers/Makefile to file list
2008-07-08 16:16:57 -06:00
6fe7857629
mesa: bump version to rc2
2008-07-08 15:12:48 -06:00
f6da1453c5
DRI-specific pkg-config file
...
Since the gl pkg-config file doesn't convey any specifics about the
backend in use, this adds a new pkg-config file for when DRI is in use.
This can be used by the xserver build to determine if the DRI and/or
GLX extensions are appropriate.
2008-06-27 16:25:28 -07:00
fbb96a0301
Distribute version.mk in case autoconf needs to be run again
...
Users may need to rebuild the configure script, so we need to distribute
version.mk so autoconf can run successfully.
2008-06-10 06:06:40 -07:00
0128703f03
prep for 7.1 RC1
2008-05-27 12:50:59 -06:00
George Sapountzis
Kristian Høgsberg
José Fonseca
Brian Paul
Chia-I Wu
Keith Whitwell
Michal Krol
michal
Ian Romanick
Thierry Vignaud
Jakob Bornecrantz
Alan Hourihane
Alan Hourihane
Brian Paul
Keith Whitwell
Dan Nicholson